Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CountActivityFormDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.form.yt;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @Description 下级社区账号登录次数排名入参
+ * @Author yzm
+ * @Date 2023/4/6 14:18
+ */
+@Data
+public class CountActivityFormDTO extends PageFormDTO {
+    /**
+     * 所选择的组织id
+     */
+    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")
+    private Date startDate;
+
+    /**
+     * 截止日期：yyyy-MM-dd
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endDate;
+}
+

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/AccountActivityInfo.java

@@ -0,0 +1,44 @@
+package com.epmet.dto.result.yt;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ *  @author: qushutong
+ *  @Date: 2023/4/6 13:33
+ *  @Description: 账户活跃情况
+ */
+@Data
+public class AccountActivityInfo implements Serializable {
+    private static final long serialVersionUID = -918630886413844674L;
+
+    /**
+     * 组织名称
+     */
+    private String agencyName = "";
+
+    /**
+     * 登陆次数
+     */
+    private String loginCount = "";
+
+    /**
+     * 活跃账号数
+     */
+    private String accountActivityCount = "";
+
+
+    /**
+     * 总账号数
+     */
+    private String accountCount = "";
+
+    /**
+     * 组织id
+     */
+    private String agencyId = "";
+
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/ActivityTatalInfo.java

@@ -0,0 +1,30 @@
+package com.epmet.dto.result.yt;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ *  @author: qushutong
+ *  @Date: 2023/4/6 13:33
+ *  @Description: 账户活跃总数
+ */
+@Data
+public class ActivityTatalInfo implements Serializable {
+    private static final long serialVersionUID = -918630886413844674L;
+
+
+    /**
+     * 不活跃账号总数
+     */
+    private String inactivityCount = "";
+
+    /**
+     * 活跃账号总数
+     */
+    private String activityCount = "";
+
+
+
+}

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

@@ -1,17 +1,30 @@
 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.ConvertUtils;
+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;
 import com.epmet.dto.form.yt.LoginLogCountByLevelFormDTO;
+import com.epmet.dto.result.yt.ActivityTatalInfo;
 import com.epmet.dto.result.yt.CommunityLoginResultDTO;
 import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO;
+import com.epmet.excel.yt.AccountActivityExcel;
+import com.epmet.excel.yt.AccountInactivityExcel;
 import com.epmet.service.StaffLoginLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 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;
+import java.util.List;
 
 
 /**
@@ -41,6 +54,7 @@ public class StaffLoginLogController {
 
     /**
      * 下级社区账号登录次数排名
+     *
      * @return
      */
     @PostMapping("community-count")
@@ -75,6 +89,7 @@ public class StaffLoginLogController {
 
     /**
      * 查看街镇
+     *
      * @param formDTO
      * @return
      */
@@ -85,4 +100,55 @@ public class StaffLoginLogController {
                 formDTO.getEndDate(), formDTO.getIsPage(),
                 formDTO.getPageNo(), formDTO.getPageSize()));
     }
+
+    /***
+     * 获取当前agencyid下 下级组织活跃情况
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.yt.AccountActivityInfo>
+     * @author qushutong
+     * @date 2023/4/6 13:41
+     */
+    @PostMapping("getAccountActivityInfo")
+    public Result<PageData<AccountActivityInfo>> getAccountActivityInfo(@RequestBody CountActivityFormDTO formDTO) {
+        return new Result<PageData<AccountActivityInfo>>().ok(staffLoginLogService.getAccountActivityInfo(formDTO));
+    }
+
+    /***
+     * 获取活跃度总数
+     * @param formDTO
+     * @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
+     */
+    @PostMapping("getActivityTotal")
+    public Result<ActivityTatalInfo> getActivityTotal(@RequestBody CountActivityFormDTO formDTO) {
+        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())) {
+            if("1".equals(formDTO.getIsActivity())){
+                List<AccountActivityExcel> accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountActivityExcel.class);
+                ExcelUtils.exportExcelToTarget(response, null, accountActivityExcels, AccountActivityInfo.class);
+            }else {
+                List<AccountInactivityExcel> accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountInactivityExcel.class);
+                ExcelUtils.exportExcelToTarget(response, null, accountActivityExcels, AccountActivityInfo.class);
+            }
+
+        }
+    }
+
 }

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

@@ -1,7 +1,10 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.yt.CountActivityFormDTO;
+import com.epmet.dto.result.yt.ActivityTatalInfo;
 import com.epmet.dto.result.yt.CommunityLoginResultDTO;
