Bläddra i källkod

* 新增接口

顾绍勇 5 år sedan
förälder
incheckning
d3b13d5733

+ 32
- 0
src/main/java/com/huiju/estateagents/controller/TaLiveActivityController.java Visa fil

183
         }
183
         }
184
         return responseBean;
184
         return responseBean;
185
     }
185
     }
186
+
187
+    /**
188
+     * 分页查询列表
189
+     *
190
+     * @param pageNum
191
+     * @param pageSize
192
+     * @param liveActivityTitle 直播活动标题
193
+     * @param cityId            所属城市
194
+     * @param buildingId        所属楼盘
195
+     * @param status            状态
196
+     * @param request
197
+     * @return
198
+     */
199
+    @RequestMapping(value = "/wx/taLiveActivity", method = RequestMethod.GET)
200
+    public ResponseBean taLiveActivityListForMiniApp(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
201
+                                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
202
+                                                     String liveActivityTitle, String cityId, String buildingId, Integer status,
203
+                                                     HttpServletRequest request) {
204
+        ResponseBean responseBean = new ResponseBean();
205
+        try {
206
+            status = status == null ? 1 : status;
207
+            IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
208
+                    liveActivityTitle, cityId, buildingId, status);
209
+            responseBean.addSuccess(result);
210
+
211
+        } catch (Exception e) {
212
+            e.printStackTrace();
213
+            logger.error("taLiveActivityListForMiniApp -=- {}", e.toString());
214
+            responseBean.addError(e.getMessage());
215
+        }
216
+        return responseBean;
217
+    }
186
 }
218
 }

+ 121
- 108
src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java Visa fil

28
 
28
 
29
 /**
29
 /**
30
  * <p>
30
  * <p>
31
-    *   前端控制器
32
-    * </p>
31
+ * 前端控制器
32
+ * </p>
33
  *
33
  *
34
  * @author jobob
34
  * @author jobob
35
  * @since 2019-07-23
35
  * @since 2019-07-23
62
 
62
 
63
     /**
63
     /**
64
      * 分页查询列表
64
      * 分页查询列表
65
+     *
65
      * @param pageNum
66
      * @param pageNum
66
      * @param pageSize
67
      * @param pageSize
67
      * @return
68
      * @return
68
      */
69
      */
69
-    @RequestMapping(value="/taPersonVisitRecord",method= RequestMethod.GET)
70
-    public ResponseBean taPersonVisitRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
71
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
70
+    @RequestMapping(value = "/taPersonVisitRecord", method = RequestMethod.GET)
71
+    public ResponseBean taPersonVisitRecordList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
72
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
72
         try {
73
         try {
73
             //使用分页插件
74
             //使用分页插件
74
-		    IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
75
+            IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
75
             QueryWrapper<TaPersonVisitRecord> queryWrapper = new QueryWrapper<>();
76
             QueryWrapper<TaPersonVisitRecord> queryWrapper = new QueryWrapper<>();
76
             queryWrapper.orderByDesc("create_date");
77
             queryWrapper.orderByDesc("create_date");
77
 
78
 
78
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.page(pg, queryWrapper);
79
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.page(pg, queryWrapper);
79
             return ResponseBean.success(result);
80
             return ResponseBean.success(result);
80
-        }catch (Exception e){
81
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
82
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
81
+        } catch (Exception e) {
82
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
83
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
83
         }
84
         }
84
     }
85
     }
85
 
86
 
86
     /**
87
     /**
87
      * 保存对象--埋点数据保存
88
      * 保存对象--埋点数据保存
89
+     *
88
      * @param taPersonVisitRecord 实体对象
90
      * @param taPersonVisitRecord 实体对象
89
      * @return
91
      * @return
90
      */
92
      */
