shigongli
/
java-service
Наблюдаван 1
Харесван 0
Разклонения 0
Код Задачи 0 Заявки за сливане 0 Версии 0 Уики Activity
Преглед на файлове

feats

张延森 преди 4 години
родител
d451a780dd
ревизия
a69ee08ee6
променени са 3 файла, в които са добавени 36 реда и са изтрити 30 реда
Разделен изглед Покажи статистика за разликите
  1. 14
    12
      src/main/java/com/shigongli/controller/TaMateTagController.java
  2. 21
    17
      src/main/java/com/shigongli/controller/TaMateTagGroupController.java
  3. 1
    1
      src/main/java/com/shigongli/entity/TaMateTagGroup.java

+ 14
- 12
src/main/java/com/shigongli/controller/TaMateTagController.java Целия файл 

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6 
 import com.shigongli.common.BaseController;
7 7 
 import com.shigongli.common.ResponseBean;
8 
+import com.shigongli.constants.StatusConstant;
8 9 
 import io.swagger.annotations.Api;
9 10 
 import io.swagger.annotations.ApiOperation;
10 11 
 import io.swagger.annotations.ApiParam;
 
@@ -46,7 +47,7 @@ public class TaMateTagController extends BaseController {
46 47 
      * @param pageSize
47 48 
      * @return
48 49 
      */
49 
-    @RequestMapping(value="/taMateTag",method= RequestMethod.GET)
50 
+    @RequestMapping(value="/mp/taMateTag",method= RequestMethod.GET)
50 51 
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
51 52 
     public ResponseBean taMateTagList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
52 53 
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
@@ -64,7 +65,7 @@ public class TaMateTagController extends BaseController {
64 65 
      * @param taMateTag 实体对象
65 66 
      * @return
66 67 
      */
67 
-    @RequestMapping(value="/taMateTag",method= RequestMethod.POST)
68 
+    @RequestMapping(value="/mp/taMateTag",method= RequestMethod.POST)
68 69 
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
69 70 
     public ResponseBean taMateTagAdd(@ApiParam("保存内容") @RequestBody TaMateTag taMateTag) throws Exception{
70 71 
 
@@ -79,14 +80,15 @@ public class TaMateTagController extends BaseController {
79 80 
      * 根据id删除对象
80 81 
      * @param id  实体ID
81 82 
      */
82 
-    @RequestMapping(value="/taMateTag/{id}", method= RequestMethod.DELETE)
83 
+    @RequestMapping(value="/mp/taMateTag/{id}", method= RequestMethod.DELETE)
83 84 
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
84 
-    public ResponseBean taMateTagDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
85 
-        if(iTaMateTagService.removeById(id)){
86 
-            return ResponseBean.success("success");
87 
-        }else {
88 
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
85 
+    public ResponseBean taMateTagDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
86 
+        TaMateTag taMateTag = iTaMateTagService.getById(id);
87 
+        if (null == taMateTag || taMateTag.getStatus().equals(StatusConstant.DELETE)) {
88 
+            return ResponseBean.success("ok");
89 89 
         }
90 
+        taMateTag.setStatus(StatusConstant.DELETE);
91 
+        return taMateTagUpdate(id, taMateTag);
90 92 
     }
91 93
92 94 
     /**
 
@@ -95,9 +97,9 @@ public class TaMateTagController extends BaseController {
95 97 
      * @param taMateTag 实体对象
96 98 
      * @return
97 99 
      */
98 
-    @RequestMapping(value="/taMateTag/{id}",method= RequestMethod.PUT)
100 
+    @RequestMapping(value="/mp/taMateTag/{id}",method= RequestMethod.PUT)
99 101 
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
100 
-    public ResponseBean taMateTagUpdate(@ApiParam("对象ID") @PathVariable Integer id,
102 
+    public ResponseBean taMateTagUpdate(@ApiParam("对象ID") @PathVariable String id,
101 103 
                                         @ApiParam("更新内容") @RequestBody TaMateTag taMateTag) throws Exception{
102 104
103 105 
         if (iTaMateTagService.updateById(taMateTag)){
 
@@ -111,9 +113,9 @@ public class TaMateTagController extends BaseController {
111 113 
      * 根据id查询对象
112 114 
      * @param id  实体ID
113 115 
      */
114 
-    @RequestMapping(value="/taMateTag/{id}",method= RequestMethod.GET)
116 
+    @RequestMapping(value="/mp/taMateTag/{id}",method= RequestMethod.GET)
115 117 
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
116 
-    public ResponseBean taMateTagGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
118 
+    public ResponseBean taMateTagGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
117 119 
         return ResponseBean.success(iTaMateTagService.getById(id));
118 120 
     }
119 121 
 }

+ 21
- 17
src/main/java/com/shigongli/controller/TaMateTagGroupController.java Целия файл 

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6 
 import com.shigongli.common.BaseController;
7 7 
 import com.shigongli.common.ResponseBean;
8 
+import com.shigongli.constants.StatusConstant;
8 9 
 import io.swagger.annotations.Api;
9 10 
 import io.swagger.annotations.ApiOperation;
10 11 
 import io.swagger.annotations.ApiParam;
 
@@ -46,17 +47,18 @@ public class TaMateTagGroupController extends BaseController {
46 47 
      * @param pageSize
47 48 
      * @return
48 49 
      */
49 
-    @RequestMapping(value="/taMateTagGroup",method= RequestMethod.GET)
50 
+    @RequestMapping(value="/mp/taMateTagGroup",method= RequestMethod.GET)
50 51 
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
51 52 
     public ResponseBean taMateTagGroupList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
52 53 
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
53 54
54 
-		    IPage<TaMateTagGroup> pg = new Page<>(pageNum, pageSize);
55 
-            QueryWrapper<TaMateTagGroup> queryWrapper = new QueryWrapper<>();
56 
-            queryWrapper.orderByDesc("create_date");
55 
+        IPage<TaMateTagGroup> pg = new Page<>(pageNum, pageSize);
56 
+        QueryWrapper<TaMateTagGroup> queryWrapper = new QueryWrapper<>();
57 
+        queryWrapper.eq("status", StatusConstant.NORMAL);
58 
+        queryWrapper.orderByDesc("create_date");
57 59
58 
-            IPage<TaMateTagGroup> result = iTaMateTagGroupService.page(pg, queryWrapper);
59 
-            return ResponseBean.success(result);
60 
+        IPage<TaMateTagGroup> result = iTaMateTagGroupService.page(pg, queryWrapper);
61 
+        return ResponseBean.success(result);
60 62 
     }
61 63
62 64 
     /**
 
@@ -64,7 +66,7 @@ public class TaMateTagGroupController extends BaseController {
64 66 
      * @param taMateTagGroup 实体对象
65 67 
      * @return
66 68 
      */
67 
-    @RequestMapping(value="/taMateTagGroup",method= RequestMethod.POST)
69 
+    @RequestMapping(value="/mp/taMateTagGroup",method= RequestMethod.POST)
68 70 
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
69 71 
     public ResponseBean taMateTagGroupAdd(@ApiParam("保存内容") @RequestBody TaMateTagGroup taMateTagGroup) throws Exception{
70 72 
 
@@ -79,14 +81,16 @@ public class TaMateTagGroupController extends BaseController {
79 81 
      * 根据id删除对象
80 82 
      * @param id  实体ID
81 83 
      */
82 
-    @RequestMapping(value="/taMateTagGroup/{id}", method= RequestMethod.DELETE)
84 
+    @RequestMapping(value="/mp/taMateTagGroup/{id}", method= RequestMethod.DELETE)
83 85 
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
84 
-    public ResponseBean taMateTagGroupDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
85 
-        if(iTaMateTagGroupService.removeById(id)){
86 
-            return ResponseBean.success("success");
87 
-        }else {
88 
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
86 
+    public ResponseBean taMateTagGroupDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
87 
+        TaMateTagGroup taMateTagGroup = iTaMateTagGroupService.getById(id);
88 
+        if (null == taMateTagGroup || taMateTagGroup.getStatus().equals(StatusConstant.DELETE)) {
89 
+            return ResponseBean.success("ok");
89 90 
         }
91 
+
92 
+        taMateTagGroup.setStatus(StatusConstant.DELETE);
93 
+        return taMateTagGroupUpdate(id, taMateTagGroup);
90 94 
     }
91 95
92 96 
     /**
 
@@ -95,9 +99,9 @@ public class TaMateTagGroupController extends BaseController {
95 99 
      * @param taMateTagGroup 实体对象
96 100 
      * @return
97 101 
      */
98 
-    @RequestMapping(value="/taMateTagGroup/{id}",method= RequestMethod.PUT)
102 
+    @RequestMapping(value="/mp/taMateTagGroup/{id}",method= RequestMethod.PUT)
99 103 
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
100 
-    public ResponseBean taMateTagGroupUpdate(@ApiParam("对象ID") @PathVariable Integer id,
104 
+    public ResponseBean taMateTagGroupUpdate(@ApiParam("对象ID") @PathVariable String id,
101 105 
                                         @ApiParam("更新内容") @RequestBody TaMateTagGroup taMateTagGroup) throws Exception{
102 106
103 107 
         if (iTaMateTagGroupService.updateById(taMateTagGroup)){
 
@@ -111,9 +115,9 @@ public class TaMateTagGroupController extends BaseController {
111 115 
      * 根据id查询对象
112 116 
      * @param id  实体ID
113 117 
      */
114 
-    @RequestMapping(value="/taMateTagGroup/{id}",method= RequestMethod.GET)
118 
+    @RequestMapping(value="/mp/taMateTagGroup/{id}",method= RequestMethod.GET)
115 119 
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
116 
-    public ResponseBean taMateTagGroupGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
120 
+    public ResponseBean taMateTagGroupGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
117 121 
         return ResponseBean.success(iTaMateTagGroupService.getById(id));
118 122 
     }
119 123 
 }

+ 1
- 1
src/main/java/com/shigongli/entity/TaMateTagGroup.java Целия файл 

@@ -27,7 +27,7 @@ public class TaMateTagGroup implements Serializable {
27 27 
     private static final long serialVersionUID = 1L;
28 28
29 29 
     @ApiModelProperty(value = "ID")
30 
-    @TableId(value = "group_id", type = IdType.INPUT)
30 
+    @TableId(value = "group_id", type = IdType.UUID)
31 31 
     private String groupId;
32 32
33 33 
     @ApiModelProperty(value = "标签组")