社区调整

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java

@@ -59,5 +59,30 @@ public class StaffLoginLogController {
         return new Result<PageData<CommunityLoginResultDTO>>().ok(staffLoginLogService.querySubCount(formDTO.getOrgId(), formDTO.getLevel(), formDTO.getStartDate(), formDTO.getEndDate()));
     }
 
+    /**
+     * 查看区县
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("district-count")
+    public Result<PageData<CommunityLoginResultDTO>> districtCount(@RequestBody CommunityLoginFormDTO formDTO) {
+        return new Result<PageData<CommunityLoginResultDTO>>().ok(staffLoginLogService.pageDistrictCount(formDTO.getOrgId(),
+                formDTO.getLevel(), formDTO.getStartDate(),
+                formDTO.getEndDate(), formDTO.getIsPage(),
+                formDTO.getPageNo(), formDTO.getPageSize()));
+    }
 
+    /**
+     * 查看街镇
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("street-count")
+    public Result<PageData<CommunityLoginResultDTO>> streetCount(@RequestBody CommunityLoginFormDTO formDTO) {
+        return new Result<PageData<CommunityLoginResultDTO>>().ok(staffLoginLogService.streetCount(formDTO.getOrgId(),
+                formDTO.getStartDate(),
+                formDTO.getEndDate(), formDTO.getIsPage(),
+                formDTO.getPageNo(), formDTO.getPageSize()));
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java

@@ -20,12 +20,12 @@ public interface StaffLoginLogDao extends BaseDao<StaffLoginLogEntity> {
 
     /**
      * 各社区登录总次数
-     * @param orgIdPath
+     * @param orgId
      * @param startDate
      * @param endDate
      * @return
      */