91
-    @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.POST)
92
-    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request){
93
+    @RequestMapping(value = "/wx/taPersonVisitRecord", method = RequestMethod.POST)
94
+    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request) {
93
         String openid = getOpenId(request);
95
         String openid = getOpenId(request);
94
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
96
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
95
         if (null == taPersons || taPersons.size() != 1) {
97
         if (null == taPersons || taPersons.size() != 1) {
98
         TaPerson person = taPersons.get(0);
100
         TaPerson person = taPersons.get(0);
99
         taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
101
         taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
100
         taPersonVisitRecord.setOrgId(String.valueOf(getOrgId(request)));
102
         taPersonVisitRecord.setOrgId(String.valueOf(getOrgId(request)));
101
-        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(),taPersonVisitRecord.getEventType(),taPersonVisitRecord.getActivity(), getOrgId(request));
102
-        if(eventProperties<=0){
103
+        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(), taPersonVisitRecord.getEventType(), taPersonVisitRecord.getActivity(), getOrgId(request));
104
+        if (eventProperties <= 0) {
103
             TaEventProperties taEventProperty = new TaEventProperties();
105
             TaEventProperties taEventProperty = new TaEventProperties();
104
             taEventProperty.setBuildingId(taPersonVisitRecord.getTargetId());
106
             taEventProperty.setBuildingId(taPersonVisitRecord.getTargetId());
105
             taEventProperty.setCreateDate(LocalDateTime.now());
107
             taEventProperty.setCreateDate(LocalDateTime.now());
109
             taEventProperty.setBuildingId(taPersonVisitRecord.getBuildingId());
111
             taEventProperty.setBuildingId(taPersonVisitRecord.getBuildingId());
110
             taEventProperty.setEventType(taPersonVisitRecord.getEventType());
112
             taEventProperty.setEventType(taPersonVisitRecord.getEventType());
111
             taEventProperty.setOrgId(getOrgId(request));
113
             taEventProperty.setOrgId(getOrgId(request));
112
-            if (!taEventPropertiesService.save(taEventProperty)){
113
-                return ResponseBean.error("新增失败",ResponseBean.ERROR_UNAVAILABLE);
114
+            if (!taEventPropertiesService.save(taEventProperty)) {
115
+                return ResponseBean.error("新增失败", ResponseBean.ERROR_UNAVAILABLE);
114
             }
116
             }
115
 
117
 
116
         }
118
         }
117
 
119
 
118
         taPersonVisitRecord.setPersonId(person.getPersonId());
120
         taPersonVisitRecord.setPersonId(person.getPersonId());
119
         taPersonVisitRecord.setVisitTime(LocalDateTime.now());
121
         taPersonVisitRecord.setVisitTime(LocalDateTime.now());
120
-        if(!StringUtils.isEmpty(taPersonVisitRecord.getBuildingId())){
122
+        if (!StringUtils.isEmpty(taPersonVisitRecord.getBuildingId())) {
121
             QueryWrapper<TaBuildingIntention> intentionQueryWrapper = new QueryWrapper<>();
123
             QueryWrapper<TaBuildingIntention> intentionQueryWrapper = new QueryWrapper<>();
122
-            intentionQueryWrapper.eq("building_id",taPersonVisitRecord.getBuildingId());
124
+            intentionQueryWrapper.eq("building_id", taPersonVisitRecord.getBuildingId());
123
             intentionQueryWrapper.eq("org_id", getOrgId(request));
125
             intentionQueryWrapper.eq("org_id", getOrgId(request));
124
-            intentionQueryWrapper.eq("event_code",taPersonVisitRecord.getEvent());
125
-            List<TaBuildingIntention>list = buildingIntentionService.list(intentionQueryWrapper);
126
-            if (list.size()>0){
126
+            intentionQueryWrapper.eq("event_code", taPersonVisitRecord.getEvent());
127
+            List<TaBuildingIntention> list = buildingIntentionService.list(intentionQueryWrapper);
128
+            if (list.size() > 0) {
127
                 TaBuildingIntention buildingIntention = list.get(0);
129
                 TaBuildingIntention buildingIntention = list.get(0);
128
                 TaPersonIntentionRecord intentionRecord = new TaPersonIntentionRecord();
130
                 TaPersonIntentionRecord intentionRecord = new TaPersonIntentionRecord();
129
                 TaBuilding building = buildingService.getById(buildingIntention.getBuildingId());
131
                 TaBuilding building = buildingService.getById(buildingIntention.getBuildingId());
138
                 intentionRecord.setPersonId(person.getPersonId());
140
                 intentionRecord.setPersonId(person.getPersonId());
139
                 intentionRecord.setPersonName(person.getNickname());
141
                 intentionRecord.setPersonName(person.getNickname());
140
                 intentionRecord.setStatus(CommConstant.STATUS_NORMAL);
142
                 intentionRecord.setStatus(CommConstant.STATUS_NORMAL);
141
-                if (!personIntentionRecordService.save(intentionRecord)){
142
-                    return ResponseBean.error("新增失败",ResponseBean.ERROR_UNAVAILABLE);
143
+                if (!personIntentionRecordService.save(intentionRecord)) {
144
+                    return ResponseBean.error("新增失败", ResponseBean.ERROR_UNAVAILABLE);
143
                 }
145
                 }
144
             }
146
             }
145
         }
147
         }
146
         try {
148
         try {
147
-            if (iTaPersonVisitRecordService.save(taPersonVisitRecord)){
149
+            if (iTaPersonVisitRecordService.save(taPersonVisitRecord)) {
148
                 //清洗埋點數據到新增用戶表--只有进入小程序的时候 start才记录
150
                 //清洗埋點數據到新增用戶表--只有进入小程序的时候 start才记录
149
-                if(taPersonVisitRecord.getEvent().equals(CommConstant.BIZ_EVENT_START)){
151
+                if (taPersonVisitRecord.getEvent().equals(CommConstant.BIZ_EVENT_START)) {
150
                     iTaPersonFromRecordService.addNewPersonRecordRecord(taPersonVisitRecord);
152
                     iTaPersonFromRecordService.addNewPersonRecordRecord(taPersonVisitRecord);
151
                 }
153
                 }
152
 
154
 
153
                 return ResponseBean.success(taPersonVisitRecord);
155
                 return ResponseBean.success(taPersonVisitRecord);
154
-            }else {
155
-                return ResponseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
156
+            } else {
157
+                return ResponseBean.error("保存失败", ResponseBean.ERROR_UNAVAILABLE);
156
             }
158
             }
157
-        }catch (Exception e){
158
-            logger.error("taPersonVisitRecordAdd -=- {}",e.toString());
159
-            return ResponseBean.error("系统异常"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
159
+        } catch (Exception e) {
160
+            logger.error("taPersonVisitRecordAdd -=- {}", e.toString());
161
+            return ResponseBean.error("系统异常" + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
160
         }
162
         }
161
     }
163
     }
162
 
164
 
163
     /**
165
     /**
164
      * 根据id删除对象
166
      * 根据id删除对象
165
-     * @param id  实体ID
167
+     *
168
+     * @param id 实体ID
166
      */
169
      */
167
     @ResponseBody
170
     @ResponseBody
168
-    @RequestMapping(value="/taPersonVisitRecord/{id}", method= RequestMethod.DELETE)
169
-    public ResponseBean taPersonVisitRecordDelete(@PathVariable Integer id){
171
+    @RequestMapping(value = "/taPersonVisitRecord/{id}", method = RequestMethod.DELETE)
172
+    public ResponseBean taPersonVisitRecordDelete(@PathVariable Integer id) {
170
         try {
173
         try {
171
-            if(iTaPersonVisitRecordService.removeById(id)){
174
+            if (iTaPersonVisitRecordService.removeById(id)) {
172
                 return ResponseBean.success("success");
175
                 return ResponseBean.success("success");
173
-            }else {
174
-                return ResponseBean.error("删除失败",ResponseBean.ERROR_UNAVAILABLE);
176
+            } else {
177
+                return ResponseBean.error("删除失败", ResponseBean.ERROR_UNAVAILABLE);
175
             }
178
             }
176
-        }catch (Exception e){
177
-            logger.error("taPersonVisitRecordDelete -=- {}",e.toString());
178
-            return ResponseBean.error("保存失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
179
+        } catch (Exception e) {
180
+            logger.error("taPersonVisitRecordDelete -=- {}", e.toString());
181
+            return ResponseBean.error("保存失败" + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
179
         }
182
         }
180
     }
183
     }
181
 
184
 
182
     /**
185
     /**
183
      * 修改对象
186
      * 修改对象
184
-     * @param id  实体ID
187
+     *
188
+     * @param id 实体ID
185
      * @return
189
      * @return
186
      */
190
      */
187
-    @RequestMapping(value="/wx/taPersonVisitRecord/{id}",method= RequestMethod.PUT)
188
-    public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id){
191
+    @RequestMapping(value = "/wx/taPersonVisitRecord/{id}", method = RequestMethod.PUT)
192
+    public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id) {
189
         TaPersonVisitRecord taPersonVisitRecord = iTaPersonVisitRecordService.getById(id);
193
         TaPersonVisitRecord taPersonVisitRecord = iTaPersonVisitRecordService.getById(id);
190
-        if(null == taPersonVisitRecord){
191
-            return ResponseBean.error("更新失败",ResponseBean.ERROR_UNAVAILABLE);
194
+        if (null == taPersonVisitRecord) {
195
+            return ResponseBean.error("更新失败", ResponseBean.ERROR_UNAVAILABLE);
192
         }
196
         }
193
         taPersonVisitRecord.setLeaveTime(LocalDateTime.now());
197
         taPersonVisitRecord.setLeaveTime(LocalDateTime.now());
194
         taPersonVisitRecord.setRecordId(id);
198
         taPersonVisitRecord.setRecordId(id);
195
-        Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond()-taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();
199
+        Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond() - taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();
196
         taPersonVisitRecord.setVisitDuration(duation.intValue());
200
         taPersonVisitRecord.setVisitDuration(duation.intValue());
197
         try {
201
         try {
198
-            if (iTaPersonVisitRecordService.updateById(taPersonVisitRecord)){
202
+            if (iTaPersonVisitRecordService.updateById(taPersonVisitRecord)) {
199
                 return ResponseBean.success(taPersonVisitRecord);
203
                 return ResponseBean.success(taPersonVisitRecord);
200
-            }else {
201
-                return ResponseBean.error("更新失败",ResponseBean.ERROR_UNAVAILABLE);
204
+            } else {
205
+                return ResponseBean.error("更新失败", ResponseBean.ERROR_UNAVAILABLE);
202
             }
206
             }
203
-        }catch (Exception e){
204
-            logger.error("taPersonVisitRecordUpdate -=- {}",e.toString());
205
-            return ResponseBean.error("更新失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
207
+        } catch (Exception e) {
208
+            logger.error("taPersonVisitRecordUpdate -=- {}", e.toString());
209
+            return ResponseBean.error("更新失败" + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
206
         }
210
         }
207
     }
211
     }
208
 
212
 
209
     /**
213
     /**
210
      * 根据id查询对象
214
      * 根据id查询对象
211
-     * @param id  实体ID
215
+     *
216
+     * @param id 实体ID
212
      */
217
      */
213
-    @RequestMapping(value="/taPersonVisitRecord/{id}",method= RequestMethod.GET)
214
-    public ResponseBean taPersonVisitRecordGet(@PathVariable Integer id){
218
+    @RequestMapping(value = "/taPersonVisitRecord/{id}", method = RequestMethod.GET)
219
+    public ResponseBean taPersonVisitRecordGet(@PathVariable Integer id) {
215
         try {
220
         try {
216
             return ResponseBean.success(iTaPersonVisitRecordService.getById(id));
221
             return ResponseBean.success(iTaPersonVisitRecordService.getById(id));
217
-        }catch (Exception e){
218
-            logger.error("taPersonVisitRecordDelete -=- {}",e.toString());
219
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
222
+        } catch (Exception e) {
223
+            logger.error("taPersonVisitRecordDelete -=- {}", e.toString());
224
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
220
         }
225
         }
221
     }
226
     }
222
 
227
 
223
     /**
228
     /**
224
      * 盘客工具分页获取访问记录
229
      * 盘客工具分页获取访问记录
230
+     *
225
      * @param pageNumber
231
      * @param pageNumber
226
      * @param pageSize
232
      * @param pageSize
227
      * @return
233
      * @return
228
      */
234
      */
229
-    @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.GET)
230
-    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
231
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
232
-                                                @RequestParam(value = "customerId") String customerId){
235
+    @RequestMapping(value = "/wx/taPersonVisitRecord", method = RequestMethod.GET)
236
+    public ResponseBean wxPersonVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
237
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
238
+                                                @RequestParam(value = "customerId") String customerId) {
233
         try {
239
         try {
234
             //使用分页插件
240
             //使用分页插件
235
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
241
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
236
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getPersonVisitRecordList(pg, customerId);
242
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getPersonVisitRecordList(pg, customerId);
237
             return ResponseBean.success(result);
243
             return ResponseBean.success(result);
238
-        }catch (Exception e){
244
+        } catch (Exception e) {
239
             e.printStackTrace();
245
             e.printStackTrace();
240
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
241
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
246
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
247
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
242
         }
248
         }
243
     }
249
     }
