* 新增接口

src/main/java/com/huiju/estateagents/controller/TaLiveActivityController.java

@@ -183,4 +183,36 @@ public class TaLiveActivityController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param liveActivityTitle 直播活动标题
+     * @param cityId            所属城市
+     * @param buildingId        所属楼盘
+     * @param status            状态
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/wx/taLiveActivity", method = RequestMethod.GET)
+    public ResponseBean taLiveActivityListForMiniApp(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                     String liveActivityTitle, String cityId, String buildingId, Integer status,
+                                                     HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            status = status == null ? 1 : status;
+            IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
+                    liveActivityTitle, cityId, buildingId, status);
+            responseBean.addSuccess(result);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taLiveActivityListForMiniApp -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java

@@ -28,8 +28,8 @@ import java.util.Map;
 
 /**
  * <p>
-    *   前端控制器
-    * </p>
+ * 前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2019-07-23
@@ -62,34 +62,36 @@ public class TaPersonVisitRecordController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taPersonVisitRecord",method= RequestMethod.GET)
-    public ResponseBean taPersonVisitRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/taPersonVisitRecord", method = RequestMethod.GET)
+    public ResponseBean taPersonVisitRecordList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         try {
             //使用分页插件
-		    IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
+            IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaPersonVisitRecord> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.page(pg, queryWrapper);
             return ResponseBean.success(result);
-        }catch (Exception e){
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        } catch (Exception e) {
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 保存对象--埋点数据保存
+     *
      * @param taPersonVisitRecord 实体对象
      * @return
      */
