拆分统计

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

@@ -64,8 +64,9 @@ public class StatisticalController {
     public ResponseBean selectUserBehavior(@RequestParam(required = false) Integer pageNum,
                                            @RequestParam(required = false) Integer pageCode,
                                            @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
-                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate) {
-        return iStatisticalService.selectUserBehavior(pageNum, pageCode, startDate, endDate);
+                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                           @RequestParam(value = "buildingId", required = false) String buildingId) {
+        return iStatisticalService.selectUserBehavior(pageNum, pageCode, startDate, endDate, buildingId);
     }
 
     /**
@@ -91,5 +92,51 @@ public class StatisticalController {
     }
 
 
+    /**
+     * 用户总数
+     * @return
+     */
+    @GetMapping(value = "/admin/selectUserCount")
+    public ResponseBean selectUserResource() {
+        return iStatisticalService.selectUserCount();
+    }
+
+    /**
+     * 用户注册数
+     * @return
+     */
+    @GetMapping(value = "/admin/selectRegisteredCount")
+    public ResponseBean selectRegisteredCount() {
+        return iStatisticalService.selectRegisteredCount();
+    }
+
+    /**
+     * 用户最近七天
+     * @return
+     */
+    @GetMapping(value = "/admin/selectRecentlyCount")
+    public ResponseBean selectRecentlyCount(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate) {
+        return iStatisticalService.selectRecentlyCount(startDate, endDate);
+    }
+
+    /**
+     * 性别比例
+     * @return
+     */
+    @GetMapping(value = "/admin/selectSexUser")
+    public ResponseBean selectSexUser() {
+        return iStatisticalService.selectSexUser();
+    }
+
+    /**
+     * 城市比例
+     * @return
+     */
+    @GetMapping(value = "/admin/selectCityUser")
+    public ResponseBean selectCityUser() {
+        return iStatisticalService.selectCityUser();
+    }
+
 
 }

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -86,7 +86,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param endDate
      * @return
      */
-    List<PersonPO> selectUserBehavior(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<PersonPO> selectUserBehavior(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate, @Param("buildingId") String buildingId);
 
     /**
      * 活跃用户数 / 最近新增的用户数

src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java

@@ -30,7 +30,7 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      * @param page
      * @return
      */
-    IPage<TaPersonVisitRecord> selectAll(IPage<TaPersonVisitRecord> page);
+    IPage<TaPersonVisitRecord> selectAll(IPage<TaPersonVisitRecord> page, String buildingId);
 
 
     /**

src/main/java/com/huiju/estateagents/service/IStatisticalService.java

@@ -16,6 +16,39 @@ public interface IStatisticalService {
      */
     ResponseBean indexStatistical();
 
+    // ----------------   用户统计 start --------------
+    /**
+     * 用户总数
+     * @return
+     */
+    ResponseBean selectUserCount();
+
+    /**
+     * 注册数
+     * @return
+     */
+    ResponseBean selectRegisteredCount();
+
+    /**
+     * 用户最近七天
+     * @return
+     */
+    ResponseBean selectRecentlyCount(LocalDate startDate, LocalDate endDate);
+
+    // ----------------   用户统计 end --------------
+
+    /**
+     * 性别比例
+     * @return
+     */
+    ResponseBean selectSexUser();
+
+    /**
+     * 城市比例
+     * @return
+     */
+    ResponseBean selectCityUser();
+
     /**
      * 活跃用户数
      * @return
@@ -36,7 +69,7 @@ public interface IStatisticalService {
      * @param endDate
      * @return
      */
-    ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate,LocalDate endDate);
+    ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate,LocalDate endDate, String buildingId);
 
     /**
      * 行为分析的 具体数据列表

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

@@ -10,6 +10,7 @@ import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.PersonPO;
 import com.huiju.estateagents.service.IStatisticalService;
 import lombok.extern.slf4j.Slf4j;
+import org.omg.CORBA.OBJECT_NOT_EXIST;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -58,7 +59,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(CommConstant.PERSON_REALTY_CONSULTANT, null, null);
 
         // 用户行为
-        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, null, null);
+        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, null, null, null);
 
         // 用户活跃数
         List<Map<String, Object>> selectActiveUserCount = taPersonMapper.selectActiveUserCount(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.DAY, null, null);
@@ -160,14 +161,14 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate, LocalDate endDate) {
+    public ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate, LocalDate endDate, String buildingId) {
         ResponseBean responseBean = new ResponseBean();
 
         // 用户行为
-        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
+        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate, buildingId);
 
         IPage<TaPersonVisitRecord> page = new Page<>(pageNum, pageSize);
-        IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page);
+        IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page, buildingId);
 
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserBehavior", selectUserBehavior);
@@ -267,4 +268,74 @@ public class StatisticalServiceImpl implements IStatisticalService {
         responseBean.addSuccess(result);
         return responseBean;
     }
+
+
+    @Override
+    public ResponseBean selectUserCount() {
+        ResponseBean responseBean = new ResponseBean();
+        // 总用户数
+        Integer selectUserCount = taPersonMapper.selectUserCount(CommConstant.PERSON_REALTY_CONSULTANT);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectUserCount", selectUserCount);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean selectRegisteredCount() {
+        ResponseBean responseBean = new ResponseBean();
+        // 注册数
+        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(CommConstant.PERSON_REALTY_CONSULTANT);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectRegisteredCount", selectRegisteredCount);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean selectRecentlyCount(LocalDate startDate, LocalDate endDate) {
+        ResponseBean responseBean = new ResponseBean();
+        // 最近七天
+        Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectRecentlyCount", selectRecentlyCount);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean selectSexUser() {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 性别比例
+        // 1 男 2 女
+        Integer selectSexMale = taPersonMapper.selectSexUser(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
+        Integer selectSexFemale = taPersonMapper.selectSexUser(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
+        Map<String, Object> selectSexMaleMap = new HashMap<>();
+        selectSexMaleMap.put("name", "男");
+        selectSexMaleMap.put("value", selectSexMale);
+        Map<String, Object> selectSexFemaleMap = new HashMap<>();
+        selectSexFemaleMap.put("name", "女");
+        selectSexFemaleMap.put("value", selectSexFemale);
+        List<Map<String, Object>> selectSexUser = new ArrayList<>();
+        selectSexUser.add(selectSexMaleMap);
+        selectSexUser.add(selectSexFemaleMap);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectSexUser", selectSexUser);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean selectCityUser() {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 城市比例
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(CommConstant.PERSON_REALTY_CONSULTANT);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectCityUser", selectCityUser);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
 }

src/main/resources/mapper/TaPersonMapper.xml

@@ -199,6 +199,9 @@ FROM
         ta_person tp
         INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
         where ifnull(tp.person_type, '') != #{personType}
+        <if test="buildingId != null and buildingId != ''">
+            and tpvr.building_id = #{buildingId}
+        </if>
         GROUP BY  tpvr.event_type, DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' )
         ) AS temp ON temp_date.date = temp.date and temp_date.type_id = temp.event_type
     </select>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -14,6 +14,11 @@
         FROM
             ta_person_visit_record tpvr
             LEFT JOIN ta_person tp ON tpvr.person_id = tp.person_id
+            <where>
+                <if test="buildingId != null and buildingId != ''">
+                    tpvr.building_id = #{buildingId}
+                </if>
+            </where>
         GROUP BY tpvr.person_id, tpvr.event
     </select>