244
 
250
 
245
-    @RequestMapping(value="/admin/taDrainageVisitRecord", method = RequestMethod.GET)
246
-    public ResponseBean drainageVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
247
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
248
-                                                @RequestParam(value ="activityName",required = false) String activityName,
249
-                                                @RequestParam(value ="buildingId",required = false) String buildingId,
250
-                                                @RequestParam(value ="shareName",required = false) String shareName,
251
-                                                @RequestParam(value ="shareTel",required = false) String shareTel,
252
-                                                @RequestParam(value ="eventType",required = false) String eventType,
253
-                                                @RequestParam(value ="personType",required = false) String personType,
251
+    @RequestMapping(value = "/admin/taDrainageVisitRecord", method = RequestMethod.GET)
252
+    public ResponseBean drainageVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
253
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
254
+                                                @RequestParam(value = "activityName", required = false) String activityName,
255
+                                                @RequestParam(value = "buildingId", required = false) String buildingId,
256
+                                                @RequestParam(value = "shareName", required = false) String shareName,
257
+                                                @RequestParam(value = "shareTel", required = false) String shareTel,
258
+                                                @RequestParam(value = "eventType", required = false) String eventType,
259
+                                                @RequestParam(value = "personType", required = false) String personType,
254
                                                 HttpServletRequest request) {
260
                                                 HttpServletRequest request) {
255
         ResponseBean responseBean = new ResponseBean();
261
         ResponseBean responseBean = new ResponseBean();
256
         try {
262
         try {
267
 
273
 
268
     /**
274
     /**
269
      * 个人中心访客记录分页查询
275
      * 个人中心访客记录分页查询
276
+     *
270
      * @param pageNumber
277
      * @param pageNumber
271
      * @param pageSize
278
      * @param pageSize
272
      * @return
279
      * @return
273
      */
280
      */
274
-    @RequestMapping(value="/wx/visitRecord",method= RequestMethod.GET)
275
-    public ResponseBean getWxVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
276
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
277
-                                          @RequestParam(value = "userId") Integer userId,HttpServletRequest request){
281
+    @RequestMapping(value = "/wx/visitRecord", method = RequestMethod.GET)
282
+    public ResponseBean getWxVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
283
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
284
+                                             @RequestParam(value = "userId") Integer userId, HttpServletRequest request) {
278
         try {
285
         try {
279
             //使用分页插件
286
             //使用分页插件
280
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
287
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
281
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId,getOrgId(request));
288
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId, getOrgId(request));
282
             return ResponseBean.success(result);
289
             return ResponseBean.success(result);
283
-        }catch (Exception e){
290
+        } catch (Exception e) {
284
             e.printStackTrace();
291
             e.printStackTrace();
285
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
286
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
292
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
293
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
287
         }
294
         }
288
     }
