From 4a9dc553c10e05de8fa648ea32af3b2f9e44bb47 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 11 Aug 2020 17:28:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E3=80=91-=E3=80=90=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B4=BB=E8=B7=83=E7=8E=87=E3=80=91-?=
 =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/ExportOperationDataResultDTO.java  | 10 +++++
 .../epdc/excel/ExportOperationDataExcel.java  |  4 ++
 .../modules/user/dao/UserAnalysisDao.java     |  8 ++++
 .../service/impl/UserAnalysisServiceImpl.java | 37 ++++++++++++++++++-
 .../resources/mapper/user/UserAnalysisDao.xml | 21 +++++++++++
 5 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java
index 3762374e1..1c4b75eea 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java
@@ -73,9 +73,19 @@ public class ExportOperationDataResultDTO implements Serializable {
      */
     private String streetName;
 
+    /**
+     * 街道id
+     */
+    private Long streetId;
+
     /**
      * 企业数
      */
     private int enterpriseCount = 0;
 
+    /**
+     * 用户活跃率
+     */
+    private String activeUserRate = "0%";
+
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/ExportOperationDataExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/ExportOperationDataExcel.java
index 4091895ea..9f25df2db 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/ExportOperationDataExcel.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/ExportOperationDataExcel.java
@@ -51,5 +51,9 @@ public class ExportOperationDataExcel implements Serializable {
     @Excel(name = "社群话题数")
     private int communityTopicCount = 0;
 
+    @Excel(name = "用户活跃率")
+    private String activeUserRate = "0%";
+
+
 
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java
index f48900bbd..f19a45f3c 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java
@@ -271,4 +271,12 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
     List<GridOpeningResultDTO> selectExportEnterpriseCountByGridId(Map<String, Object> params);
 
 
+    /**
+    * @describe: 通过街道id和日期查询活跃用户数
+    * @author wangtong
+    * @date 2020/8/11 15:41
+    * @params [params]
+    * @return int
+    */
+    int selectActiveUserCountByParams(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
index 4a79edc64..dfc7825de 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
@@ -14,8 +14,8 @@ import com.elink.esua.epdc.datasources.DataSourceNames;
 import com.elink.esua.epdc.datasources.annotation.DataSource;
 import com.elink.esua.epdc.dto.user.UserAnalysisDTO;
 import com.elink.esua.epdc.dto.user.form.ExportOperationFormDTO;
-import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO;
 import com.elink.esua.epdc.dto.user.form.UserCountDTO;
+import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO;
 import com.elink.esua.epdc.dto.user.result.*;
 import com.elink.esua.epdc.modules.user.dao.UserAnalysisDao;
 import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
@@ -24,7 +24,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -347,7 +349,6 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         List<ExportOperationDataResultDTO> communityMemberDataResultDTOS = baseDao.selectExportCommunityMemberCount(exportOperationFormDTO);
         // 话题
         List<ExportOperationDataResultDTO> topicDataResultDTOS = baseDao.selectExportTopicCount(exportOperationFormDTO);
-
         // 企业
         List<ExportOperationDataResultDTO> enterpriseDataResultDTOS = baseDao.selectExportEnterpriseCount(exportOperationFormDTO);
         //居民数
@@ -359,6 +360,12 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
                     exportOperationDataResultDTOS.get(i).setRegisterCount(exportOperationDataResultDTOS.get(i).getRegisterCount());
                 }
             }*/
+
+            String activeUserRate = selectActiveUserCountByParams(exportOperationDataResultDTOS.get(i).getStreetId(),
+                    exportOperationFormDTO.getOperationStartTime(),exportOperationFormDTO.getOperationEndTime(),
+                    exportOperationFormDTO.getEndTime(),exportOperationDataResultDTOS.get(i).getRegisterCount(),
+                    exportOperationDataResultDTOS.get(i).getPartyCount());
+            exportOperationDataResultDTOS.get(i).setActiveUserRate(activeUserRate);
             exportOperationDataResultDTOS.get(i).setNewsCount(newsResultDTOS.size() == 0 ? 0 : newsResultDTOS.get(i).getNewsCount());
             exportOperationDataResultDTOS.get(i).setItemCount(itemDataResultDTOS.size() == 0 ? 0 : itemDataResultDTOS.get(i).getItemCount());
             exportOperationDataResultDTOS.get(i).setItemCloseCount(itemDataResultDTOS.size() == 0 ? 0 : itemDataResultDTOS.get(i).getItemCloseCount());
@@ -372,6 +379,32 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         return exportOperationDataResultDTOS;
     }
 
+    /**
+     * @describe: 通过街道id、日期、用户总数查询活跃用户数占比
+     * @author wangtong
+     * @date 2020/8/11 15:28
+     * @params []
+     * @return java.lang.String
+     */
+    private String selectActiveUserCountByParams(Long streetId, String operationStartTime, String operationEndTime, String endTime, int registerCount, int partyCount) {
+        //用户总数
+        int userTotal = registerCount + partyCount;
+        Map<String, Object> params = new HashMap<>();
+        params.put("streetId", streetId);
+        params.put("operationStartTime", operationStartTime);
+        params.put("operationEndTime", operationEndTime);
+        params.put("endTime", endTime);
+        //活跃用户总数
+        int activeUserCount = baseDao.selectActiveUserCountByParams(params);
+        if(userTotal == 0 || activeUserCount== 0){
+            return "0%";
+        }
+        DecimalFormat df=new DecimalFormat("0.00");
+        return df.format((float)activeUserCount/(float)userTotal) + "%";
+    }
+
+
+
     @Override
     public List<GridOpeningResultDTO> selectListGridHasMaCode(Map<String, Object> params) {
         params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index 69899da2c..9d0252c7e 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -603,6 +603,7 @@
     <select id="selectExportUserCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO" parameterType="com.elink.esua.epdc.dto.user.form.ExportOperationFormDTO">
         select
         tt.name as streetName,
+        tt.id as streetId,
         (ifnull(tab.userTotal,0) - ifnull(tab.partyCount,0)) as registerCount,
         ifnull(tab.partyCount,0) as partyCount
         from
@@ -1336,4 +1337,24 @@
         ORDER BY
         t0.id ASC
     </select>
+    <select id="selectActiveUserCountByParams" resultType="int">
+        SELECT IFNULL(count(*),0)
+            FROM (SELECT ecu.ID
+                    FROM esua_epdc_analysis.`epdc_active_user_info` ecu
+                    LEFT JOIN esua_epdc_analysis.meta_sys_dept dept on ecu.DEPT_ID=dept.ID
+                    LEFT JOIN esua_epdc_analysis.meta_sys_dept com on dept.PID=com.ID
+                    LEFT JOIN esua_epdc_analysis.meta_sys_dept street ON com.PID=street.ID
+                    where street.id=#{streetId}
+                          and ecu.DEL_FLAG=0
+                          <if test=" endTime != null and endTime != ''">
+                              and ecu.REACH_ACTIVE_TIME &lt;= #{endTime}
+                          </if>
+                 		  <if test="operationStartTime != null and operationStartTime != '' and operationEndTime != null and operationEndTime != ''">
+                              and (#{operationStartTime} BETWEEN ecu.REACH_ACTIVE_TIME and ecu.VALID_TIME
+                                     or
+                                    #{operationEndTime} BETWEEN ecu.REACH_ACTIVE_TIME and ecu.VALID_TIME)
+                          </if>
+                group by ecu.USER_ID -- 去重
+                )total
+    </select>
 </mapper>