-    @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.POST)
-    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request){
+    @RequestMapping(value = "/wx/taPersonVisitRecord", method = RequestMethod.POST)
+    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request) {
         String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
@@ -98,8 +100,8 @@ public class TaPersonVisitRecordController extends BaseController {
         TaPerson person = taPersons.get(0);
         taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
         taPersonVisitRecord.setOrgId(String.valueOf(getOrgId(request)));
-        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(),taPersonVisitRecord.getEventType(),taPersonVisitRecord.getActivity(), getOrgId(request));
-        if(eventProperties<=0){
+        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(), taPersonVisitRecord.getEventType(), taPersonVisitRecord.getActivity(), getOrgId(request));
+        if (eventProperties <= 0) {
             TaEventProperties taEventProperty = new TaEventProperties();
             taEventProperty.setBuildingId(taPersonVisitRecord.getTargetId());
             taEventProperty.setCreateDate(LocalDateTime.now());
@@ -109,21 +111,21 @@ public class TaPersonVisitRecordController extends BaseController {
             taEventProperty.setBuildingId(taPersonVisitRecord.getBuildingId());
             taEventProperty.setEventType(taPersonVisitRecord.getEventType());
             taEventProperty.setOrgId(getOrgId(request));
-            if (!taEventPropertiesService.save(taEventProperty)){
-                return ResponseBean.error("新增失败",ResponseBean.ERROR_UNAVAILABLE);
+            if (!taEventPropertiesService.save(taEventProperty)) {
+                return ResponseBean.error("新增失败", ResponseBean.ERROR_UNAVAILABLE);
             }
 
         }
 
         taPersonVisitRecord.setPersonId(person.getPersonId());
         taPersonVisitRecord.setVisitTime(LocalDateTime.now());
-        if(!StringUtils.isEmpty(taPersonVisitRecord.getBuildingId())){
+        if (!StringUtils.isEmpty(taPersonVisitRecord.getBuildingId())) {
             QueryWrapper<TaBuildingIntention> intentionQueryWrapper = new QueryWrapper<>();
-            intentionQueryWrapper.eq("building_id",taPersonVisitRecord.getBuildingId());
+            intentionQueryWrapper.eq("building_id", taPersonVisitRecord.getBuildingId());
             intentionQueryWrapper.eq("org_id", getOrgId(request));
-            intentionQueryWrapper.eq("event_code",taPersonVisitRecord.getEvent());
-            List<TaBuildingIntention>list = buildingIntentionService.list(intentionQueryWrapper);
-            if (list.size()>0){
+            intentionQueryWrapper.eq("event_code", taPersonVisitRecord.getEvent());
+            List<TaBuildingIntention> list = buildingIntentionService.list(intentionQueryWrapper);
+            if (list.size() > 0) {
                 TaBuildingIntention buildingIntention = list.get(0);
                 TaPersonIntentionRecord intentionRecord = new TaPersonIntentionRecord();
                 TaBuilding building = buildingService.getById(buildingIntention.getBuildingId());
@@ -138,119 +140,123 @@ public class TaPersonVisitRecordController extends BaseController {
                 intentionRecord.setPersonId(person.getPersonId());
                 intentionRecord.setPersonName(person.getNickname());
                 intentionRecord.setStatus(CommConstant.STATUS_NORMAL);
-                if (!personIntentionRecordService.save(intentionRecord)){
-                    return ResponseBean.error("新增失败",ResponseBean.ERROR_UNAVAILABLE);
+                if (!personIntentionRecordService.save(intentionRecord)) {
+                    return ResponseBean.error("新增失败", ResponseBean.ERROR_UNAVAILABLE);
                 }
             }
         }
         try {
-            if (iTaPersonVisitRecordService.save(taPersonVisitRecord)){
+            if (iTaPersonVisitRecordService.save(taPersonVisitRecord)) {
                 //清洗埋點數據到新增用戶表--只有进入小程序的时候 start才记录
-                if(taPersonVisitRecord.getEvent().equals(CommConstant.BIZ_EVENT_START)){
+                if (taPersonVisitRecord.getEvent().equals(CommConstant.BIZ_EVENT_START)) {
                     iTaPersonFromRecordService.addNewPersonRecordRecord(taPersonVisitRecord);
                 }
 
                 return ResponseBean.success(taPersonVisitRecord);
-            }else {
-                return ResponseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
+            } else {
+                return ResponseBean.error("保存失败", ResponseBean.ERROR_UNAVAILABLE);
             }
-        }catch (Exception e){
-            logger.error("taPersonVisitRecordAdd -=- {}",e.toString());
-            return ResponseBean.error("系统异常"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        } catch (Exception e) {
+            logger.error("taPersonVisitRecordAdd -=- {}", e.toString());
+            return ResponseBean.error("系统异常" + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taPersonVisitRecord/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taPersonVisitRecordDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taPersonVisitRecord/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taPersonVisitRecordDelete(@PathVariable Integer id) {
         try {
-            if(iTaPersonVisitRecordService.removeById(id)){
+            if (iTaPersonVisitRecordService.removeById(id)) {
                 return ResponseBean.success("success");
-            }else {
-                return ResponseBean.error("删除失败",ResponseBean.ERROR_UNAVAILABLE);
+            } else {
+                return ResponseBean.error("删除失败", ResponseBean.ERROR_UNAVAILABLE);
             }
-        }catch (Exception e){
-            logger.error("taPersonVisitRecordDelete -=- {}",e.toString());
-            return ResponseBean.error("保存失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        } catch (Exception e) {
+            logger.error("taPersonVisitRecordDelete -=- {}", e.toString());
+            return ResponseBean.error("保存失败" + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      * @return
      */
-    @RequestMapping(value="/wx/taPersonVisitRecord/{id}",method= RequestMethod.PUT)
-    public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id){
+    @RequestMapping(value = "/wx/taPersonVisitRecord/{id}", method = RequestMethod.PUT)
+    public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id) {
         TaPersonVisitRecord taPersonVisitRecord = iTaPersonVisitRecordService.getById(id);
-        if(null == taPersonVisitRecord){
-            return ResponseBean.error("更新失败",ResponseBean.ERROR_UNAVAILABLE);
+        if (null == taPersonVisitRecord) {
+            return ResponseBean.error("更新失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         taPersonVisitRecord.setLeaveTime(LocalDateTime.now());
         taPersonVisitRecord.setRecordId(id);
-        Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond()-taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();
+        Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond() - taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();
         taPersonVisitRecord.setVisitDuration(duation.intValue());
         try {
-            if (iTaPersonVisitRecordService.updateById(taPersonVisitRecord)){
+            if (iTaPersonVisitRecordService.updateById(taPersonVisitRecord)) {
                 return ResponseBean.success(taPersonVisitRecord);
-            }else {
-                return ResponseBean.error("更新失败",ResponseBean.ERROR_UNAVAILABLE);
+            } else {
+                return ResponseBean.error("更新失败", ResponseBean.ERROR_UNAVAILABLE);
             }
-        }catch (Exception e){
-            logger.error("taPersonVisitRecordUpdate -=- {}",e.toString());
-            return ResponseBean.error("更新失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        } catch (Exception e) {
+            logger.error("taPersonVisitRecordUpdate -=- {}", e.toString());
+            return ResponseBean.error("更新失败" + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taPersonVisitRecord/{id}",method= RequestMethod.GET)
-    public ResponseBean taPersonVisitRecordGet(@PathVariable Integer id){
+    @RequestMapping(value = "/taPersonVisitRecord/{id}", method = RequestMethod.GET)
+    public ResponseBean taPersonVisitRecordGet(@PathVariable Integer id) {
         try {
             return ResponseBean.success(iTaPersonVisitRecordService.getById(id));
-        }catch (Exception e){
-            logger.error("taPersonVisitRecordDelete -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        } catch (Exception e) {
+            logger.error("taPersonVisitRecordDelete -=- {}", e.toString());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 盘客工具分页获取访问记录
+     *
      * @param pageNumber
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.GET)
-    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                @RequestParam(value = "customerId") String customerId){
+    @RequestMapping(value = "/wx/taPersonVisitRecord", method = RequestMethod.GET)
+    public ResponseBean wxPersonVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value = "customerId") String customerId) {
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getPersonVisitRecordList(pg, customerId);
             return ResponseBean.success(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
-    @RequestMapping(value="/admin/taDrainageVisitRecord", method = RequestMethod.GET)
-    public ResponseBean drainageVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                @RequestParam(value ="activityName",required = false) String activityName,
-                                                @RequestParam(value ="buildingId",required = false) String buildingId,
-                                                @RequestParam(value ="shareName",required = false) String shareName,
-                                                @RequestParam(value ="shareTel",required = false) String shareTel,
-                                                @RequestParam(value ="eventType",required = false) String eventType,
-                                                @RequestParam(value ="personType",required = false) String personType,
+    @RequestMapping(value = "/admin/taDrainageVisitRecord", method = RequestMethod.GET)
+    public ResponseBean drainageVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value = "activityName", required = false) String activityName,
+                                                @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                @RequestParam(value = "shareName", required = false) String shareName,
+                                                @RequestParam(value = "shareTel", required = false) String shareTel,
+                                                @RequestParam(value = "eventType", required = false) String eventType,
+                                                @RequestParam(value = "personType", required = false) String personType,
                                                 HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -267,88 +273,92 @@ public class TaPersonVisitRecordController extends BaseController {
 
     /**
      * 个人中心访客记录分页查询
+     *
      * @param pageNumber
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/wx/visitRecord",method= RequestMethod.GET)
-    public ResponseBean getWxVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                          @RequestParam(value = "userId") Integer userId,HttpServletRequest request){
+    @RequestMapping(value = "/wx/visitRecord", method = RequestMethod.GET)
+    public ResponseBean getWxVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                             @RequestParam(value = "userId") Integer userId, HttpServletRequest request) {
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId,getOrgId(request));
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId, getOrgId(request));
             return ResponseBean.success(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 个人中心访客记录单个人员的所有活动
+     *
      * @return
      */
-    @RequestMapping(value="/wx/visitRecord/activity",method= RequestMethod.GET)
-    public ResponseBean wxVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+    @RequestMapping(value = "/wx/visitRecord/activity", method = RequestMethod.GET)
+    public ResponseBean wxVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                           @RequestParam(value = "userId") Integer userId,
                                           @RequestParam(value = "personId") String personId,
-                                          HttpServletRequest request){
+                                          HttpServletRequest request) {
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordActivityList(pg, userId,personId,getOrgId(request));
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordActivityList(pg, userId, personId, getOrgId(request));
             return ResponseBean.success(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 个人中心访客记录分页查询
+     *
      * @param pageNumber
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/wx/activityVisitRecord",method= RequestMethod.GET)
-    public ResponseBean wxPersonActivityVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                @RequestParam(value = "userId") Integer userId,
-                                                @RequestParam(value = "targetId")String targetId,
-                                                @RequestParam(value = "eventType")String eventType,
-                                                HttpServletRequest request){
+    @RequestMapping(value = "/wx/activityVisitRecord", method = RequestMethod.GET)
+    public ResponseBean wxPersonActivityVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                        @RequestParam(value = "userId") Integer userId,
+                                                        @RequestParam(value = "targetId") String targetId,
+                                                        @RequestParam(value = "eventType") String eventType,
+                                                        HttpServletRequest request) {
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, userId,getOrgId(request),targetId, eventType);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, userId, getOrgId(request), targetId, eventType);
             return ResponseBean.success(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 置业顾问分享项目、活动、资讯、助力、拼团信息
+     *
      * @param pageNumber
      * @param pageSize
      * @param userId
      * @param request
      * @return
      */
-    @RequestMapping(value = "/wx/shareRecords",method= RequestMethod.GET)
-    public ResponseBean wxShareRecordsByUserId(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                              @RequestParam(value = "userId") Integer userId,
-                                              HttpServletRequest request){
+    @RequestMapping(value = "/wx/shareRecords", method = RequestMethod.GET)
+    public ResponseBean wxShareRecordsByUserId(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                               @RequestParam(value = "userId") Integer userId,
+                                               HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        if (userId == null){
+        if (userId == null) {
             return responseBean;
         }
         //使用分页插件
@@ -359,9 +369,9 @@ public class TaPersonVisitRecordController extends BaseController {
         IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, taPerson.getPersonId());
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
-        taConsultantInfos.forEach(e ->{
-            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");
-            switch (e.getEventType()){
+        taConsultantInfos.forEach(e -> {
+            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");
+            switch (e.getEventType()) {
                 case CommConstant.FAVOR_ACTIVITY:
                     e.setActivityShareNum(shareNum);
                     break;
@@ -383,6 +393,9 @@ public class TaPersonVisitRecordController extends BaseController {
                 case CommConstant.HOUSE:
                     e.setHouseShareNum(shareNum);
                     break;
+                case CommConstant.LIVE:
+                    e.setLiveSareNum(shareNum);
+                    break;
             }
         });
         result.setRecords(taConsultantInfos);

src/main/java/com/huiju/estateagents/entity/TaConsultantInfo.java

@@ -37,4 +37,6 @@ public class TaConsultantInfo {
     private Integer buildingTypeId;
 
     private String priceType;
+
+    private Integer liveSareNum;
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -296,7 +296,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaShareActivity> shareActivityList = taShareActivityMapper.selectList(shareActivityQueryWrapper);
         building.setShareActivityList(shareActivityList);
 
-
         // TODO 直播活动
         QueryWrapper<TaLiveActivity> liveActivityQueryWrapper = new QueryWrapper<>();
         liveActivityQueryWrapper.eq("building_id",id);

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -356,6 +356,29 @@
             ) t
             group by t.target_id
 
+			union all
+				select * from (
+					SELECT
+						t.be_share AS target_id,
+						g.list_img AS activity_img,
+						g.live_activity_title AS activity_name,
+						'1' AS price,
+						'2' AS building_name,
+						'3' AS address,
+						1 AS building_type_id,
+						LEFT ( t.tagert_type, 5 ) AS eventType,
+						t.create_date AS visit_time
+					FROM
+						ta_share t
+						LEFT JOIN ta_live_activity g ON t.be_share = g.live_activity_id
+					WHERE
+						t.tagert_type LIKE CONCAT( 'live', '%' )
+							AND t.person_id = #{personId}
+						ORDER BY
+							t.create_date DESC
+							LIMIT 9999
+					) t
+				group by t.target_id
         ) t
         order by t.visit_time desc
     </select>