From d4525b4e53bd0805bb24f8f657739024f309cc80 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 6 Apr 2023 16:12:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=B1=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/StaffLoginLogController.java   | 12 ++++++++++
 .../java/com/epmet/dao/StaffLoginLogDao.java  | 11 ++++++++++
 .../epmet/service/StaffLoginLogService.java   | 10 +++++++++
 .../impl/StaffLoginLogServiceImpl.java        | 20 ++++++++++++++++-
 .../resources/mapper/StaffLoginLogDao.xml     | 22 +++++++++++++++++++
 5 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java
index deb09b74d5..03984e80fb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java
@@ -48,4 +48,16 @@ public class StaffLoginLogController {
         return new Result<PageData<CommunityLoginResultDTO>>().ok(staffLoginLogService.pageCommunityCount(formDTO));
     }
 
+    /**
+     * 柱状图：下级组织账号登录次数汇总
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("sub-count")
+    public Result<PageData<CommunityLoginResultDTO>> querySubCount(@RequestBody LoginLogCountByLevelFormDTO formDTO) {
+        return new Result<PageData<CommunityLoginResultDTO>>().ok(staffLoginLogService.querySubCount(formDTO.getOrgId(), formDTO.getLevel(), formDTO.getStartDate(), formDTO.getEndDate()));
+    }
+
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java
index 43e5479aa7..2ad70b214e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java
@@ -28,4 +28,15 @@ public interface StaffLoginLogDao extends BaseDao<StaffLoginLogEntity> {
     List<CommunityLoginResultDTO> pageCommunityCount(@Param("orgIdPath") String orgIdPath,
                                                      @Param("startDate") Date startDate,
                                                      @Param("endDate") Date endDate);
+
+    /**
+     * 柱状图：下级组织账号登录次数汇总
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    List<CommunityLoginResultDTO> querySubCount(@Param("orgId") String orgId,
+                                                @Param("startDate") Date startDate,
+                                                @Param("endDate") Date endDate);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java
index 901abab32d..50bf65c8fa 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java
@@ -41,4 +41,14 @@ public interface StaffLoginLogService extends BaseService<StaffLoginLogEntity> {
      * @return
      */
     PageData<CommunityLoginResultDTO> pageCommunityCount(CommunityLoginFormDTO formDTO);
+
+    /**
+     * 柱状图：下级组织账号登录次数汇总
+     * @param orgId
+     * @param level
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    PageData<CommunityLoginResultDTO> querySubCount(String orgId, String level, Date startDate, Date endDate);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java
index bb2f33a8b5..c22cbb8d21 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java
@@ -207,5 +207,23 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
     }
 
 
-
+    /**
+     * 柱状图：下级组织账号登录次数汇总
+     *
+     * @param orgId
+     * @param level
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    @Override
+    public PageData<CommunityLoginResultDTO> querySubCount(String orgId, String level, Date startDate, Date endDate) {
+        if (StringUtils.isBlank(orgId)) {
+            CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId());
+            orgId = staffInfoCacheResult.getAgencyId();
+        }
+        List<CommunityLoginResultDTO> list = baseDao.querySubCount(orgId, startDate, endDate);
+        int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size();
+        return new PageData<CommunityLoginResultDTO>(list, total, total);
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml
index 54980a8b24..6ef4d35ded 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml
@@ -50,4 +50,26 @@
             l.AGENCY_ID
         order by count(1)  desc
     </select>
+
+    <!--   柱状图：下级组织账号登录次数汇总 -->
+    <select id="querySubCount" parameterType="map" resultType="com.epmet.dto.result.yt.CommunityLoginResultDTO">
+        select
+            ca.ID AS agencyId,
+            ca.ORGANIZATION_NAME AS agencyName,
+            ca.level as agencyLevel,
+            count(l.ID) AS count
+        from customer_agency ca
+        left join staff_login_log l
+           on(ca.ID=l.AGENCY_ID)
+        where ca.DEL_FLAG='0'
+          and ca.PID = #{orgId}
+        <if test ='null != startDate'>
+            and l.LOGIN_TIME &gt;= #{startDate}
+        </if>
+        <if test ='null != endDate'>
+            and  l.LOGIN_TIME &lt;= #{endDate}
+        </if>
+        group by ca.id
+        order by count(l.ID) desc
+    </select>
 </mapper>
\ No newline at end of file