+import com.epmet.dto.result.yt.AccountActivityInfo;
 import com.epmet.entity.StaffLoginLogEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -20,6 +23,7 @@ public interface StaffLoginLogDao extends BaseDao<StaffLoginLogEntity> {
 
     /**
      * 各社区登录总次数
+     *
      * @param orgId
      * @param startDate
      * @param endDate
@@ -31,6 +35,7 @@ public interface StaffLoginLogDao extends BaseDao<StaffLoginLogEntity> {
 
     /**
      * 柱状图：下级组织账号登录次数汇总
+     *
      * @param orgId
      * @param startDate
      * @param endDate
@@ -42,6 +47,7 @@ public interface StaffLoginLogDao extends BaseDao<StaffLoginLogEntity> {
 
     /**
      * 各区县登录总次数
+     *
      * @param orgId
      * @param startDate
      * @param endDate
@@ -54,4 +60,16 @@ public interface StaffLoginLogDao extends BaseDao<StaffLoginLogEntity> {
     List<CommunityLoginResultDTO> pageStreetCount(@Param("orgId") String orgId,
                                                   @Param("startDate") Date startDate,
                                                   @Param("endDate") Date endDate);
+
+    /***
+     * 获取登陆情况
+     * @param formDTO
+     * @return com.epmet.dto.result.yt.AccountActivityInfo
+     * @author qushutong
+     * @date 2023/4/6 13:47
+     */
+    List<AccountActivityInfo> selectListActivityInfo(CountActivityFormDTO formDTO);
+
+
+    ActivityTatalInfo selectOneActivityTotal(CountActivityFormDTO formDTO);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/AccountActivityExcel.java

@@ -0,0 +1,45 @@
+package com.epmet.excel.yt;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ *  @author: qushutong
+ *  @Date: 2023/4/6 13:33
+ *  @Description: 账户活跃情况
+ */
+@Data
+public class AccountActivityExcel implements Serializable {
+    private static final long serialVersionUID = -918630886413844674L;
+
+    /**
+     * 组织名称
+     */
+    @Excel(name = "组织名称")
+    private String agencyName = "";
+
+    /**
+     * 登陆次数
+     */
+    @Excel(name = "登陆次数")
+    private String loginCount = "";
+
+    /**
+     * 活跃账号数
+     */
+    @Excel(name = "活跃账号数")
+    private String accountActivityCount = "";
+
+
+    /**
+     * 总账号数
+     */
+    @Excel(name = "总账号数")
+    private String accountCount = "";
+
+
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/AccountInactivityExcel.java

@@ -0,0 +1,28 @@
+package com.epmet.excel.yt;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ *  @author: qushutong
+ *  @Date: 2023/4/6 13:33
+ *  @Description: 账户不活跃情况
+ */
+@Data
+public class AccountInactivityExcel implements Serializable {
+    private static final long serialVersionUID = -918630886413844674L;
+
+    /**
+     * 组织名称
+     */
+    @Excel(name = "组织名称")
+    private String agencyName = "";
+
+
+
+
+
+}

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

@@ -3,8 +3,11 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.form.yt.CommunityLoginFormDTO;
+import com.epmet.dto.form.yt.CountActivityFormDTO;
+import com.epmet.dto.result.yt.ActivityTatalInfo;
 import com.epmet.dto.result.yt.CommunityLoginResultDTO;
 import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO;
+import com.epmet.dto.result.yt.AccountActivityInfo;
 import com.epmet.entity.StaffLoginLogEntity;
 
 import java.util.Date;
@@ -18,6 +21,7 @@ import java.util.Date;
 public interface StaffLoginLogService extends BaseService<StaffLoginLogEntity> {
     /**
      * 登录，插入记录
+     *
      * @param staffId
      * @param loginTime
      */
@@ -44,6 +48,7 @@ public interface StaffLoginLogService extends BaseService<StaffLoginLogEntity> {
 
     /**
      * 柱状图：下级组织账号登录次数汇总
+     *
      * @param orgId
      * @param level
      * @param startDate
@@ -54,6 +59,7 @@ public interface StaffLoginLogService extends BaseService<StaffLoginLogEntity> {
 
     /**
      * 查看区县
+     *
      * @param orgId
      * @param level
      * @param startDate
@@ -67,6 +73,7 @@ public interface StaffLoginLogService extends BaseService<StaffLoginLogEntity> {
 
     /**
      * 查看街镇
+     *
      * @param orgId
      * @param startDate
      * @param endDate
@@ -76,4 +83,15 @@ public interface StaffLoginLogService extends BaseService<StaffLoginLogEntity> {
      * @return
      */
     PageData<CommunityLoginResultDTO> streetCount(String orgId, Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize);
+
+    /***
+     * 获取登陆情况
+     * @param formDTO
+     * @return com.epmet.dto.result.yt.AccountActivityInfo
+     * @author qushutong
+     * @date 2023/4/6 13:47
+     */
+    PageData<AccountActivityInfo> getAccountActivityInfo(CountActivityFormDTO formDTO);
+
+    ActivityTatalInfo getActivityTotal(CountActivityFormDTO formDTO);
 }

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

@@ -15,8 +15,11 @@ import com.epmet.dao.StaffLoginLogDao;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.form.yt.CommunityLoginFormDTO;
+import com.epmet.dto.form.yt.CountActivityFormDTO;
+import com.epmet.dto.result.yt.ActivityTatalInfo;
 import com.epmet.dto.result.yt.CommunityLoginResultDTO;
 import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO;
+import com.epmet.dto.result.yt.AccountActivityInfo;
 import com.epmet.entity.StaffLoginLogEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.CustomerAgencyService;
@@ -159,6 +162,7 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
                     .between(null != startDate && null != endDate, StaffLoginLogEntity::getLoginTime, startDate, endDate);
             resultDTO.setStreetCount(baseDao.selectCount(streetWrapper));
 
+
             // 街道下所有社区
             LambdaQueryWrapper<StaffLoginLogEntity> communityWrapper = new LambdaQueryWrapper<>();
             communityWrapper.like(StaffLoginLogEntity::getOrgIdPath, orgIdPath)
@@ -180,6 +184,18 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
         return resultDTO;
     }
 
+    @Override
+    public PageData<AccountActivityInfo>  getAccountActivityInfo(CountActivityFormDTO formDTO) {
+        List<AccountActivityInfo> accountActivityInfos = baseDao.selectListActivityInfo(formDTO);
+        int total = CollectionUtils.isEmpty(accountActivityInfos) ? NumConstant.ZERO : accountActivityInfos.size();
+        return new PageData<>(accountActivityInfos, total);
+    }
+
+    @Override
+    public ActivityTatalInfo getActivityTotal(CountActivityFormDTO formDTO) {
+        return baseDao.selectOneActivityTotal(formDTO);
+    }
+
     /**
      * 下级社区账号登录次数排名
      *

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

@@ -22,7 +22,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <!--  各社区登录总次数  -->
+    <!--  账号登录情况：各社区登录总次数  -->
     <select id="pageCommunityCount" parameterType="map" resultType="com.epmet.dto.result.yt.CommunityLoginResultDTO">
         SELECT
             ca.id AS agencyId,
@@ -31,11 +31,13 @@
             ca.ORGANIZATION_NAME AS agencyName,
             ca.`LEVEL` AS agencyLevel,
             count( l.id ) AS count
-        FROM
+        FROM customer_agency ca
-            customer_agency ca
+        left JOIN staff_login_log l
-            left JOIN staff_login_log l ON ( ca.ID =l.AGENCY_ID and l.DEL_FLAG = '0')
+            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 s
-            LEFT JOIN customer_agency d ON ( s.PID = d.ID )
+            ON ( ca.PID = s.ID )
+        LEFT JOIN customer_agency d
+            ON ( s.PID = d.ID )
         WHERE
             ca.DEL_FLAG = '0'
             AND (ca.id = #{orgId} or ca.pids like concat('%',#{orgId},'%') )
@@ -46,12 +48,51 @@
             <if test='null != endDate'>
                 and l.LOGIN_TIME &lt;= #{endDate}
             </if>
-        GROUP BY
+        GROUP BY ca.id
-             ca.id
         order by count(l.id) desc
     </select>
+    <!--社区活跃列表-->
+    <select id="selectListActivityInfo" resultType="com.epmet.dto.result.yt.AccountActivityInfo">
+        SELECT
+        COUNT(DISTINCT(l.id)) AS loginCount,
+        COUNT(DISTINCT(l.STAFF_ID)) accountActivityCount,
+        COUNT(DISTINCT(ag.USER_ID)) accountCount,
+        a.ID agencyId,
+        a.ALL_PARENT_NAME agencyName
+        FROM
+        customer_agency a
+        LEFT JOIN staff_login_log l ON a.ID = l.AGENCY_ID
+        AND a.`LEVEL` = l.AGENCY_LEVEL
+        AND l.DEL_FLAG = '0'
+        LEFT JOIN customer_staff_agency ag ON a.ID = ag.AGENCY_ID
+        AND ag.DEL_FLAG = '0'
+        WHERE
+        a.DEL_FLAG = '0'
+        AND a.`LEVEL` = 'community'
+        <if test="orgId!= null and orgId.trim() != ''">
+            AND a.PIDS LIKE CONCAT('%',#{orgId},'%')
+        </if>
+        <if test='null != startDate'>
+            and l.LOGIN_TIME &gt;= #{startDate}
+        </if>
+        <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
+        COUNT(DISTINCT(l.id)) DESC;
+    </select>
 
-    <!--   柱状图：下级组织账号登录次数汇总 -->
+    <!--   账号登录情况：柱状图：下级组织账号登录次数汇总 -->
     <select id="querySubCount" parameterType="map" resultType="com.epmet.dto.result.yt.CommunityLoginResultDTO">
         select
             ca.ID AS agencyId,
@@ -73,6 +114,7 @@
         order by count(l.ID) desc
     </select>
 
+    <!--    账号登录情况：查看区县-->
     <select id="pageDistrictCount" parameterType="map" resultType="com.epmet.dto.result.yt.CommunityLoginResultDTO">
         SELECT
             ca.id AS agencyId,
@@ -80,9 +122,9 @@
             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 and l.DEL_FLAG = '0')
+        left join staff_login_log l
-        WHERE
+            ON ( ca.ID =l.AGENCY_ID and l.DEL_FLAG = '0')
-          ca.DEL_FLAG = '0'
+        WHERE ca.DEL_FLAG = '0'
             and (ca.id=#{orgId} or ca.pids like concat('%',#{orgId},'%') )
             AND ca.LEVEL = 'district'
             <if test='null != startDate'>
@@ -91,20 +133,23 @@
             <if test='null != endDate'>
                 and l.LOGIN_TIME &lt;= #{endDate}
             </if>
-        GROUP BY
+        GROUP BY ca.id
-            ca.id
         order by count(l.id) desc
     </select>
 
-    <!--    查看街镇-->
+    <!--    账号登录情况：查看街镇-->
     <select id="pageStreetCount" parameterType="map" resultType="com.epmet.dto.result.yt.CommunityLoginResultDTO">
         SELECT
             ca.id AS agencyId,
             ca.ORGANIZATION_NAME AS agencyName,
             ca.LEVEL AS agencyLevel,
+            pa.ORGANIZATION_NAME as districtName,
             count(l.id) AS count
         FROM customer_agency ca
-        left join staff_login_log l ON ( ca.ID =l.AGENCY_ID and l.DEL_FLAG = '0')
+        left join staff_login_log l
+            ON ( ca.ID =l.AGENCY_ID and l.DEL_FLAG = '0')
+        left join customer_agency pa
+            on(ca.pid=pa.id)
         WHERE
             ca.DEL_FLAG = '0'
             and (ca.id = #{orgId} or ca.pids like concat('%',#{orgId},'%') )
@@ -115,8 +160,32 @@
             <if test='null != endDate'>
                 and l.LOGIN_TIME &lt;= #{endDate}
             </if>
-        GROUP BY
+        GROUP BY  ca.id
-             ca.id
         order by count(l.id) desc
     </select>
+
+    <select id="selectOneActivityTotal" resultType="com.epmet.dto.result.yt.ActivityTatalInfo">
+          SELECT
+                COUNT(t.activityCount = '0' OR NULL) inactivityCount,
+                COUNT(t.activityCount > '0' OR NULL) activityCount
+            FROM
+                (
+                    SELECT
+                        COUNT(DISTINCT(l.ID)) activityCount
+                    FROM
+                        customer_agency a
+                    LEFT JOIN staff_login_log l ON a.ID = l.AGENCY_ID
+                    WHERE
+                        a.PIDS LIKE CONCAT(
+                            '%',
+                            #{orgId},
+                            '%'
+                        )
+                    AND a.`LEVEL` = 'community'
+                    AND a.DEL_FLAG = '0'
+                    GROUP BY
+                        a.ID
+                ) t;
+
+    </select>
 </mapper>