feats

src/main/java/com/shigongli/controller/TaHouseController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
+import com.shigongli.constants.StatusConstant;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -46,7 +47,7 @@ public class TaHouseController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taHouse",method= RequestMethod.GET)
+    @RequestMapping(value="/mp/taHouse",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taHouseList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
@@ -64,7 +65,7 @@ public class TaHouseController extends BaseController {
      * @param taHouse 实体对象
      * @return
      */
-    @RequestMapping(value="/taHouse",method= RequestMethod.POST)
+    @RequestMapping(value="/mp/taHouse",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taHouseAdd(@ApiParam("保存内容") @RequestBody TaHouse taHouse) throws Exception{
 
@@ -79,14 +80,17 @@ public class TaHouseController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taHouse/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/mp/taHouse/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taHouseDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaHouseService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+    public ResponseBean taHouseDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaHouse taHouse = iTaHouseService.getById(id);
+        if (null == taHouse || taHouse.getStatus().equals(StatusConstant.DELETE)) {
+            return ResponseBean.success("ok");
         }
+
+        taHouse.setStatus(StatusConstant.DELETE);
+
+        return taHouseUpdate(id, taHouse);
     }
 
     /**
@@ -95,9 +99,9 @@ public class TaHouseController extends BaseController {
      * @param taHouse 实体对象
      * @return
      */
-    @RequestMapping(value="/taHouse/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/mp/taHouse/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taHouseUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean taHouseUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaHouse taHouse) throws Exception{
 
         if (iTaHouseService.updateById(taHouse)){
@@ -111,9 +115,9 @@ public class TaHouseController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taHouse/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/mp/taHouse/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taHouseGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taHouseGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaHouseService.getById(id));
     }
 }

src/main/java/com/shigongli/entity/TaHouse.java

@@ -27,7 +27,7 @@ public class TaHouse implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "房源ID")
-    @TableId(value = "house_id", type = IdType.INPUT)
+    @TableId(value = "house_id", type = IdType.UUID)
     private String houseId;
 
     @ApiModelProperty(value = "所属民宿")