295
     }
289
 
296
 
290
     /**
297
     /**
291
      * 个人中心访客记录单个人员的所有活动
298
      * 个人中心访客记录单个人员的所有活动
299
+     *
292
      * @return
300
      * @return
293
      */
301
      */
294
-    @RequestMapping(value="/wx/visitRecord/activity",method= RequestMethod.GET)
295
-    public ResponseBean wxVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
296
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
302
+    @RequestMapping(value = "/wx/visitRecord/activity", method = RequestMethod.GET)
303
+    public ResponseBean wxVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
304
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
297
                                           @RequestParam(value = "userId") Integer userId,
305
                                           @RequestParam(value = "userId") Integer userId,
298
                                           @RequestParam(value = "personId") String personId,
306
                                           @RequestParam(value = "personId") String personId,
299
-                                          HttpServletRequest request){
307
+                                          HttpServletRequest request) {
300
         try {
308
         try {
301
             //使用分页插件
309
             //使用分页插件
302
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
310
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
303
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordActivityList(pg, userId,personId,getOrgId(request));
311
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordActivityList(pg, userId, personId, getOrgId(request));
304
             return ResponseBean.success(result);
312
             return ResponseBean.success(result);
305
-        }catch (Exception e){
313
+        } catch (Exception e) {
306
             e.printStackTrace();
314
             e.printStackTrace();
307
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
308
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
315
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
316
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
309
         }
317
         }
310
     }
