胡轶钦 5 年之前
父節點
當前提交
3a86371aec

+ 19
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java 查看文件

@@ -10,9 +10,11 @@ import com.huiju.estateagents.common.JWTUtils;
10 10
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
11 11
 import com.huiju.estateagents.entity.TaBuilding;
12 12
 import com.huiju.estateagents.entity.TaBuildingDynamic;
13
+import com.huiju.estateagents.entity.TaPerson;
13 14
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
14 15
 import com.huiju.estateagents.mapper.TaBuildingMapper;
15 16
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
17
+import com.huiju.estateagents.service.ITaPersonService;
16 18
 import org.springframework.beans.factory.annotation.Autowired;
17 19
 import org.springframework.beans.propertyeditors.CustomDateEditor;
18 20
 import org.springframework.web.bind.ServletRequestDataBinder;
@@ -26,6 +28,7 @@ import java.text.SimpleDateFormat;
26 28
 import java.time.LocalDateTime;
27 29
 import java.util.Date;
28 30
 import java.util.HashMap;
31
+import java.util.List;
29 32
 
30 33
 /**
31 34
  * <p>
@@ -45,6 +48,9 @@ public class TaBuildingDynamicController extends BaseController {
45 48
     @Autowired
46 49
     private TaBuildingMapper taBuildingMapper;
47 50
 
51
+    @Autowired
52
+    private ITaPersonService taPersonService;
53
+
48 54
     @InitBinder
49 55
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
50 56
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -79,9 +85,21 @@ public class TaBuildingDynamicController extends BaseController {
79 85
     public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId")String buildingId,
80 86
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
81 87
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
88
+                                               @RequestParam(defaultValue = "false" )boolean mine,
82 89
                                                HttpServletRequest request){
83 90
         String openid = JWTUtils.getSubject(request);
84
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
91
+        ResponseBean  responseBean = new ResponseBean();
92
+        if(mine){
93
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
94
+            if (null == taPersons || taPersons.size() != 1) {
95
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
96
+            }
97
+            TaPerson person = taPersons.get(0);
98
+            responseBean.addSuccess(taPersonService.getJoinedActivity(pageNum,pageSize,person.getPhone(),""));
99
+        }else {
100
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
101
+        }
102
+
85 103
         return responseBean;
86 104
     }
87 105
 

+ 25
- 8
src/main/java/com/huiju/estateagents/controller/TaPersonController.java 查看文件

@@ -49,13 +49,25 @@ public class TaPersonController extends BaseController {
49 49
     @GetMapping("/wx/cards")
50 50
     public ResponseBean getCardList(@RequestParam(defaultValue = "1") int pageNumber,
51 51
                                     @RequestParam(defaultValue = "10") int pageSize,
52
-                                    @RequestParam(defaultValue = "false") boolean mine) {
52
+                                    @RequestParam(defaultValue = "false") boolean mine,HttpServletRequest request) {
53 53
         if (pageNumber < 0 || pageSize < 0) {
54 54
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
55 55
         }
56
+        if (mine){
57
+            String openid = JWTUtils.getSubject(request);
58
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
59
+            if (null == taPersons || taPersons.size() != 1) {
60
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
61
+            }
62
+            TaPerson person = taPersons.get(0);
63
+            IPage<TaPerson> result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
64
+            return ResponseBean.success(result);
65
+        }else {
66
+            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize);
67
+            return ResponseBean.success(result);
68
+        }
69
+
56 70
 
57
-        IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize);
58
-        return ResponseBean.success(result);
59 71
     }
60 72
 
61 73
     /**
@@ -324,21 +336,26 @@ public class TaPersonController extends BaseController {
324 336
 
325 337
     }
326 338
     /**
327
-     * 获取收藏置业顾问列表
339
+     * 获取我参加过的活动列表
328 340
      * @param pageNumber
329 341
      * @param pageSize
330 342
      * @return
331 343
      */
332
-    @GetMapping("/wx/joinedActivity/{phone}")
344
+    @GetMapping("/wx/joinedActivity/")
333 345
     public ResponseBean getJoinedActivity(@RequestParam(defaultValue = "1") int pageNumber,
334
-                                             @RequestParam(defaultValue = "10") int pageSize,@PathVariable String phone){
346
+                                             @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request){
347
+        String openid = JWTUtils.getSubject(request);
348
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
349
+        if (null == taPersons || taPersons.size() != 1) {
350
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
351
+        }
352
+        TaPerson person = taPersons.get(0);
335 353
 
336 354
         if (pageNumber < 0 || pageSize < 0) {
337 355
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
338 356
         }
339 357
         try {
340
-            String buidling = "";
341
-            IPage<TaBuildingDynamic> result = taPersonService.getJoinedActivity(pageNumber,pageSize,phone,buidling);
358
+            IPage<TaBuildingDynamic> result = taPersonService.getJoinedActivity(pageNumber,pageSize,person.getPhone(),"");
342 359
             return ResponseBean.success(result);
343 360
         }catch (Exception e){
344 361
             e.printStackTrace();