From 4f43d087e1ff284cd52e112faba525850b8c31c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Thu, 6 Apr 2023 18:26:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/yt/CountActivityFormDTO.java     | 13 ++++++---
 .../controller/StaffLoginLogController.java   | 27 ++++++++++++++++++-
 .../resources/mapper/StaffLoginLogDao.xml     |  8 ++++++
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CountActivityFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CountActivityFormDTO.java
index ab3996a085..a1ef997fc0 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CountActivityFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CountActivityFormDTO.java
@@ -19,19 +19,24 @@ public class CountActivityFormDTO extends PageFormDTO {
      */
     private String orgId;
 
+    /**
+     * 是否活跃 1 活跃 0 不活跃
+     */
+    private String isActivity;
+
 
     /**
      * 开始日期：yyyy-MM-dd
      */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startDate;
 
     /**
      * 截止日期：yyyy-MM-dd
      */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endDate;
 }
 
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 38a466d3c2..c1b2a226f8 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
@@ -1,6 +1,10 @@
 package com.epmet.controller;
 
+import com.alibaba.nacos.client.naming.utils.CollectionUtils;
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.yt.CommunityLoginFormDTO;
 import com.epmet.dto.form.yt.CountActivityFormDTO;
@@ -16,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.epmet.dto.result.yt.AccountActivityInfo;
 
+import javax.servlet.http.HttpServletResponse;
+
 
 /**
  * 工作人员登录日志表
@@ -106,7 +112,7 @@ public class StaffLoginLogController {
     /***
      * 获取活跃度总数
      * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData<com.epmet.dto.result.yt.AccountActivityInfo>>
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.dto.result.yt.AccountActivityInfo>>
      * @author qushutong
      * @date 2023/4/6 17:35
      */
@@ -115,4 +121,23 @@ public class StaffLoginLogController {
         return new Result<ActivityTatalInfo>().ok(staffLoginLogService.getActivityTotal(formDTO));
     }
 
+
+   /***
+    * 导出活跃
+    * @param response
+    * @param tokenDto
+    * @param formDTO
+    * @return void
+    * @author qushutong
+    * @date 2023/4/6 18:04
+    */
+    @PostMapping("accountActivityInfo-export")
+    public void analysisExport(HttpServletResponse response, @LoginUser TokenDto tokenDto, @RequestBody CountActivityFormDTO formDTO) throws Exception {
+        formDTO.setIsPage(false);
+        PageData<AccountActivityInfo> res = staffLoginLogService.getAccountActivityInfo(formDTO);
+        if (!CollectionUtils.isEmpty(res.getList())) {
+            ExcelUtils.exportExcelToTarget(response, null, res.getList(), AccountActivityInfo.class);
+        }
+    }
+
 }
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 8bf8d36d2e..b956a42611 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
@@ -77,6 +77,14 @@
         <if test='null != endDate'>
             and l.LOGIN_TIME &lt;= #{endDate}
         </if>
+        <choose >
+            <when test='isActivity!= null and isActivity == "1" and isActivity.trim() != ""'>
+                AND  l.AGENCY_ID is NOT NULL
+            </when>
+            <otherwise>
+                AND  l.AGENCY_ID is  NULL
+            </otherwise>
+        </choose>
         GROUP BY
         a.ID
         ORDER BY