318
     }
311
 
319
 
312
     /**
320
     /**
313
      * 个人中心访客记录分页查询
321
      * 个人中心访客记录分页查询
322
+     *
314
      * @param pageNumber
323
      * @param pageNumber
315
      * @param pageSize
324
      * @param pageSize
316
      * @return
325
      * @return
317
      */
326
      */
318
-    @RequestMapping(value="/wx/activityVisitRecord",method= RequestMethod.GET)
319
-    public ResponseBean wxPersonActivityVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
320
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
321
-                                                @RequestParam(value = "userId") Integer userId,
322
-                                                @RequestParam(value = "targetId")String targetId,
323
-                                                @RequestParam(value = "eventType")String eventType,
324
-                                                HttpServletRequest request){
327
+    @RequestMapping(value = "/wx/activityVisitRecord", method = RequestMethod.GET)
328
+    public ResponseBean wxPersonActivityVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
329
+                                                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
330
+                                                        @RequestParam(value = "userId") Integer userId,
331
+                                                        @RequestParam(value = "targetId") String targetId,
332
+                                                        @RequestParam(value = "eventType") String eventType,
333
+                                                        HttpServletRequest request) {
325
         try {
334
         try {
326
             //使用分页插件
335
             //使用分页插件
327
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
336
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
328
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, userId,getOrgId(request),targetId, eventType);
337
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, userId, getOrgId(request), targetId, eventType);
329
             return ResponseBean.success(result);
338
             return ResponseBean.success(result);
330
-        }catch (Exception e){
339
+        } catch (Exception e) {
331
             e.printStackTrace();
340
             e.printStackTrace();
332
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
333
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
341
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
342
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
334
         }
