魏超 il y a 5 ans
Parent
révision
ba0ef3b9da

+ 17
- 21
src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java Voir le fichier

@@ -1,25 +1,19 @@
1 1
 package com.huiju.estateagents.controller;
2 2
 
3
+import com.alibaba.fastjson.JSONObject;
3 4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 5
 import com.huiju.estateagents.base.BaseController;
5 6
 import com.huiju.estateagents.base.ResponseBean;
6 7
 import com.huiju.estateagents.entity.TaNews;
7 8
 import com.huiju.estateagents.entity.TaShareActivity;
8 9
 import com.huiju.estateagents.service.ITaShareActivityService;
10
+import io.swagger.models.auth.In;
9 11
 import org.slf4j.Logger;
10 12
 import org.slf4j.LoggerFactory;
11 13
 import org.springframework.beans.factory.annotation.Autowired;
12
-import org.springframework.format.annotation.DateTimeFormat;
13
-import org.springframework.web.bind.annotation.PathVariable;
14
-import org.springframework.web.bind.annotation.RequestBody;
15
-import org.springframework.web.bind.annotation.RequestMapping;
16
-import org.springframework.web.bind.annotation.RequestMethod;
17
-import org.springframework.web.bind.annotation.RequestParam;
18
-import org.springframework.web.bind.annotation.ResponseBody;
19
-import org.springframework.web.bind.annotation.RestController;
14
+import org.springframework.web.bind.annotation.*;
20 15
 
21 16
 import javax.servlet.http.HttpServletRequest;
22
-import java.time.LocalDateTime;
23 17
 
24 18
 /**
25 19
  * <p>
@@ -65,15 +59,18 @@ public class TaShareActivityController extends BaseController {
65 59
 
66 60
     /**
67 61
      * 保存对象
68
-     * @param taShareActivity 实体对象
62
+     * @param parameter 实体对象json格式
69 63
      * @return
70 64
      */
71 65
     @RequestMapping(value="/admin/taShareActivity",method= RequestMethod.POST)
72
-    public ResponseBean taShareActivityAdd(@RequestBody TaShareActivity taShareActivity, HttpServletRequest request){
66
+    public ResponseBean taShareActivityAdd(@RequestBody String parameter, HttpServletRequest request){
73 67
         ResponseBean responseBean = new ResponseBean();
74 68
         try {
69
+            TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
75 70
             taShareActivity.setOrgId(getOrgId(request));
76 71
             taShareActivity.setStatus(0);
72
+            taShareActivity.setSort(false);
73
+            taShareActivity.setWeight(0);
77 74
             if (iTaShareActivityService.save(taShareActivity)){
78 75
                 responseBean.addSuccess(taShareActivity);
79 76
             }else {
@@ -111,15 +108,14 @@ public class TaShareActivityController extends BaseController {
111 108
 
112 109
     /**
113 110
      * 修改对象
114
-     * @param id  实体ID
115
-     * @param taShareActivity 实体对象
111
+     * @param  parameter 实体对象json
116 112
      * @return
117 113
      */
118
-    @RequestMapping(value="/admin/taShareActivity/{id}",method= RequestMethod.PUT)
119
-    public ResponseBean taShareActivityUpdate(@PathVariable Integer id,
120
-                                        @RequestBody TaShareActivity taShareActivity){
114
+    @RequestMapping(value="/admin/taShareActivity/update",method= RequestMethod.PUT)
115
+    public ResponseBean taShareActivityUpdate(@RequestBody String parameter){
121 116
         ResponseBean responseBean = new ResponseBean();
122 117
         try {
118
+            TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
123 119
             if (iTaShareActivityService.updateById(taShareActivity)){
124 120
                 responseBean.addSuccess(taShareActivity);
125 121
             }else {
@@ -155,13 +151,13 @@ public class TaShareActivityController extends BaseController {
155 151
      * @param id
156 152
      * @return
157 153
      */
158
-    @RequestMapping(value="/admin/taShareActivity/finish/{groupActicityId}",method= RequestMethod.PUT)
159
-    public ResponseBean finishShareActicity(@PathVariable Integer groupActicityId){
154
+    @RequestMapping(value="/admin/taShareActivity/finish/{id}",method= RequestMethod.PUT)
155
+    public ResponseBean finishShareActicity(@PathVariable Integer id){
160 156
         ResponseBean responseBean = new ResponseBean();
161 157
         try {
162 158
             TaShareActivity taShareActivity = new TaShareActivity();
163 159
             taShareActivity.setStatus(2);
164
-            taShareActivity.setGroupActicityId(groupActicityId);
160
+            taShareActivity.setGroupActicityId(id);
165 161
             if (iTaShareActivityService.updateById(taShareActivity)){
166 162
                 responseBean.addSuccess(taShareActivity);
167 163
             }else {
@@ -185,10 +181,10 @@ public class TaShareActivityController extends BaseController {
185 181
     public  ResponseBean buildingDynamicWeight(@RequestBody TaShareActivity taShareActivity, HttpServletRequest request){
186 182
         ResponseBean responseBean = new ResponseBean();
187 183
         if (taShareActivity.getWeight() != null){
188
-            taShareActivity.setWeight(taShareActivity.getWeight());
184
+            taShareActivity.setWeight(taShareActivity.getWeight() == 0 ? 1 : 0);
189 185
         }
190 186
         if (taShareActivity.getSort() != null){
191
-            taShareActivity.setSort(taShareActivity.getSort());
187
+            taShareActivity.setSort(taShareActivity.getSort() == true ? false : true);
192 188
         }
193 189
 
194 190
         QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java Voir le fichier

@@ -36,7 +36,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
36 36
 
37 37
         QueryWrapper<TaShareActivity> queryWrapper = new QueryWrapper<>();
38 38
         queryWrapper.eq(buildingId != null, "building_id", buildingId);
39
-        queryWrapper.like(activityName != null, "activityName", activityName);
39
+        queryWrapper.like(activityName != null, "activity_name", activityName);
40 40
         queryWrapper.eq(status != null, "status", status);
41 41
         queryWrapper.eq(startTime != null, "start_time", startTime);
42 42
         queryWrapper.eq(endTime != null, "end_time", endTime);