-    List<CommunityLoginResultDTO> pageCommunityCount(@Param("orgIdPath") String orgIdPath,
+    List<CommunityLoginResultDTO> pageCommunityCount(@Param("orgId") String orgId,
                                                      @Param("startDate") Date startDate,
                                                      @Param("endDate") Date endDate);
 
@@ -39,4 +39,19 @@ public interface StaffLoginLogDao extends BaseDao<StaffLoginLogEntity> {
     List<CommunityLoginResultDTO> querySubCount(@Param("orgId") String orgId,
                                                 @Param("startDate") Date startDate,
                                                 @Param("endDate") Date endDate);
+
+    /**
+     * 各区县登录总次数
+     * @param orgIdPath
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    List<CommunityLoginResultDTO> pageDistrictCount(@Param("orgIdPath")String orgIdPath,
+                                                    @Param("startDate")Date startDate,
+                                                    @Param("endDate")Date endDate);
+
+    List<CommunityLoginResultDTO> pageStreetCount(@Param("orgIdPath")String orgIdPath,
+                                                  @Param("startDate")Date startDate,
+                                                  @Param("endDate")Date endDate);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java

@@ -51,4 +51,29 @@ public interface StaffLoginLogService extends BaseService<StaffLoginLogEntity> {
      * @return
      */
     PageData<CommunityLoginResultDTO> querySubCount(String orgId, String level, Date startDate, Date endDate);
+
+    /**
+     * 查看区县
+     * @param orgId
+     * @param level
+     * @param startDate
+     * @param endDate
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    PageData<CommunityLoginResultDTO> pageDistrictCount(String orgId, String level, Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize);
+
+    /**
+     * 查看街镇
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    PageData<CommunityLoginResultDTO> streetCount(String orgId, Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java

@@ -193,15 +193,14 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
             formDTO.setOrgId(staffInfoCacheResult.getAgencyId());
             formDTO.setLevel(staffInfoCacheResult.getLevel());
         }
-        String orgIdPath = SpringContextUtils.getBean(CustomerAgencyService.class).getOrgIdPath(formDTO.getOrgId());
         if (formDTO.getIsPage()) {
             PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-            List<CommunityLoginResultDTO> list = baseDao.pageCommunityCount(orgIdPath, formDTO.getStartDate(), formDTO.getEndDate());
+            List<CommunityLoginResultDTO> list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate());
             PageInfo<CommunityLoginResultDTO> pageInfo = new PageInfo<>(list);
             return new PageData<>(list, pageInfo.getTotal(),formDTO.getPageSize());
         }
         // 不分页
-        List<CommunityLoginResultDTO> list = baseDao.pageCommunityCount(orgIdPath, formDTO.getStartDate(), formDTO.getEndDate());
+        List<CommunityLoginResultDTO> list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate());
         int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size();
         return new PageData<>(list, total, total);
     }
@@ -226,4 +225,66 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
         int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size();
         return new PageData<CommunityLoginResultDTO>(list, total, total);
     }
+
+
+    /**
+     * 查看区县
+     *
+     * @param orgId
+     * @param level
+     * @param startDate
+     * @param endDate
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return 返回agencyId，agencyName，count
+     */
+    @Override
+    public PageData<CommunityLoginResultDTO> pageDistrictCount(String orgId, String level, Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize) {
+        if (StringUtils.isBlank(orgId)) {
+            CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId());
+            orgId=staffInfoCacheResult.getAgencyId();
+        }
+        String orgIdPath = SpringContextUtils.getBean(CustomerAgencyService.class).getOrgIdPath(orgId);
+        if (isPage) {
+            PageHelper.startPage(pageNo, pageSize);
+            List<CommunityLoginResultDTO> list = baseDao.pageDistrictCount(orgIdPath, startDate, endDate);
+            PageInfo<CommunityLoginResultDTO> pageInfo = new PageInfo<>(list);
+            return new PageData<>(list, pageInfo.getTotal(),pageSize);
+        }
+        // 不分页
+        List<CommunityLoginResultDTO> list = baseDao.pageDistrictCount(orgIdPath,startDate, endDate);
+        int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size();
+        return new PageData<>(list, total, total);
+    }
+
+    /**
+     * 查看街镇
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public PageData<CommunityLoginResultDTO> streetCount(String orgId,Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize) {
+        if (StringUtils.isBlank(orgId)) {
+            CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId());
+            orgId=staffInfoCacheResult.getAgencyId();
+        }
+        String orgIdPath = SpringContextUtils.getBean(CustomerAgencyService.class).getOrgIdPath(orgId);
+        if (isPage) {
+            PageHelper.startPage(pageNo, pageSize);
+            List<CommunityLoginResultDTO> list = baseDao.pageStreetCount(orgIdPath, startDate, endDate);
+            PageInfo<CommunityLoginResultDTO> pageInfo = new PageInfo<>(list);
+            return new PageData<>(list, pageInfo.getTotal(),pageSize);
+        }
+        // 不分页
+        List<CommunityLoginResultDTO> list = baseDao.pageStreetCount(orgIdPath,startDate, endDate);
+        int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size();
+        return new PageData<>(list, total, total);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml

@@ -25,21 +25,21 @@
     <!--  各社区登录总次数  -->
     <select id="pageCommunityCount" parameterType="map" resultType="com.epmet.dto.result.yt.CommunityLoginResultDTO">
         SELECT
-            l.AGENCY_ID AS agencyId,
+            ca.id AS agencyId,
             d.ORGANIZATION_NAME AS districtName,
             s.ORGANIZATION_NAME AS streetName,
             ca.ORGANIZATION_NAME AS agencyName,
-            l.AGENCY_LEVEL AS agencyLevel,
+            ca.`LEVEL` AS agencyLevel,
-            count( 1 ) AS count
+            count( l.id ) AS count
         FROM
-            staff_login_log l
+            customer_agency ca
-            INNER JOIN customer_agency ca ON ( l.AGENCY_ID = ca.ID )
+            left JOIN staff_login_log l ON ( ca.ID =l.AGENCY_ID and l.DEL_FLAG = '0')
             LEFT JOIN customer_agency s ON ( ca.PID = s.ID )
             LEFT JOIN customer_agency d ON ( s.PID = d.ID )
         WHERE
-            l.DEL_FLAG = '0'
+            ca.DEL_FLAG = '0'
-          AND l.ORG_ID_PATH LIKE concat( #{orgIdPath}, '%' )
+          AND (ca.id = #{orgId} or ca.pids like concat('%',#{orgId},'%') )
-          AND l.AGENCY_LEVEL = 'community'
+          AND ca.LEVEL = 'community'
         <if test ='null != startDate'>
           and l.LOGIN_TIME &gt;= #{startDate}
         </if>
@@ -47,7 +47,7 @@
            and  l.LOGIN_TIME &lt;= #{endDate}
         </if>
         GROUP BY
-            l.AGENCY_ID
+             ca.id
         order by count(1)  desc
     </select>
 
@@ -72,4 +72,55 @@
         group by ca.id
         order by count(l.ID) desc
     </select>
+
+    <select id="pageDistrictCount" parameterType="map" resultType="com.epmet.dto.result.yt.CommunityLoginResultDTO">
+        SELECT
+            l.AGENCY_ID AS agencyId,
+            ca.ORGANIZATION_NAME AS agencyName,
+            l.AGENCY_LEVEL AS agencyLevel,
+            count( 1 ) AS count
+        FROM
+        staff_login_log l
+        INNER JOIN customer_agency ca ON ( l.AGENCY_ID = ca.ID )
+        WHERE
+         l.DEL_FLAG = '0'
+        AND l.ORG_ID_PATH LIKE concat( #{orgIdPath}, '%' )
+        AND l.AGENCY_LEVEL = 'district'
+        <if test ='null != startDate'>
+            and l.LOGIN_TIME &gt;= #{startDate}
+        </if>
+        <if test ='null != endDate'>
+            and  l.LOGIN_TIME &lt;= #{endDate}
+        </if>
+        GROUP BY
+            l.AGENCY_ID
+        order by count(1)  desc
+    </select>
+
+    <!--    查看街镇-->
+    <select id="pageStreetCount" parameterType="map" resultType="com.epmet.dto.result.yt.CommunityLoginResultDTO">
+        SELECT
+            l.AGENCY_ID AS agencyId,
+            ca.ORGANIZATION_NAME AS agencyName,
+            l.AGENCY_LEVEL AS agencyLevel,
+            s.ORGANIZATION_NAME AS districtName,
+            count( 1 ) AS count
+        FROM
+            staff_login_log l
+        INNER JOIN customer_agency ca ON ( l.AGENCY_ID = ca.ID )
+        LEFT JOIN customer_agency s ON ( ca.PID = s.ID )
+        WHERE
+            l.DEL_FLAG = '0'
+            AND l.ORG_ID_PATH LIKE concat( #{orgIdPath}, '%' )
+            AND l.AGENCY_LEVEL = 'street'
+            <if test ='null != startDate'>
+                and l.LOGIN_TIME &gt;= #{startDate}
+            </if>
+            <if test ='null != endDate'>
+                and  l.LOGIN_TIME &lt;= #{endDate}
+            </if>
+        GROUP BY
+        l.AGENCY_ID
+        order by count(1)  desc
+    </select>
 </mapper>