343
         }
335
     }
344
     }
336
 
345
 
337
     /**
346
     /**
338
      * 置业顾问分享项目、活动、资讯、助力、拼团信息
347
      * 置业顾问分享项目、活动、资讯、助力、拼团信息
348
+     *
339
      * @param pageNumber
349
      * @param pageNumber
340
      * @param pageSize
350
      * @param pageSize
341
      * @param userId
351
      * @param userId
342
      * @param request
352
      * @param request
343
      * @return
353
      * @return
344
      */
354
      */
345
-    @RequestMapping(value = "/wx/shareRecords",method= RequestMethod.GET)
346
-    public ResponseBean wxShareRecordsByUserId(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
347
-                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
348
-                                              @RequestParam(value = "userId") Integer userId,
349
-                                              HttpServletRequest request){
355
+    @RequestMapping(value = "/wx/shareRecords", method = RequestMethod.GET)
356
+    public ResponseBean wxShareRecordsByUserId(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
357
+                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
358
+                                               @RequestParam(value = "userId") Integer userId,
359
+                                               HttpServletRequest request) {
350
         ResponseBean responseBean = new ResponseBean();
360
         ResponseBean responseBean = new ResponseBean();
351
-        if (userId == null){
361
+        if (userId == null) {
352
             return responseBean;
362
             return responseBean;
353
         }
363
         }
354
         //使用分页插件
364
         //使用分页插件
359
         IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, taPerson.getPersonId());
369
         IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, taPerson.getPersonId());
360
 
370
 
361
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
371
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
362
-        taConsultantInfos.forEach(e ->{
363
-            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(e.getEventType()) ? "dynamic" : e.getEventType())  + "_share");
364
-            switch (e.getEventType()){
372
+        taConsultantInfos.forEach(e -> {
373
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(e.getEventType()) ? "dynamic" : e.getEventType()) + "_share");
374
+            switch (e.getEventType()) {
365
                 case CommConstant.FAVOR_ACTIVITY:
375
                 case CommConstant.FAVOR_ACTIVITY:
366
                     e.setActivityShareNum(shareNum);
376
                     e.setActivityShareNum(shareNum);
367
                     break;
377
                     break;
383
                 case CommConstant.HOUSE:
393
                 case CommConstant.HOUSE:
384
                     e.setHouseShareNum(shareNum);
394
                     e.setHouseShareNum(shareNum);
385
                     break;
395
                     break;
396
+                case CommConstant.LIVE:
397
+                    e.setLiveSareNum(shareNum);
398
+                    break;
386
             }
399
             }
387
         });
400
         });
388
         result.setRecords(taConsultantInfos);
401
         result.setRecords(taConsultantInfos);

+ 2
- 0
src/main/java/com/huiju/estateagents/entity/TaConsultantInfo.java Visa fil

37
     private Integer buildingTypeId;
37
     private Integer buildingTypeId;
38
 
38
 
39
     private String priceType;
39
     private String priceType;
40
+
41
+    private Integer liveSareNum;
40
 }
42
 }

+ 0
- 1
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Visa fil

296
         List<TaShareActivity> shareActivityList = taShareActivityMapper.selectList(shareActivityQueryWrapper);
296
         List<TaShareActivity> shareActivityList = taShareActivityMapper.selectList(shareActivityQueryWrapper);
297
         building.setShareActivityList(shareActivityList);
297
         building.setShareActivityList(shareActivityList);
298
 
298
 
299
-
300
         // TODO 直播活动
299
         // TODO 直播活动
301
         QueryWrapper<TaLiveActivity> liveActivityQueryWrapper = new QueryWrapper<>();
300
         QueryWrapper<TaLiveActivity> liveActivityQueryWrapper = new QueryWrapper<>();
302
         liveActivityQueryWrapper.eq("building_id",id);
301
         liveActivityQueryWrapper.eq("building_id",id);

+ 23
- 0
src/main/resources/mapper/TaPersonVisitRecordMapper.xml Visa fil

356
             ) t
356
             ) t
357
             group by t.target_id
357
             group by t.target_id
358
 
358
 
359
+			union all
360
+				select * from (
361
+					SELECT
362
+						t.be_share AS target_id,
363
+						g.list_img AS activity_img,
364
+						g.live_activity_title AS activity_name,
365
+						'1' AS price,
366
+						'2' AS building_name,
367
+						'3' AS address,
368
+						1 AS building_type_id,
369
+						LEFT ( t.tagert_type, 5 ) AS eventType,
370
+						t.create_date AS visit_time
371
+					FROM
372
+						ta_share t
373
+						LEFT JOIN ta_live_activity g ON t.be_share = g.live_activity_id
374
+					WHERE
375
+						t.tagert_type LIKE CONCAT( 'live', '%' )
376
+							AND t.person_id = #{personId}
377
+						ORDER BY
378
+							t.create_date DESC
379
+							LIMIT 9999
380
+					) t
381
+				group by t.target_id
359
         ) t
382
         ) t
360
         order by t.visit_time desc
383
         order by t.visit_time desc
361
     </select>
384
     </select>