From 81fbe32e27e9d8a908d8d7417390a2b3141bc1ed 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, 19 Mar 2020 14:55:51 +0800
Subject: [PATCH 01/38] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=B2=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=85=9A=E5=91=98=E9=80=9F=E5=BA=A6=E6=85=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BB=A5=E5=8F=8A=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=85=9A?=
 =?UTF-8?q?=E5=91=98=E8=B7=9F=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PartyMembersController.java    |  12 ++
 .../elink/esua/epdc/dao/PartyMembersDao.java  |  22 ++++
 .../epdc/service/PartyMembersService.java     |   9 ++
 .../service/impl/PartyMembersServiceImpl.java |  15 +++
 .../main/resources/mapper/PartyMembersDao.xml | 106 +++++++++++++++---
 5 files changed, 147 insertions(+), 17 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
index 02b900a23..dcd0b362f 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
@@ -166,5 +166,17 @@ public class PartyMembersController {
         ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.exportHasMoudle(params), PartyMembersExcel.class);
     }
 
+    /***
+     * 已认证党员优化
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.PartyMembersDTO>>
+     * @author qushutong
+     * @date 2020/3/19 13:34
+     */
+    @GetMapping("optimizeHasAuthenticationPartyPage")
+    @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false)
+    public Result<PageData<PartyMembersDTO>> optimizeHasAuthenticationPartyPage(@RequestParam Map<String, Object> params) {
+        return partyMembersService.optimizeHasAuthenticationPartyPage(params);
+    }
 
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
index 3d422439c..723273495 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
@@ -21,6 +21,8 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.PartyMembersDTO;
 import com.elink.esua.epdc.entity.PartyMembersEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.io.Serializable;
 import java.util.List;
@@ -62,4 +64,24 @@ public interface PartyMembersDao extends BaseDao<PartyMembersEntity> {
      * @since 2020/3/7 1:20
      */
     void updateGridByDeptId(String newDeptName, Long deptId);
+
+    /***
+     * 已认证党员查询优化
+     * @param
+     * @return java.util.List<java.lang.String>
+     * @author qushutong
+     * @date 2020/3/19 13:32
+     */
+
+    List<String> optimizeHasAuthenticationPartyPage(Map<String, Object> params);
+
+    /***
+     * 已认证党员查询优化
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.PartyMembersDTO>
+     * @author qushutong
+     * @date 2020/3/19 13:33
+     */
+
+    List<PartyMembersDTO> optimizeHasAuthenticationPartyPageInfo(@Param("userIdList") List<String> userIdList);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
index 9a87a9026..2f900f6bf 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
@@ -100,4 +100,13 @@ public interface PartyMembersService extends BaseService<PartyMembersEntity> {
      * @since 2020/3/7 1:23
      */
     void modifyOrganizationInfo(OrganizationModifyDTO dto);
+
+    /***
+     * 已认证党员优化
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.PartyMembersDTO>>
+     * @author qushutong
+     * @date 2020/3/19 13:36
+     */
+    Result<PageData<PartyMembersDTO>> optimizeHasAuthenticationPartyPage(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
index 9d2d4a082..0806f1b9d 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
@@ -445,6 +445,8 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
         baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
     }
 
+
+
     /**
      *
      * 组织机构信息处理
@@ -485,4 +487,17 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
 
         return entities;
     }
+
+    @Override
+    public Result<PageData<PartyMembersDTO>> optimizeHasAuthenticationPartyPage(Map<String, Object> params) {
+        IPage<String> page = getPage(params);
+        List<String> userIds = baseDao.optimizeHasAuthenticationPartyPage(params);
+        if(userIds.size()>0){
+            List<PartyMembersDTO> partyMembersDTOList = baseDao.optimizeHasAuthenticationPartyPageInfo(userIds);
+            return new Result<PageData<PartyMembersDTO>>().ok(new PageData<>(partyMembersDTOList, page.getTotal()));
+        }else {
+            return new Result<PageData<PartyMembersDTO>>().ok(new PageData<>(new ArrayList<>(), NumConstant.ZERO));
+        }
+
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
index 71e9f1e0a..d013e0a25 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
@@ -88,25 +88,25 @@
 
     <select id="hasAuthenticationPartyPage" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
         SELECT
-            pm.CADRE_FLAG, pm.CREATED_BY,eu.CREATED_TIME, pm.DEPT_ID,
-            pm.ID,eu.IDENTITY_NO,eu.MOBILE,pm.POST,
-            pm.POST_VALUE,eu.REAL_NAME,pm.REGIST_FLAG,eu.REGISTER_TIME as registTime,
-            GROUP_CONCAT( ut.TAG_NAME ) TAG_NAME, eu.ALL_DEPT_NAMES as allDeptNames
+        pm.CADRE_FLAG, pm.CREATED_BY,eu.CREATED_TIME, pm.DEPT_ID,
+        pm.ID,eu.IDENTITY_NO,eu.MOBILE,pm.POST,
+        pm.POST_VALUE,eu.REAL_NAME,pm.REGIST_FLAG,eu.REGISTER_TIME as registTime,
+        GROUP_CONCAT( ut.TAG_NAME ) TAG_NAME, eu.ALL_DEPT_NAMES as allDeptNames
         FROM
-            epdc_user eu
-            LEFT JOIN epdc_party_members pm on pm.IDENTITY_NO = eu.IDENTITY_NO and pm.REAL_NAME = eu.REAL_NAME
-            LEFT JOIN epdc_party_tag_relation pt ON pm.ID = pt.PARTY_ID
-            LEFT JOIN epdc_user_tag ut ON pt.TAG_ID = ut.ID
+        epdc_user eu
+        LEFT JOIN epdc_party_members pm on pm.IDENTITY_NO = eu.IDENTITY_NO and pm.REAL_NAME = eu.REAL_NAME
+        LEFT JOIN epdc_party_tag_relation pt ON pm.ID = pt.PARTY_ID
+        LEFT JOIN epdc_user_tag ut ON pt.TAG_ID = ut.ID
         AND ut.DEL_FLAG = '0'
         WHERE
-           eu.PARTY_FLAG = '1' and eu.DEL_FLAG = '0' and pm.DEL_FLAG = '0'
-        <if test="realName != null and realName != '' "> and pm.REAL_NAME = #{realName} </if>
-        <if test="mobile != null and mobile != '' "> and pm.MOBILE = #{mobile} </if>
-        <if test="identityNo != null and identityNo != '' "> and pm.IDENTITY_NO = #{identityNo} </if>
-        <if test="registFlag != null and registFlag != '' "> and pm.REGIST_FLAG = #{registFlag} </if>
-        <if test="postId != null and postId != '' "> and pm.POST_ID = #{postId} </if>
-        <if test="startTime != null and startTime != '' "> and pm.REGIST_TIME >= #{startTime} </if>
-        <if test="endTime != null and endTime != '' "> <![CDATA[ and pm.REGIST_TIME <= ]]> #{endTime} </if>
+        eu.PARTY_FLAG = '1' and eu.DEL_FLAG = '0'
+        <if test="realName != null and realName != '' ">and pm.REAL_NAME = #{realName}</if>
+        <if test="mobile != null and mobile != '' ">and pm.MOBILE = #{mobile}</if>
+        <if test="identityNo != null and identityNo != '' ">and pm.IDENTITY_NO = #{identityNo}</if>
+        <if test="registFlag != null and registFlag != '' ">and pm.REGIST_FLAG = #{registFlag}</if>
+        <if test="postId != null and postId != '' ">and pm.POST_ID = #{postId}</if>
+        <if test="startTime != null and startTime != '' ">and pm.REGIST_TIME >= #{startTime}</if>
+        <if test="endTime != null and endTime != '' "> <![CDATA[ and pm.REGIST_TIME <= ]]> #{endTime}</if>
         <if test="streetId != '' and streetId != null">
             AND (find_in_set(#{streetId},eu.PARENT_DEPT_IDS) OR find_in_set(#{streetId},eu.ALL_DEPT_IDS))
         </if>
@@ -120,7 +120,7 @@
     </select>
 
     <!--管理系统-->
-    <select id="selectByIdNew"  resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
+    <select id="selectByIdNew" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
 		SELECT
             pm.*,
             pm.ALL_DEPT_IDS as deptStrIds,
@@ -154,4 +154,76 @@
         UPDATE epdc_party_members SET GRID_NAME = #{newDeptName}, UPDATED_TIME = NOW() WHERE GRID_ID = #{deptId}
     </update>
 
+    <!--已认证党员分页-->
+    <select id="optimizeHasAuthenticationPartyPage" resultType="String">
+        SELECT
+        eu.ID
+        FROM
+        epdc_user eu
+        WHERE
+        eu.PARTY_FLAG = '1' and eu.DEL_FLAG = '0'
+        <if test="realName != null and realName != '' ">and eu.REAL_NAME = #{realName}</if>
+        <if test="mobile != null and mobile != '' ">and eu.MOBILE = #{mobile}</if>
+        <if test="identityNo != null and identityNo != '' ">and eu.IDENTITY_NO = #{identityNo}</if>
+        <if test="registFlag != null and registFlag != '' ">and eu.REGIST_FLAG = #{registFlag}</if>
+        <if test="startTime != null and startTime != '' ">and eu.REGISTER_TIME >= #{startTime}</if>
+        <if test="endTime != null and endTime != '' "> <![CDATA[ and eu.REGISTER_TIME <= ]]> #{endTime}</if>
+        <if test="streetId != '' and streetId != null">
+            AND (find_in_set(#{streetId},eu.PARENT_DEPT_IDS) OR find_in_set(#{streetId},eu.ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != '' and communityId != null">
+            AND (find_in_set(#{communityId},eu.PARENT_DEPT_IDS) OR find_in_set(#{communityId},eu.ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != '' and gridId != null">
+            and (eu.dept_id = #{gridId} OR find_in_set(#{gridId},eu.ALL_DEPT_IDS))
+        </if>
+        ORDER BY eu.REGISTER_TIME DESC
+
+
+    </select>
+    <!--已认证党员填充数据-->
+    <select id="optimizeHasAuthenticationPartyPageInfo" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
+        SELECT
+            pm.CADRE_FLAG,
+            pm.CREATED_BY,
+            pm.DEPT_ID,
+            pm.ID,
+            pm.POST,
+            pm.POST_VALUE,
+            pm.REGIST_FLAG,
+            GROUP_CONCAT(ut.TAG_NAME) TAG_NAME,
+            allu.CREATED_TIME,
+            allu.IDENTITY_NO,
+            allu.MOBILE,
+            allu.REAL_NAME,
+            allu.registTime,
+            allu.ALL_DEPT_NAMES
+        FROM
+            (
+                SELECT
+                    eu.ID,
+                    eu.CREATED_TIME,
+                    eu.IDENTITY_NO,
+                    eu.MOBILE,
+                    eu.REAL_NAME,
+                    eu.REGISTER_TIME as registTime,
+                    eu.ALL_DEPT_NAMES
+                FROM
+                    epdc_user eu
+                WHERE
+                    eu.ID IN
+                    <foreach collection="userIdList" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+            ) allu
+        LEFT JOIN epdc_party_members pm ON pm.IDENTITY_NO = allu.IDENTITY_NO
+        AND pm.REAL_NAME = allu.REAL_NAME
+        LEFT JOIN epdc_party_tag_relation pt ON pm.ID = pt.PARTY_ID
+        LEFT JOIN epdc_user_tag ut ON pt.TAG_ID = ut.ID
+        AND ut.DEL_FLAG = '0'
+        GROUP BY
+            allu.ID
+        ORDER BY
+            allu.registTime DESC
+    </select>
 </mapper>

From 2af789a3fb4b7a3b3e3cfc7feae410473dda5248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 20 Mar 2020 10:22:21 +0800
Subject: [PATCH 02/38] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=9A=E5=91=98?=
 =?UTF-8?q?=E5=89=8D=E5=88=A4=E6=96=AD=E6=AD=A4=E5=85=9A=E5=91=98=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E8=A2=AB=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PartyMembersController.java    |  5 +--
 .../elink/esua/epdc/dao/PartyMembersDao.java  |  9 ++++++
 .../epdc/service/PartyMembersService.java     | 11 ++++++-
 .../service/impl/PartyMembersServiceImpl.java | 32 ++++++++++++-------
 .../main/resources/mapper/PartyMembersDao.xml |  9 ++++++
 5 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
index dcd0b362f..67ef6c2ac 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
@@ -112,10 +112,7 @@ public class PartyMembersController {
     public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
-
-        partyMembersService.delete(ids);
-
-        return new Result();
+        return  partyMembersService.delete(ids);
     }
 
     @GetMapping("export")
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
index 723273495..9a482741e 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
@@ -84,4 +84,13 @@ public interface PartyMembersDao extends BaseDao<PartyMembersEntity> {
      */
 
     List<PartyMembersDTO> optimizeHasAuthenticationPartyPageInfo(@Param("userIdList") List<String> userIdList);
+
+    /***
+     * 删除时校验党员是否被认证
+     * @param IdentityNo
+     * @return
+     * @author qushutong
+     * @date 2020/3/20 9:21
+     */
+    Integer selectCountByIdentity(String IdentityNo);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
index 2f900f6bf..7fa20345f 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
@@ -52,7 +52,7 @@ public interface PartyMembersService extends BaseService<PartyMembersEntity> {
 
     void update(PartyMembersDTO dto);
 
-    void delete(String[] ids);
+    Result delete(String[] ids);
 
 
     /***
@@ -109,4 +109,13 @@ public interface PartyMembersService extends BaseService<PartyMembersEntity> {
      * @date 2020/3/19 13:36
      */
     Result<PageData<PartyMembersDTO>> optimizeHasAuthenticationPartyPage(Map<String, Object> params);
+
+    /***
+     * 通过身份证校验此党员是否被认证
+     * @param IdentityNo
+     * @return java.lang.Integer
+     * @author qushutong
+     * @date 2020/3/20 9:10
+     */
+    Integer checkCertificationByIdentityNo(String IdentityNo);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
index 0806f1b9d..490cc85e0 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
@@ -142,7 +142,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
      * 将必要的查询参数进行trim
      *
      * @param params 查询参数
-     * @return java.util.Map<java.lang.String, java.lang.Object>
+     * @return java.util.Map<java.lang.String   ,       java.lang.Object>
      * @author work@yujt.net.cn
      * @date 2020/2/24 16:43
      */
@@ -246,12 +246,19 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
+    public Result delete(String[] ids) {
         //逻辑删除
         //logicDelete(ids, PartyMembersEntity.class);
-
-        //物理删除
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+        // 删除之前校验此党员是否被认证
+        PartyMembersEntity partyMembersEntity = selectById(ids[0]);
+        Integer integer = checkCertificationByIdentityNo(partyMembersEntity.getIdentityNo());
+        if (integer != 0) {
+            throw new RenException("此党员已被认证不允许删除");
+        } else {
+            //物理删除
+            baseDao.deleteBatchIds(Arrays.asList(ids));
+        }
+        return new Result();
     }
 
     public void saveList(List<PartyMembersExcel> partyList) {
@@ -446,19 +453,17 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     }
 
 
-
     /**
-     *
      * 组织机构信息处理
      *
-     * @params [dto, partyList]
      * @return java.util.List<com.elink.esua.epdc.entity.PartyMembersEntity>
+     * @params [dto, partyList]
      * @author liuchuang
      * @since 2020/3/7 15:17
      */
     private List<PartyMembersEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<PartyMembersDTO> partyList) {
         List<PartyMembersEntity> entities = new ArrayList<>();
-        for (PartyMembersDTO party: partyList) {
+        for (PartyMembersDTO party : partyList) {
             PartyMembersEntity entity = new PartyMembersEntity();
             if (StringUtils.isNotEmpty(party.getParentDeptIds()) && StringUtils.isNotEmpty(party.getParentDeptNames())) {
                 List<String> parentDeptIds = Arrays.asList(party.getParentDeptIds().split(","));
@@ -492,12 +497,17 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     public Result<PageData<PartyMembersDTO>> optimizeHasAuthenticationPartyPage(Map<String, Object> params) {
         IPage<String> page = getPage(params);
         List<String> userIds = baseDao.optimizeHasAuthenticationPartyPage(params);
-        if(userIds.size()>0){
+        if (userIds.size() > 0) {
             List<PartyMembersDTO> partyMembersDTOList = baseDao.optimizeHasAuthenticationPartyPageInfo(userIds);
             return new Result<PageData<PartyMembersDTO>>().ok(new PageData<>(partyMembersDTOList, page.getTotal()));
-        }else {
+        } else {
             return new Result<PageData<PartyMembersDTO>>().ok(new PageData<>(new ArrayList<>(), NumConstant.ZERO));
         }
 
     }
+
+    @Override
+    public Integer checkCertificationByIdentityNo(String IdentityNo) {
+        return baseDao.selectCountByIdentity(IdentityNo);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
index d013e0a25..1d7250d69 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
@@ -226,4 +226,13 @@
         ORDER BY
             allu.registTime DESC
     </select>
+    <!--删除党员时候校验是否被认证-->
+    <select id="selectCountByIdentity" resultType="Integer">
+        SELECT
+            COUNT(u.ID)
+        FROM
+            epdc_user u
+        WHERE
+            u.IDENTITY_NO = #{IdentityNo}
+    </select>
 </mapper>

From 239ad8680bdd7d46e29a8ff88bc790c493305178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Fri, 20 Mar 2020 13:37:18 +0800
Subject: [PATCH 03/38] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E7=AB=AF=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E9=9D=A2=E6=9D=BF=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/controller/AppMenuController.java    | 12 ++++++
 .../com/elink/esua/epdc/dao/AppMenuDao.java   | 10 +++++
 .../esua/epdc/service/AppMenuService.java     |  9 +++++
 .../epdc/service/impl/AppMenuServiceImpl.java |  9 +++++
 .../src/main/resources/mapper/AppMenuDao.xml  | 39 +++++++++++++++++++
 5 files changed, 79 insertions(+)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java
index 12a19cacb..5bc38d2ad 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java
@@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.AppMenuDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.excel.AppMenuExcel;
 import com.elink.esua.epdc.service.AppMenuService;
@@ -126,4 +127,15 @@ public class AppMenuController {
     public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(@PathVariable("mobile") String mobile) {
         return appMenuService.indexPanel(mobile);
     }
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO>>
+     * @Author lpf
+     * @Description 首页面板 获取数据端APP菜单
+     * @Date 2020/03/18 10:42
+     **/
+    @GetMapping("/analysisIndexPanel/{userId}")
+    public Result<List<EpdcAppChildNavResultDTO>> analysisIndexPanel(@PathVariable("userId") String userId) {
+        return appMenuService.getAnalysisIndexPanel(userId);
+    }
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java
index 8154f25e5..4a748f124 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java
@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.AppMenuDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.entity.AppMenuEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -78,4 +79,13 @@ public interface AppMenuDao extends BaseDao<AppMenuEntity> {
 	 * @Date 2019/11/20 11:10
 	 **/
 	List<EpdcAppIndexPanelResultDTO> indexPanelByMobile(String mobile);
+
+	/**
+	 * @param userId
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO>>
+	 * @Author lpf
+	 * @Description 首页面板 获取数据端APP菜单
+	 * @Date 2020/03/18 10:42
+	 **/
+	List<EpdcAppChildNavResultDTO> getAnalysisIndexPanel(String userId);
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AppMenuService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AppMenuService.java
index b16bd65b9..401d3fcdf 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AppMenuService.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AppMenuService.java
@@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.AppMenuDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.entity.AppMenuEntity;
 
@@ -143,4 +144,12 @@ public interface AppMenuService extends BaseService<AppMenuEntity> {
      * @Date 2019/11/20 10:42
      **/
     Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(String mobile);
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO>>
+     * @Author lpf
+     * @Description 首页面板 获取数据端APP菜单
+     * @Date 2020/03/18 10:42
+     **/
+    Result<List<EpdcAppChildNavResultDTO>> getAnalysisIndexPanel(String userId);
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java
index 81e31035d..876d25091 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java
@@ -33,6 +33,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
 import com.elink.esua.epdc.dao.AppMenuDao;
 import com.elink.esua.epdc.dto.AppMenuDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.entity.AppMenuEntity;
 import com.elink.esua.epdc.enums.MenuTableEnum;
@@ -171,6 +172,14 @@ public class AppMenuServiceImpl extends BaseServiceImpl<AppMenuDao, AppMenuEntit
         List<EpdcAppIndexPanelResultDTO> indexPanelResultDTOList = this.baseDao.indexPanelByMobile(mobile);
         return new Result().ok(indexPanelResultDTOList);
     }
+    @Override
+    public Result<List<EpdcAppChildNavResultDTO>> getAnalysisIndexPanel(String userId) {
+        if (StringUtils.isBlank(userId)) {
+            return new Result().error("用户Id不能为空");
+        }
+        List<EpdcAppChildNavResultDTO> list = this.baseDao.getAnalysisIndexPanel(userId);
+        return new Result().ok(list);
+    }
 
 
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml
index 8daf8818c..9ef1b2c8f 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml
@@ -124,4 +124,43 @@
             AND m.pid != 0
             )order by mp.sort asc,mc.sort asc
     </select>
+    <resultMap id="AnalysisIndexPanelResultDTOMap" type="com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO">
+        <id column="label" property="label"/>
+        <result column="navCode" property="navCode"/>
+        <result column="remark" property="remark"/>
+        <result column="icon" property="icon"/>
+        <result column="className" property="className"/>
+        <result column="numFlag" property="numFlag"/>
+    </resultMap>
+    <select id="getAnalysisIndexPanel" resultMap="AnalysisIndexPanelResultDTOMap">
+         SELECT
+            lc.field_value AS label,
+            mc.menu_code AS navCode,
+            mc.remark,
+            mc.class_name AS className,
+            mc.icon,
+			mc.num_flag as numFlag
+        FROM
+            sys_app_menu mp
+            LEFT JOIN sys_language lp ON lp.table_id = mp.id
+            LEFT JOIN sys_app_menu mc ON mp.id = mc.pid
+            LEFT JOIN sys_language lc ON lc.table_id = mc.id
+        WHERE
+            mc.id IN (
+        SELECT
+            m.id meauId
+        FROM
+            sys_user u
+            LEFT JOIN sys_role_user ru ON ru.user_id = u.id
+            LEFT JOIN sys_app_role_menu am ON am.role_id = ru.role_id
+            LEFT JOIN sys_app_menu m ON am.menu_id = m.id  and m.del_flag = 0
+			LEFT JOIN sys_app_menu m1 ON m1.id = m.pid and m1.del_flag = 0
+        WHERE
+			u.id =#{userId}
+			and u.del_flag = 0
+            and am.menu_id IS NOT NULL
+            AND m.pid != 0
+			and m1.menu_code = 10010
+            )order by mp.sort asc,mc.sort asc
+    </select>
 </mapper>

From b537c3b3c7a169c6bf5e75aec49ce987aac143f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Fri, 20 Mar 2020 13:46:56 +0800
Subject: [PATCH 04/38] =?UTF-8?q?nacos=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-admin-server/src/main/resources/application.yml      | 1 +
 .../epdc-admin-server/src/main/resources/registry.conf        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
index 51e150c03..1fb454cc1 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
@@ -23,6 +23,7 @@ spring:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
         ip: @nacos.ip@
+        namespace: 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
     alibaba:
       seata:
         tx-service-group: epdc-admin-server-fescar-service-group
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf
index fb64abd71..8fd848d8e 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf
@@ -4,7 +4,7 @@ registry {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "6a3577b4-7b79-43f6-aebb-9c3f31263f6a"
     cluster = "default"
   }
 }
@@ -15,7 +15,7 @@ config {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "6a3577b4-7b79-43f6-aebb-9c3f31263f6a"
     cluster = "default"
   }
 }

From e5cba3212c5aefaad7e613a34b97c65db47cd9b0 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 23 Mar 2020 14:13:28 +0800
Subject: [PATCH 05/38] =?UTF-8?q?=E5=B9=B2=E9=83=A8=E8=AF=84=E4=BB=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E4=BA=A4=E4=BA=BA=E6=AF=8F=E5=A4=A9?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E8=AF=84=E4=BB=B7=E4=B8=80=E6=AC=A1=E6=9F=90?=
 =?UTF-8?q?=E4=B8=AA=E5=B9=B2=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/modules/evaluate/dao/EvaluateInfoDao.java     |  9 +++++++++
 .../evaluate/service/impl/EvaluateInfoServiceImpl.java | 10 ++++++----
 .../main/resources/mapper/evaluate/EvaluateInfoDao.xml |  9 +++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java
index 3b485d25d..e2cddd3ec 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java
@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.evaluate.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.evaluate.EvaluateSelectOption;
+import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateInfoResultDTO;
 import com.elink.esua.epdc.modules.evaluate.entity.EvaluateInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -47,5 +48,13 @@ public interface EvaluateInfoDao extends BaseDao<EvaluateInfoEntity> {
     void deleteEvaluate(@Param("id")String id);
 
     void UpdateOfficerCount(@Param("id")String id, @Param("type")String type);
+
+    /**
+     * 校验评价次数
+     * @param formDto
+     * @author wanggongfeng
+     * @return
+     */
+    Integer checkEvaluateTimes(EvaluateSubmitFormDTO formDto);
 	
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java
index 5e9a0215e..2ea43f9bd 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java
@@ -20,17 +20,14 @@ package com.elink.esua.epdc.modules.evaluate.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
-
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.evaluate.EvaluateDetailDTO;
 import com.elink.esua.epdc.dto.evaluate.EvaluateInfoDTO;
-import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO;
 import com.elink.esua.epdc.dto.evaluate.EvaluateSelectOption;
 import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateDeptCountResultDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateInfoResultDTO;
 import com.elink.esua.epdc.modules.evaluate.dao.EvaluateInfoDao;
 import com.elink.esua.epdc.modules.evaluate.entity.EvaluateInfoEntity;
@@ -121,6 +118,11 @@ public class EvaluateInfoServiceImpl extends BaseServiceImpl<EvaluateInfoDao, Ev
     @Transactional(rollbackFor = Exception.class)
     public Result evaluateSubmit(EvaluateSubmitFormDTO formDto) {
         try{
+            // 校验提交人当天是否已经评价过某干部
+            Integer times = baseDao.checkEvaluateTimes(formDto);
+            if(times > 0){
+                return new Result().error("今天已评价过该干部。");
+            }
             EvaluateInfoDTO dto = new EvaluateInfoDTO();
             dto.setFullName(formDto.getFullName());
             dto.setMobile(formDto.getMobile());
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
index 8f5a05b6f..b18a97af2 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
@@ -105,5 +105,14 @@
         where  ID = #{id}  and  DEL_FLAG = '0'
     </update>
 
+    <select id="checkEvaluateTimes" resultType="int">
+        select
+          count(*) num
+        from epdc_evaluate_info eei
+        where DATE_FORMAT(  SYSDATE(), '%Y-%m-%d' ) = DATE_FORMAT( eei.CREATED_TIME, '%Y-%m-%d' )
+        and eei.FULL_NAME = #{fullName}
+        and eei.OFFICER_ID = #{officerId}
+    </select>
+
 
 </mapper>
\ No newline at end of file

From 6625dcda517fe2a1874a7c578d559ec6d729a97d Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 23 Mar 2020 14:17:43 +0800
Subject: [PATCH 06/38] =?UTF-8?q?=E5=B9=B2=E9=83=A8=E8=AF=84=E4=BB=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E4=BA=A4=E4=BA=BA=E6=AF=8F=E5=A4=A9?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E8=AF=84=E4=BB=B7=E4=B8=80=E6=AC=A1=E6=9F=90?=
 =?UTF-8?q?=E4=B8=AA=E5=B9=B2=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/evaluate/EvaluateInfoDao.xml    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
index b18a97af2..a40a59583 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
@@ -109,7 +109,9 @@
         select
           count(*) num
         from epdc_evaluate_info eei
-        where DATE_FORMAT(  SYSDATE(), '%Y-%m-%d' ) = DATE_FORMAT( eei.CREATED_TIME, '%Y-%m-%d' )
+        where
+        eei.DEL_FLAG = '0'
+        and DATE_FORMAT(  SYSDATE(), '%Y-%m-%d' ) = DATE_FORMAT( eei.CREATED_TIME, '%Y-%m-%d' )
         and eei.FULL_NAME = #{fullName}
         and eei.OFFICER_ID = #{officerId}
     </select>

From 9d03b966b3918b8f380ee82da0fd1200cbe3cf55 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 24 Mar 2020 10:39:55 +0800
Subject: [PATCH 07/38] =?UTF-8?q?=E5=B9=B2=E9=83=A8=E8=AF=84=E4=BB=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E4=BA=A4=E4=BA=BA=E6=AF=8F=E5=A4=A9?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E8=AF=84=E4=BB=B7=E4=B8=80=E6=AC=A1=E6=9F=90?=
 =?UTF-8?q?=E4=B8=AA=E5=B9=B2=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/evaluate/EvaluateInfoDao.xml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
index a40a59583..fb9ed2fee 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
@@ -114,6 +114,7 @@
         and DATE_FORMAT(  SYSDATE(), '%Y-%m-%d' ) = DATE_FORMAT( eei.CREATED_TIME, '%Y-%m-%d' )
         and eei.FULL_NAME = #{fullName}
         and eei.OFFICER_ID = #{officerId}
+        and eei.ROLE_CODE = #{roleCode}
     </select>
 
 

From 04ed559a4b7db0b4aaab181c32eecd4c53314b54 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Tue, 24 Mar 2020 13:04:08 +0800
Subject: [PATCH 08/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E6=AF=94=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/controller/OssController.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java
index 88907d3f7..1d14e9180 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java
@@ -157,7 +157,7 @@ public class OssController {
         String suffix = suffixTmp.substring(11, suffixTmp.indexOf(";"));
         byte[] bytes = new BASE64Decoder().decodeBuffer(base64ImgArr[1]);
         // 图片压缩
-        byte[] imgBytes = CompressImgUtils.commpressPicCycle(bytes, 100, 0.5);
+        byte[] imgBytes = CompressImgUtils.commpressPicCycle(bytes, 110, 0.9);
         String url = OssFactory.build().uploadSuffix(imgBytes, suffix);
         return new Result<String>().ok(url);
     }
@@ -169,7 +169,7 @@ public class OssController {
             return new Result().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
         }
         // 图片压缩
-        byte[] imgBytes = CompressImgUtils.commpressPicCycle(fileByte, 100, 0.5);
+        byte[] imgBytes = CompressImgUtils.commpressPicCycle(fileByte, 110, 0.9);
         //上传文件
         String extension = FilenameUtils.getExtension(dto.getFileName());
         String url = OssFactory.build().uploadSuffix(imgBytes, extension);

From 3380a798c2014ba9d458d281fb1a6d72d2539139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 24 Mar 2020 17:02:06 +0800
Subject: [PATCH 09/38] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/user/form/ExportOperationFormDTO.java |  24 ++
 .../result/ExportOperationDataResultDTO.java  |  76 +++++
 .../epdc/excel/ExportOperationDataExcel.java  |  52 ++++
 .../controller/UserAnalysisController.java    |  24 +-
 .../modules/user/dao/UserAnalysisDao.java     |  75 +++++
 .../user/service/UserAnalysisService.java     |  17 +-
 .../service/impl/UserAnalysisServiceImpl.java |  46 +++
 .../resources/mapper/user/UserAnalysisDao.xml | 270 ++++++++++++++++++
 8 files changed, 574 insertions(+), 10 deletions(-)
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/ExportOperationDataExcel.java

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java
new file mode 100644
index 000000000..b4fb1ec0f
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java
@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.dto.user.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ExportOperationFormDTO implements Serializable {
+
+    private String operationStartTime;
+
+    private String operationEndTime;
+
+    /**
+     * 所有部门列表
+     */
+    private List<Long[]> allDeptIdsShow;
+
+    private List<Long> allStreetIds;
+
+    private String endTime;
+}
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
new file mode 100644
index 000000000..cf87a8027
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java
@@ -0,0 +1,76 @@
+package com.elink.esua.epdc.dto.user.result;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ *  @author: qushutong
+ *  @Date: 2020/3/23 14:47
+ *  @Description: 运营导出数据
+ */
+@Data
+public class ExportOperationDataResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -798787916350968587L;
+
+    /**
+     * 居民数
+     */
+    private int registerCount = 0;
+
+    /**
+     * 未认证用户数
+     */
+    private int unAuthorizedCount = 0;
+
+
+    /**
+     * 党员数
+     */
+    private int partyCount = 0;
+
+    /**
+     * 新闻发布数
+     */
+    private int newsCount = 0;
+
+
+    /**
+     * 议题数
+     */
+    private int eventCount = 0;
+
+    /**
+     * 项目数
+     */
+    private int itemCount = 0;
+
+    /**
+     * 项目解决数
+     */
+    private int itemCloseCount = 0;
+
+    /**
+     * 社群数
+     */
+    private int communityCount = 0;
+
+    /**
+     * 社群成员数
+     */
+    private int communityMemberCount = 0;
+
+    /**
+     * 社群话题数
+     */
+    private int communityTopicCount = 0;
+
+    /**
+     * 街道
+     */
+    private String streetName;
+
+}
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
new file mode 100644
index 000000000..e61be0af4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/ExportOperationDataExcel.java
@@ -0,0 +1,52 @@
+package com.elink.esua.epdc.excel;
+
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ *  @author: qushutong
+ *  @Date: 2020/3/23 14:47
+ *  @Description: 运营导出数据
+ */
+@Data
+public class ExportOperationDataExcel implements Serializable {
+
+    private static final long serialVersionUID = 4935348597474149310L;
+
+    @Excel(name = "街道")
+    private String streetName;
+
+    @Excel(name = "居民数")
+    private int registerCount = 0;
+
+    @Excel(name = "已认证党员数")
+    private int partyCount = 0;
+
+    @Excel(name = "新闻发布数")
+    private int newsCount = 0;
+
+
+    @Excel(name = "议题数")
+    private int eventCount = 0;
+
+    @Excel(name = "项目数")
+    private int itemCount = 0;
+
+    @Excel(name = "项目结案数")
+    private int itemCloseCount = 0;
+
+    @Excel(name = "社群数")
+    private int communityCount = 0;
+
+    @Excel(name = "社群成员数")
+    private int communityMemberCount = 0;
+
+    @Excel(name = "社群话题数")
+    private int communityTopicCount = 0;
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java
index e25f2dc88..b8ef9ddb5 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java
@@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.user.form.ExportOperationFormDTO;
 import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO;
 import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO;
 import com.elink.esua.epdc.dto.user.result.*;
@@ -12,23 +13,20 @@ import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
 import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO;
 import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
 import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO;
+import com.elink.esua.epdc.excel.ExportOperationDataExcel;
 import com.elink.esua.epdc.excel.GridOpiningExcel;
 import com.elink.esua.epdc.modules.user.service.OldMemberRankService;
 import com.elink.esua.epdc.modules.user.service.YoungMemberRankService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.elink.esua.epdc.excel.PartyAnalysExcel;
 import com.elink.esua.epdc.excel.RegisterExcel;
 import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.web.bind.annotation.RequestParam;
-
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -201,4 +199,18 @@ public class UserAnalysisController {
         List<GridOpeningResultDTO> list = userAnalysisService.listPageGridOpeningsForExport(params);
         ExcelUtils.exportExcelToTarget(response, "开通网格情况", list, GridOpiningExcel.class);
     }
+
+    /***
+     * 运营数据导出
+     * @param
+     * @param response
+     * @return void
+     * @author qushutong
+     * @date 2020/3/23 16:36
+     */
+    @PostMapping("export/exportOperationData")
+    public void exportOperationData(@RequestBody ExportOperationFormDTO exportOperationFormDTO, HttpServletResponse response) throws Exception{
+        List<ExportOperationDataResultDTO> list = userAnalysisService.listExportOperationCount(exportOperationFormDTO);
+        ExcelUtils.exportExcelToTarget(response, "开通网格情况", list, ExportOperationDataExcel.class);
+    }
 }
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 5c2c50477..6220046cb 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
@@ -2,6 +2,7 @@ package com.elink.esua.epdc.modules.user.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.UserCountDTO;
 import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO;
 import com.elink.esua.epdc.dto.user.result.*;
@@ -157,4 +158,78 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
      * @date 2020/3/5 14:10
      */
     List<GridOpeningResultDTO> selectListUnAuthorizedCountByGridId(Map<String, Object> params);
+
+    /***
+     * 运营数据导出用户相关
+     * @param exportOperationFormDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/3/23 15:16
+     */
+    List<ExportOperationDataResultDTO> selectExportUserCount(ExportOperationFormDTO exportOperationFormDTO);
+
+    /***
+     * 运营数据导出未认证用户
+     * @param exportOperationFormDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/3/23 15:16
+     */
+    List<ExportOperationDataResultDTO> selectExportunAuthorizedCount(ExportOperationFormDTO exportOperationFormDTO);
+
+
+    /***
+     * 运营数据导出议题
+     * @param exportOperationFormDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/3/23 15:16
+     */
+    List<ExportOperationDataResultDTO> selectExportEventCount(ExportOperationFormDTO exportOperationFormDTO);
+
+    /***
+     * 运营数据导出项目相关
+     * @param exportOperationFormDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/3/23 15:16
+     */
+    List<ExportOperationDataResultDTO> selectExportItemCount(ExportOperationFormDTO exportOperationFormDTO);
+
+    /***
+     * 运营数据导出新闻
+     * @param exportOperationFormDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/3/23 15:16
+     */
+    List<ExportOperationDataResultDTO> selectExportNewsCount(ExportOperationFormDTO exportOperationFormDTO);
+
+    /***
+     * 运营数据导出社群数
+     * @param exportOperationFormDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/3/23 15:16
+     */
+    List<ExportOperationDataResultDTO> selectExportGroupCount(ExportOperationFormDTO exportOperationFormDTO);
+
+    /***
+     * 运营数据导出社群成员数
+     * @param exportOperationFormDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/3/23 15:16
+     */
+    List<ExportOperationDataResultDTO> selectExportCommunityMemberCount(ExportOperationFormDTO exportOperationFormDTO);
+
+    /***
+     * 运营数据导出社群话题数
+     * @param exportOperationFormDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/3/23 15:16
+     */
+    List<ExportOperationDataResultDTO> selectExportTopicCount(ExportOperationFormDTO exportOperationFormDTO);
+
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
index 8a460c049..f2759b2e8 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
@@ -2,12 +2,10 @@ package com.elink.esua.epdc.modules.user.service;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+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.result.GridDataTotalResultDTO;
-import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
-import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
-import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO;
+import com.elink.esua.epdc.dto.user.result.*;
 
 import java.util.List;
 import java.util.Map;
@@ -88,4 +86,15 @@ public interface UserAnalysisService {
      * @date 2020/2/13 14:22
      */
     GridDataTotalResultDTO selectGridDataTotal(Map<String, Object> params);
+
+
+
+    /***
+     * 运营数据导出用户相关
+     * @param exportOperationFormDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/3/23 15:16
+     */
+    List<ExportOperationDataResultDTO> listExportOperationCount(ExportOperationFormDTO exportOperationFormDTO);
 }
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 02108205f..6ee7b0f6c 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
@@ -13,6 +13,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 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.result.*;
@@ -23,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -269,6 +271,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         result.setNoticeCount(noticeCount);
         result.setEventCount(eventCount);
         result.setItemPraiseCount(itemPraiseCount);
+
         result.setItemCloseCount(itemCloseCount);
         result.setItemCount(itemCount);
         result.setCommunityCount(communityCount);
@@ -277,4 +280,47 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
 
         return result;
     }
+
+    @Override
+    public List<ExportOperationDataResultDTO> listExportOperationCount(ExportOperationFormDTO exportOperationFormDTO) {
+        List<Long> allStreetIds = new ArrayList<>();
+        for(Long[] item : exportOperationFormDTO.getAllDeptIdsShow()){
+            allStreetIds.add(item[0]);
+        }
+        exportOperationFormDTO.setAllStreetIds(allStreetIds);
+        //用户相关
+        List<ExportOperationDataResultDTO> exportOperationDataResultDTOS = baseDao.selectExportUserCount(exportOperationFormDTO);
+        // 未认证用户
+        List<ExportOperationDataResultDTO> unAuthorizedResultDTOS = baseDao.selectExportunAuthorizedCount(exportOperationFormDTO);
+
+        List<ExportOperationDataResultDTO> newsResultDTOS = baseDao.selectExportNewsCount(exportOperationFormDTO);
+        // 议题
+        List<ExportOperationDataResultDTO> eventDataResultDTOS = baseDao.selectExportEventCount(exportOperationFormDTO);
+        // 项目
+        List<ExportOperationDataResultDTO> itemDataResultDTOS = baseDao.selectExportItemCount(exportOperationFormDTO);
+        // 社群
+        List<ExportOperationDataResultDTO> groupDataResultDTOS = baseDao.selectExportGroupCount(exportOperationFormDTO);
+        // 社群成员
+        List<ExportOperationDataResultDTO> communityMemberDataResultDTOS = baseDao.selectExportCommunityMemberCount(exportOperationFormDTO);
+        // 话题
+        List<ExportOperationDataResultDTO> topicDataResultDTOS = baseDao.selectExportTopicCount(exportOperationFormDTO);
+        //居民数
+        for(int i= 0;i<exportOperationDataResultDTOS.size();i++){
+            for(ExportOperationDataResultDTO item:unAuthorizedResultDTOS){
+                if( exportOperationDataResultDTOS.get(i).getStreetName().equals(item.getStreetName())){
+                    exportOperationDataResultDTOS.get(i).setRegisterCount(exportOperationDataResultDTOS.get(i).getRegisterCount()+item.getUnAuthorizedCount());
+                }else {
+                    exportOperationDataResultDTOS.get(i).setRegisterCount(exportOperationDataResultDTOS.get(i).getRegisterCount());
+                }
+            }
+            exportOperationDataResultDTOS.get(i).setNewsCount(newsResultDTOS.get(i).getNewsCount());
+            exportOperationDataResultDTOS.get(i).setItemCount(itemDataResultDTOS.get(i).getItemCount());
+            exportOperationDataResultDTOS.get(i).setItemCloseCount(itemDataResultDTOS.get(i).getItemCloseCount());
+            exportOperationDataResultDTOS.get(i).setEventCount(eventDataResultDTOS.get(i).getEventCount());
+            exportOperationDataResultDTOS.get(i).setCommunityCount(groupDataResultDTOS.get(i).getCommunityCount());
+            exportOperationDataResultDTOS.get(i).setCommunityMemberCount(communityMemberDataResultDTOS.get(i).getCommunityMemberCount());
+            exportOperationDataResultDTOS.get(i).setCommunityTopicCount(topicDataResultDTOS.get(i).getCommunityTopicCount());
+        }
+        return exportOperationDataResultDTOS;
+    }
 }
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 32b76a81e..c6b30f712 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
@@ -430,4 +430,274 @@
             ) t GROUP BY t.userId
         ) tt GROUP BY tt.gridId
     </select>
+
+    <!--运营导出数据相关-->
+    <select id="selectExportUserCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO" parameterType="com.elink.esua.epdc.dto.user.form.ExportOperationFormDTO">
+        SELECT
+        t0.`name` streetName,
+        count(uu.PARTY_FLAG = '0'OR NULL)AS registerCount,
+        count(uu.PARTY_FLAG = '1'OR NULL) AS partyCount
+        FROM
+        (
+        SELECT
+        ad.id,
+        ad.`name`,
+        ad.pid
+        FROM
+        esua_epdc_admin.sys_dept ad
+        WHERE
+        ad.id IN <include refid="foreachAllDeptIdsShow"></include>
+        AND ad.del_flag = 0
+        ) t0
+        LEFT JOIN esua_epdc_user.epdc_user uu ON find_in_set(t0.id, uu.ALL_DEPT_IDS)
+        AND uu.DEL_FLAG = '0'
+        <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
+            AND uu.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and uu.CREATED_TIME &lt;=#{endTime}
+        </if>
+        GROUP BY
+        t0.id
+        ORDER BY
+        t0.id ASC
+    </select>
+
+    <select id="selectExportunAuthorizedCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO">
+        SELECT t1.`name` streetName ,COUNT(t1.ID) unAuthorizedCount FROM (SELECT
+        uu.ID,t0.`name`
+        FROM
+            (
+                SELECT
+                    ad.id,
+                    ad.`name`,
+                    ad.pid
+                FROM
+                    esua_epdc_admin.sys_dept ad
+                WHERE
+                    ad.id IN <include refid="foreachAllDeptIdsShow"></include>
+                AND ad.del_flag = 0
+            ) t0
+        LEFT JOIN esua_epdc_user.epdc_user_grid_relation ug ON find_in_set(t0.id, ug.ALL_DEPT_IDS)
+        LEFT JOIN esua_epdc_user.epdc_user uu ON uu.STATE = '0' AND ug.USER_ID=uu.ID
+        AND uu.DEL_FLAG = '0'
+        <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
+            AND uu.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and uu.CREATED_TIME &lt;=#{endTime}
+        </if>
+        WHERE uu.ID is NOT NULL
+        GROUP BY
+            ug.USER_ID,t0.id
+        ORDER BY
+            ug.CREATED_TIME ASC) t1
+        GROUP BY t1.`name`
+    </select>
+    <!--新闻-->
+    <select id="selectExportNewsCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO">
+        SELECT
+            t0.`name` streetName,
+            COUNT(un.ID) newsCount
+        FROM
+            (
+                SELECT
+                    ad.id,
+                    ad.`name`,
+                    ad.pid
+                FROM
+                    esua_epdc_admin.sys_dept ad
+                WHERE
+                    ad.id IN <include refid="foreachAllDeptIdsShow"></include>
+                AND ad.del_flag = 0
+            ) t0
+        LEFT JOIN esua_epdc_news.epdc_news un ON find_in_set(t0.id, un.ALL_DEPT_IDS)
+        AND un.DEL_FLAG = '0'
+        <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
+            AND un.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and un.CREATED_TIME &lt;=#{endTime}
+        </if>
+        GROUP BY
+            t0.id
+        ORDER BY
+            t0.id ASC
+    </select>
+    <!--议题-->
+    <select id="selectExportEventCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO">
+        SELECT
+            t0.`name` streetName,
+            COUNT(epen.ID) eventCount
+        FROM
+            (
+                SELECT
+                    ad.id,
+                    ad.`name`,
+                    ad.pid
+                FROM
+                    esua_epdc_admin.sys_dept ad
+                WHERE
+                    ad.id IN <include refid="foreachAllDeptIdsShow"></include>
+                AND ad.del_flag = 0
+            ) t0
+        LEFT JOIN esua_epdc_events.epdc_events epen ON find_in_set(t0.id, epen.ALL_DEPT_IDS)
+        AND epen.DEL_FLAG = '0'
+        AND epen.EVENT_STATE = '4'
+        <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
+            AND epen.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and epen.CREATED_TIME &lt;=#{endTime}
+        </if>
+        GROUP BY
+            t0.id
+        ORDER BY
+            t0.id ASC
+    </select>
+    <!--项目相关-->
+    <select id="selectExportItemCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO">
+        SELECT
+            t0.`name` streetName,
+            COUNT(epen.ID) itemCount,
+            COUNT(epen.ITEM_STATE = '10' OR NULL) itemCloseCount
+        FROM
+            (
+                SELECT
+                    ad.id,
+                    ad.`name`,
+                    ad.pid
+                FROM
+                    esua_epdc_admin.sys_dept ad
+                WHERE
+                    ad.id IN <include refid="foreachAllDeptIdsShow"></include>
+                AND ad.del_flag = 0
+            ) t0
+        LEFT JOIN esua_epdc_events.epdc_item epen ON find_in_set(t0.id, epen.ALL_DEPT_IDS)
+        AND epen.DEL_FLAG = '0'
+        <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
+            AND epen.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and epen.CREATED_TIME &lt;=#{endTime}
+        </if>
+        GROUP BY
+            t0.id
+        ORDER BY
+            t0.id ASC
+    </select>
+    <!--社群数-->
+    <select id="selectExportGroupCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO">
+        SELECT
+            t0.`name` streetName,
+            COUNT(epgr.ID) communityCount
+        FROM
+            (
+                SELECT
+                    ad.id,
+                    ad.`name`,
+                    ad.pid
+                FROM
+                    esua_epdc_admin.sys_dept ad
+                WHERE
+                    ad.id IN <include refid="foreachAllDeptIdsShow"></include>
+                AND ad.del_flag = 0
+            ) t0
+        LEFT JOIN esua_epdc_group.epdc_group epgr ON find_in_set(t0.id, epgr.ALL_DEPT_IDS)
+        AND epgr.DEL_FLAG = '0'
+        AND (
+            epgr.STATE = '10'
+            OR epgr.STATE = '15'
+        )
+        <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
+            AND epgr.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and epgr.CREATED_TIME &lt;=#{endTime}
+        </if>
+        GROUP BY
+            t0.id
+        ORDER BY
+            t0.id ASC
+    </select>
+    <!--社群成员数-->
+    <select id="selectExportCommunityMemberCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO">
+        SELECT
+            t0.`name` streetName,
+            COUNT(ug.ID) communityMemberCount
+        FROM
+            (
+                SELECT
+                    ad.id,
+                    ad.`name`,
+                    ad.pid
+                FROM
+                    esua_epdc_admin.sys_dept ad
+                WHERE
+                    ad.id IN <include refid="foreachAllDeptIdsShow"></include>
+                AND ad.del_flag = 0
+            ) t0
+        LEFT JOIN esua_epdc_group.epdc_group epgr ON find_in_set(t0.id, epgr.ALL_DEPT_IDS)
+        AND epgr.DEL_FLAG = '0'
+        <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
+            AND epgr.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and epgr.CREATED_TIME &lt;=#{endTime}
+        </if>
+        AND (
+            epgr.STATE = '10'
+            OR epgr.STATE = '15'
+        )
+        LEFT JOIN esua_epdc_group.epdc_user_group ug ON epgr.id = ug.group_id
+        AND ug.DEL_FLAG = '0'
+        GROUP BY
+            t0.id
+        ORDER BY
+            t0.id ASC
+    </select>
+
+    <!--社群话题数-->
+    <select id="selectExportTopicCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO">
+        SELECT
+        t0.`name` streetName,
+        COUNT(ug.ID) communityTopicCount
+        FROM
+        (
+        SELECT
+        ad.id,
+        ad.`name`,
+        ad.pid
+        FROM
+        esua_epdc_admin.sys_dept ad
+        WHERE
+        ad.id IN <include refid="foreachAllDeptIdsShow"></include>
+        AND ad.del_flag = 0
+        ) t0
+        LEFT JOIN esua_epdc_group.epdc_group epgr ON find_in_set(t0.id, epgr.ALL_DEPT_IDS)
+        AND epgr.DEL_FLAG = '0'
+        AND (
+        epgr.STATE = '10'
+        <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
+            AND epgr.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and epgr.CREATED_TIME &lt;=#{endTime}
+        </if>
+        OR epgr.STATE = '15'
+        )
+        LEFT JOIN esua_epdc_group.epdc_topic ug ON epgr.id = ug.group_id
+        AND ug.DEL_FLAG = '0'
+        GROUP BY
+        t0.id
+        ORDER BY
+        t0.id ASC
+    </select>
+
+    <!--循环街道id集合-->
+    <sql id="foreachAllDeptIdsShow">
+        <foreach collection="allStreetIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </sql>
 </mapper>

From 5baa7c01b9c06704e3129f2c8840799d223da90f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 25 Mar 2020 18:37:53 +0800
Subject: [PATCH 10/38] =?UTF-8?q?=E6=96=B0=E7=BD=91=E6=A0=BC=E5=BC=80?=
 =?UTF-8?q?=E9=80=9A=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/user/MetaUserGridOpiningDTO.java | 146 ++++++++++++++++++
 .../epdc/datasources/DataSourceNames.java     |   1 +
 .../datasources/DynamicDataSourceConfig.java  |   9 +-
 .../MetaUserGridOpiningController.java        | 104 +++++++++++++
 .../controller/UserAnalysisController.java    |   4 +
 .../user/dao/MetaUserGridOpiningDao.java      |  45 ++++++
 .../entity/MetaUserGridOpiningEntity.java     | 116 ++++++++++++++
 .../user/excel/MetaUserGridOpiningExcel.java  | 101 ++++++++++++
 .../service/MetaUserGridOpiningService.java   | 107 +++++++++++++
 .../user/service/UserAnalysisService.java     |  13 ++
 .../impl/MetaUserGridOpiningServiceImpl.java  | 129 ++++++++++++++++
 .../service/impl/UserAnalysisServiceImpl.java |  15 +-
 .../src/main/resources/application-dev.yml    |   4 +
 .../mapper/user/MetaUserGridOpiningDao.xml    |  45 ++++++
 .../elink/esua/epdc/feign/UserFeignClint.java |  22 +++
 .../fallback/UserFeignClintFallback.java      |  19 +++
 .../epdc/service/ScheduleJobUserService.java  |  19 +++
 .../impl/ScheduleJobUserServiceImpl.java      |  20 +++
 .../epdc/task/analysis/UserAnalysisTask.java  |  18 +++
 .../task/analysis/UserAnalysisTaskImpl.java   |  21 +++
 20 files changed, 956 insertions(+), 2 deletions(-)
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserGridOpiningController.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserGridOpiningDao.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserGridOpiningService.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java
 create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
 create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobUserService.java
 create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTask.java
 create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTaskImpl.java

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
new file mode 100644
index 000000000..7bf3ea654
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
@@ -0,0 +1,146 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.user;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 网格开通情况
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Data
+public class MetaUserGridOpiningDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 网格id
+     */
+	private Long gridId;
+
+    /**
+     * 用户总数
+     */
+	private String registerCount;
+
+    /**
+     * 党员数
+     */
+	private String partyCount;
+
+    /**
+     * 已注册居民
+     */
+	private String residentCount;
+
+    /**
+     * 未注册居民
+     */
+	private String unAuthorizedCount;
+
+    /**
+     * 新闻发布数
+     */
+	private String newsCount;
+
+    /**
+     * 社群数
+     */
+	private String communityCount;
+
+    /**
+     * 群成员数
+     */
+	private String communityMemberCount;
+
+    /**
+     * 群话题数
+     */
+	private String communityTopicCount;
+
+    /**
+     * 议题总数
+     */
+	private String eventCount;
+
+    /**
+     * 项目数
+     */
+	private String itemCount;
+
+    /**
+     * 项目已解决数
+     */
+	private String itemCloseCount;
+
+    /**
+     * 好评数
+     */
+	private String itemPraiseCount;
+
+    /**
+     * 网格名称
+     */
+	private String allDeptNames;
+
+    /**
+     * 网格党建指导员姓名
+     */
+	private String gridLeader;
+
+    /**
+     * 删除标记
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 注册时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/datasources/DataSourceNames.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/datasources/DataSourceNames.java
index e75611937..55b1b3a2e 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/datasources/DataSourceNames.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/datasources/DataSourceNames.java
@@ -19,4 +19,5 @@ public interface DataSourceNames {
     String NINTH = "ninth";
     String TENTH = "tenth";
     String ELEVENTH = "eleventh";
+    String TWELVE = "twelve";
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/datasources/DynamicDataSourceConfig.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/datasources/DynamicDataSourceConfig.java
index 9f078d3a1..bf0541ddd 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/datasources/DynamicDataSourceConfig.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/datasources/DynamicDataSourceConfig.java
@@ -86,6 +86,12 @@ public class DynamicDataSourceConfig {
         return DruidDataSourceBuilder.create().build();
     }
 
+    @Bean
+    @ConfigurationProperties("spring.datasource.druid.twelve")
+    public DataSource twelvethDataSource() {
+        return DruidDataSourceBuilder.create().build();
+    }
+
     @Bean
     @Primary
     public DynamicDataSource dataSource(DataSource firstDataSource, DataSource secondDataSource,
@@ -93,7 +99,7 @@ public class DynamicDataSourceConfig {
                                         DataSource fifthDataSource, DataSource sixthDataSource,
                                         DataSource seventhDataSource, DataSource eighthDataSource,
                                         DataSource ninthDataSource, DataSource tenthDataSource,
-                                        DataSource eleventhDataSource) {
+                                        DataSource eleventhDataSource,DataSource twelvethDataSource) {
         Map<Object, Object> targetDataSources = new HashMap<>();
         targetDataSources.put(DataSourceNames.FIRST, firstDataSource);
         targetDataSources.put(DataSourceNames.SECOND, secondDataSource);
@@ -106,6 +112,7 @@ public class DynamicDataSourceConfig {
         targetDataSources.put(DataSourceNames.NINTH, ninthDataSource);
         targetDataSources.put(DataSourceNames.TENTH, tenthDataSource);
         targetDataSources.put(DataSourceNames.ELEVENTH, eleventhDataSource);
+        targetDataSources.put(DataSourceNames.TWELVE, twelvethDataSource);
         return new DynamicDataSource(firstDataSource, targetDataSources);
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserGridOpiningController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserGridOpiningController.java
new file mode 100644
index 000000000..0f5b1fc1f
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserGridOpiningController.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.user.MetaUserGridOpiningDTO;
+import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
+import com.elink.esua.epdc.modules.user.excel.MetaUserGridOpiningExcel;
+import com.elink.esua.epdc.modules.user.service.MetaUserGridOpiningService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 网格开通情况
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@RestController
+@RequestMapping("metausergridopining")
+public class MetaUserGridOpiningController {
+    
+    @Autowired
+    private MetaUserGridOpiningService metaUserGridOpiningService;
+
+    @GetMapping("page")
+    public Result<PageData<MetaUserGridOpiningDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<MetaUserGridOpiningDTO> page = metaUserGridOpiningService.page(params);
+        return new Result<PageData<MetaUserGridOpiningDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<MetaUserGridOpiningDTO> get(@PathVariable("id") String id){
+        MetaUserGridOpiningDTO data = metaUserGridOpiningService.get(id);
+        return new Result<MetaUserGridOpiningDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody MetaUserGridOpiningDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        metaUserGridOpiningService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody MetaUserGridOpiningDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        metaUserGridOpiningService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        metaUserGridOpiningService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<MetaUserGridOpiningDTO> list = metaUserGridOpiningService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, MetaUserGridOpiningExcel.class);
+    }
+
+    /**
+     *  @author: qushutong
+     *  @Date: 2020/3/25 10:35
+     *  @Description: 临时表导入
+     */
+    @GetMapping("tolead")
+    public Result<List<GridOpeningResultDTO>> tolead() {
+        return metaUserGridOpiningService.createUserAnalysisData();
+    }
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java
index e25f2dc88..472f20f7b 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java
@@ -24,6 +24,7 @@ import com.elink.esua.epdc.excel.PartyAnalysExcel;
 import com.elink.esua.epdc.excel.RegisterExcel;
 import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -201,4 +202,7 @@ public class UserAnalysisController {
         List<GridOpeningResultDTO> list = userAnalysisService.listPageGridOpeningsForExport(params);
         ExcelUtils.exportExcelToTarget(response, "开通网格情况", list, GridOpiningExcel.class);
     }
+
+
+
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserGridOpiningDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserGridOpiningDao.java
new file mode 100644
index 000000000..ca5c69bca
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserGridOpiningDao.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.modules.user.entity.MetaUserGridOpiningEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 网格开通情况
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Mapper
+public interface MetaUserGridOpiningDao extends BaseDao<MetaUserGridOpiningEntity> {
+
+    /***
+     * 列表
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.modules.user.entity.MetaUserGridOpiningEntity>
+     * @author qushutong
+     * @date 2020/3/25 17:30
+     */
+    List<MetaUserGridOpiningEntity> pageselectListPage(Map<String,Object> params);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java
new file mode 100644
index 000000000..305bc8930
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 网格开通情况
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("meta_epdc_user_grid_opining")
+public class MetaUserGridOpiningEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+	private Long gridId;
+
+    /**
+     * 用户总数
+     */
+	private String registerCount;
+
+    /**
+     * 党员数
+     */
+	private String partyCount;
+
+    /**
+     * 已注册居民
+     */
+	private String residentCount;
+
+    /**
+     * 未注册居民
+     */
+	private String unAuthorizedCount;
+
+    /**
+     * 新闻发布数
+     */
+	private String newsCount;
+
+    /**
+     * 社群数
+     */
+	private String communityCount;
+
+    /**
+     * 群成员数
+     */
+	private String communityMemberCount;
+
+    /**
+     * 群话题数
+     */
+	private String communityTopicCount;
+
+    /**
+     * 议题总数
+     */
+	private String eventCount;
+
+    /**
+     * 项目数
+     */
+	private String itemCount;
+
+    /**
+     * 项目已解决数
+     */
+	private String itemCloseCount;
+
+    /**
+     * 好评数
+     */
+	private String itemPraiseCount;
+
+    /**
+     * 网格名称
+     */
+	private String allDeptNames;
+
+    /**
+     * 网格党建指导员姓名
+     */
+	private String gridLeader;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java
new file mode 100644
index 000000000..2da7a72da
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 网格开通情况
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Data
+public class MetaUserGridOpiningExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "网格id")
+    private Long gridId;
+
+    @Excel(name = "用户总数")
+    private String registerCount;
+
+    @Excel(name = "党员数")
+    private String partyCount;
+
+    @Excel(name = "已注册居民")
+    private String residentCount;
+
+    @Excel(name = "未注册居民")
+    private String unAuthorizedCount;
+
+    @Excel(name = "新闻发布数")
+    private String newsCount;
+
+    @Excel(name = "社群数")
+    private String communityCount;
+
+    @Excel(name = "群成员数")
+    private String communityMemberCount;
+
+    @Excel(name = "群话题数")
+    private String communityTopicCount;
+
+    @Excel(name = "议题总数")
+    private String eventCount;
+
+    @Excel(name = "项目数")
+    private String itemCount;
+
+    @Excel(name = "项目已解决数")
+    private String itemCloseCount;
+
+    @Excel(name = "好评数")
+    private String itemPraiseCount;
+
+    @Excel(name = "网格名称")
+    private String allDeptNames;
+
+    @Excel(name = "网格党建指导员姓名")
+    private String gridLeader;
+
+    @Excel(name = "删除标记")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "注册时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserGridOpiningService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserGridOpiningService.java
new file mode 100644
index 000000000..c28bfabce
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserGridOpiningService.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.user.MetaUserGridOpiningDTO;
+import com.elink.esua.epdc.modules.user.entity.MetaUserGridOpiningEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 网格开通情况
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+public interface MetaUserGridOpiningService extends BaseService<MetaUserGridOpiningEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<MetaUserGridOpiningDTO>
+     * @author generator
+     * @date 2020-03-25
+     */
+    PageData<MetaUserGridOpiningDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<MetaUserGridOpiningDTO>
+     * @author generator
+     * @date 2020-03-25
+     */
+    List<MetaUserGridOpiningDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return MetaUserGridOpiningDTO
+     * @author generator
+     * @date 2020-03-25
+     */
+    MetaUserGridOpiningDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-25
+     */
+    void save(MetaUserGridOpiningDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-25
+     */
+    void update(MetaUserGridOpiningDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-03-25
+     */
+    void delete(String[] ids);
+
+
+
+    /***
+     * 网格开通数据生成临时表导入
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author qushutong
+     * @date 2020/3/25 10:42
+     */
+    Result createUserAnalysisData();
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
index 8a460c049..887ad6c02 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
@@ -88,4 +88,17 @@ public interface UserAnalysisService {
      * @date 2020/2/13 14:22
      */
     GridDataTotalResultDTO selectGridDataTotal(Map<String, Object> params);
+
+
+
+    /***
+     * 获取所有网格
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/3/25 17:22
+     */
+    List<GridOpeningResultDTO> selectListGridHasMaCode(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/MetaUserGridOpiningServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
new file mode 100644
index 000000000..d2e909e75
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
@@ -0,0 +1,129 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.datasources.DataSourceNames;
+import com.elink.esua.epdc.datasources.annotation.DataSource;
+import com.elink.esua.epdc.dto.user.MetaUserGridOpiningDTO;
+import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
+import com.elink.esua.epdc.modules.user.dao.MetaUserGridOpiningDao;
+import com.elink.esua.epdc.modules.user.entity.MetaUserGridOpiningEntity;
+import com.elink.esua.epdc.modules.user.service.MetaUserGridOpiningService;
+import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 网格开通情况
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Service
+public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGridOpiningDao, MetaUserGridOpiningEntity> implements MetaUserGridOpiningService {
+    @Autowired
+    private UserAnalysisService userAnalysisService;
+
+    @Override
+    @DataSource(name = DataSourceNames.TWELVE)
+    public PageData<MetaUserGridOpiningDTO> page(Map<String, Object> params) {
+        IPage<MetaUserGridOpiningEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        // 获取所有网格
+        List<GridOpeningResultDTO> gridOpeningResultDTOS = userAnalysisService.selectListGridHasMaCode(params);
+        List<String> deptIdList = new ArrayList<>();
+        for(GridOpeningResultDTO item:gridOpeningResultDTOS){
+            deptIdList.add(item.getGridId());
+        }
+        params.put("deptIdList",deptIdList);
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar c = Calendar.getInstance();
+        c.add(Calendar.DATE, -1);
+        Date createdTime = c.getTime();
+        params.put("createdTime",format.format(createdTime));
+        List<MetaUserGridOpiningEntity> metaUserGridOpiningEntityList = baseDao.pageselectListPage(params);
+        return getPageData(metaUserGridOpiningEntityList,page.getTotal(), MetaUserGridOpiningDTO.class);
+    }
+
+    @Override
+    public List<MetaUserGridOpiningDTO> list(Map<String, Object> params) {
+        List<MetaUserGridOpiningEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, MetaUserGridOpiningDTO.class);
+    }
+
+    private QueryWrapper<MetaUserGridOpiningEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<MetaUserGridOpiningEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        return wrapper;
+    }
+
+    @Override
+    public MetaUserGridOpiningDTO get(String id) {
+        MetaUserGridOpiningEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, MetaUserGridOpiningDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(MetaUserGridOpiningDTO dto) {
+        MetaUserGridOpiningEntity entity = ConvertUtils.sourceToTarget(dto, MetaUserGridOpiningEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(MetaUserGridOpiningDTO dto) {
+        MetaUserGridOpiningEntity entity = ConvertUtils.sourceToTarget(dto, MetaUserGridOpiningEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+
+    @Override
+    public Result createUserAnalysisData() {
+        List<GridOpeningResultDTO> list = userAnalysisService.listPageGridOpeningsForExport(new HashMap<>());
+        List<MetaUserGridOpiningEntity> metaUserGridOpiningEntities = ConvertUtils.sourceToTarget(list, MetaUserGridOpiningEntity.class);
+        boolean b = insertBatch(metaUserGridOpiningEntities);
+        return b?new Result<>():new Result().error("录入失败");
+    }
+}
\ No newline at end of file
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 02108205f..6ab47fcba 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
@@ -9,6 +9,7 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.datasources.DataSourceNames;
 import com.elink.esua.epdc.datasources.annotation.DataSource;
@@ -17,12 +18,16 @@ 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.result.*;
 import com.elink.esua.epdc.modules.user.dao.UserAnalysisDao;
+import com.elink.esua.epdc.modules.user.entity.MetaUserGridOpiningEntity;
+import com.elink.esua.epdc.modules.user.service.MetaUserGridOpiningService;
 import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -51,7 +56,6 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
     @Override
     public List<GridOpeningResultDTO> listPageGridOpeningsForExport(Map<String, Object> params) {
         params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
-
         List<GridOpeningResultDTO> list = baseDao.selectListGridHasMaCode(params);
 
         list = fillFieldForGridOpening(list, params);
@@ -277,4 +281,13 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
 
         return result;
     }
+
+    @Override
+    public List<GridOpeningResultDTO> selectListGridHasMaCode(Map<String, Object> params) {
+        params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
+        params.put("category",1);
+        return baseDao.selectListGridHasMaCode(params);
+    }
+
+
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml
index 5a5ab6e28..8c0fcdf01 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml
@@ -47,6 +47,10 @@ spring:
         url: jdbc:mysql://47.104.224.45:3308/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
         username: epdc
         password: elink833066
+      twelve:  #数据源12
+        url: jdbc:mysql://47.104.224.45:3308/esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdc
+        password: elink833066
       initial-size: 10
       max-active: 100
       min-idle: 10
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml
new file mode 100644
index 000000000..0d4fb69c6
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.modules.user.dao.MetaUserGridOpiningDao">
+
+    <resultMap type="com.elink.esua.epdc.modules.user.entity.MetaUserGridOpiningEntity" id="metaUserGridOpiningMap">
+        <result property="id" column="ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="registerCount" column="REGISTER_COUNT"/>
+        <result property="partyCount" column="PARTY_COUNT"/>
+        <result property="residentCount" column="RESIDENT_COUNT"/>
+        <result property="unAuthorizedCount" column="UN_AUTHORIZED_COUNT"/>
+        <result property="newsCount" column="NEWS_COUNT"/>
+        <result property="communityCount" column="COMMUNITY_COUNT"/>
+        <result property="communityMemberCount" column="COMMUNITY_MEMBER_COUNT"/>
+        <result property="communityTopicCount" column="COMMUNITY_TOPIC_COUNT"/>
+        <result property="eventCount" column="EVENT_COUNT"/>
+        <result property="itemCount" column="ITEM_COUNT"/>
+        <result property="itemCloseCount" column="ITEM_CLOSE_COUNT"/>
+        <result property="itemPraiseCount" column="ITEM_PRAISE_COUNT"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="gridLeader" column="GRID_LEADER"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    <select id="pageselectListPage" resultMap="metaUserGridOpiningMap">
+         SELECT
+            *
+        FROM
+            meta_epdc_user_grid_opining op
+        WHERE
+            del_flag = '0'
+        <if test="deptIdList!=null and deptIdList.size()>0">
+            and op.GRID_ID in
+            <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java
new file mode 100644
index 000000000..aa3393b8b
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java
@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.feign;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ *  @author: qushutong
+ *  @Date: 2020/3/25 10:20
+ *  @Description: 用户数据分析
+ */
+public interface UserFeignClint {
+
+    /***
+     * 生成用户分析数据导入临时表
+     * @param
+     * @return void
+     * @author qushutong
+     * @date 2020/3/25 10:19
+     */
+    @GetMapping("analysis/user/tolead")
+    Result createUserAnalysisData();
+}
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
new file mode 100644
index 000000000..43636d315
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
@@ -0,0 +1,19 @@
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.UserFeignClint;
+
+/**
+ *  @author: qushutong
+ *  @Date: 2020/3/25 10:22
+ *  @Description: 用户数据分析
+ */
+public class UserFeignClintFallback implements UserFeignClint {
+
+    @Override
+    public Result createUserAnalysisData() {
+        return  ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "createUserAnalysisData", "");
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobUserService.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobUserService.java
new file mode 100644
index 000000000..b164e52a2
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobUserService.java
@@ -0,0 +1,19 @@
+package com.elink.esua.epdc.service;
+
+/**
+ *  @author: qushutong
+ *  @Date: 2020/3/25 10:18
+ *  @Description: 用户数据分析
+ */
+public interface ScheduleJobUserService {
+
+    /***
+     * 生成用户分析数据导入临时表
+     * @param
+     * @return void
+     * @author qushutong
+     * @date 2020/3/25 10:19
+     */
+    void createUserAnalysisData();
+
+}
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
new file mode 100644
index 000000000..a19d0ef7e
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.service.impl;
+
+import com.elink.esua.epdc.feign.UserFeignClint;
+import com.elink.esua.epdc.service.ScheduleJobUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ *  @author: qushutong
+ *  @Date: 2020/3/25 10:15
+ *  @Description: 用户数据数据分析
+ */
+public class ScheduleJobUserServiceImpl implements ScheduleJobUserService {
+    @Autowired
+    private UserFeignClint userFeignClint;
+
+    @Override
+    public void createUserAnalysisData() {
+        userFeignClint.createUserAnalysisData();
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTask.java
new file mode 100644
index 000000000..69d67479e
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTask.java
@@ -0,0 +1,18 @@
+package com.elink.esua.epdc.task.analysis;
+
+/**
+ *  @author: qushutong
+ *  @Date: 2020/3/25 10:04
+ *  @Description: 用户分析
+ */
+public interface UserAnalysisTask {
+
+    /***
+     * 网格开通情况
+     * @param
+     * @return void
+     * @author qushutong
+     * @date 2020/3/25 10:11
+     */
+    void run();
+}
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTaskImpl.java
new file mode 100644
index 000000000..d3ef918dc
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTaskImpl.java
@@ -0,0 +1,21 @@
+package com.elink.esua.epdc.task.analysis;
+
+import com.elink.esua.epdc.service.ScheduleJobUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ *  @author: qushutong
+ *  @Date: 2020/3/25 10:12
+ *  @Description:
+ */
+@Component("UserAnalysisTask")
+public class UserAnalysisTaskImpl implements UserAnalysisTask {
+    @Autowired
+    private ScheduleJobUserService scheduleJobUserService;
+
+    @Override
+    public void run() {
+        scheduleJobUserService.createUserAnalysisData();
+    }
+}

From 1e6c6cb4eef2eb069e7ae338aebdb1b367fd7cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 25 Mar 2020 18:50:09 +0800
Subject: [PATCH 11/38] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=AA=E6=AD=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MetaUserGridOpiningServiceImpl.java       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
index d2e909e75..99c6a0df2 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
@@ -67,11 +67,15 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
             deptIdList.add(item.getGridId());
         }
         params.put("deptIdList",deptIdList);
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar c = Calendar.getInstance();
-        c.add(Calendar.DATE, -1);
-        Date createdTime = c.getTime();
-        params.put("createdTime",format.format(createdTime));
+        String createdTime = (String) params.get("createdTime");
+        if(StringUtils.isBlank(createdTime)){
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            Calendar c = Calendar.getInstance();
+            c.add(Calendar.DATE, -1);
+            Date time = c.getTime();
+            createdTime = format.format(time);
+            params.put("createdTime",createdTime);
+        }
         List<MetaUserGridOpiningEntity> metaUserGridOpiningEntityList = baseDao.pageselectListPage(params);
         return getPageData(metaUserGridOpiningEntityList,page.getTotal(), MetaUserGridOpiningDTO.class);
     }

From 8ae8f1d8441825ffb1f0712003300df0c8758de3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 25 Mar 2020 18:54:22 +0800
Subject: [PATCH 12/38] =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/user/MetaUserGridOpiningDao.xml  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml
index 0d4fb69c6..a5b6df74c 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml
@@ -40,6 +40,9 @@
                 #{deptId}
             </foreach>
         </if>
+        <if test="createdTime!=null and  createdTime != ''">
+            and op.createdTime like concat('%', #{createdTime}, '%')
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file

From 4d69812ab3a982a962aea618d2febe5752759445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 25 Mar 2020 19:01:36 +0800
Subject: [PATCH 13/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/user/MetaUserGridOpiningDao.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml
index a5b6df74c..19d52d46e 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml
@@ -41,7 +41,7 @@
             </foreach>
         </if>
         <if test="createdTime!=null and  createdTime != ''">
-            and op.createdTime like concat('%', #{createdTime}, '%')
+            and op.CREATED_TIME like concat('%', #{createdTime}, '%')
         </if>
     </select>
 

From 6a6418789a9fe756d245b51e497d0373b05cbde9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 25 Mar 2020 19:36:18 +0800
Subject: [PATCH 14/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/MetaUserGridOpiningEntity.java     | 24 +++++++++----------
 .../user/service/UserAnalysisService.java     |  9 +++++++
 .../impl/MetaUserGridOpiningServiceImpl.java  |  3 ++-
 .../service/impl/UserAnalysisServiceImpl.java | 10 +++++++-
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java
index 305bc8930..fc3d5a41a 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java
@@ -46,62 +46,62 @@ public class MetaUserGridOpiningEntity extends BaseEpdcEntity {
     /**
      * 用户总数
      */
-	private String registerCount;
+	private int registerCount;
 
     /**
      * 党员数
      */
-	private String partyCount;
+	private int partyCount;
 
     /**
      * 已注册居民
      */
-	private String residentCount;
+	private int residentCount;
 
     /**
      * 未注册居民
      */
-	private String unAuthorizedCount;
+	private int unAuthorizedCount;
 
     /**
      * 新闻发布数
      */
-	private String newsCount;
+	private int newsCount;
 
     /**
      * 社群数
      */
-	private String communityCount;
+	private int communityCount;
 
     /**
      * 群成员数
      */
-	private String communityMemberCount;
+	private int communityMemberCount;
 
     /**
      * 群话题数
      */
-	private String communityTopicCount;
+	private int communityTopicCount;
 
     /**
      * 议题总数
      */
-	private String eventCount;
+	private int eventCount;
 
     /**
      * 项目数
      */
-	private String itemCount;
+	private int itemCount;
 
     /**
      * 项目已解决数
      */
-	private String itemCloseCount;
+	private int itemCloseCount;
 
     /**
      * 好评数
      */
-	private String itemPraiseCount;
+	private int itemPraiseCount;
 
     /**
      * 网格名称
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
index 887ad6c02..b55a398fb 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
@@ -101,4 +101,13 @@ public interface UserAnalysisService {
     List<GridOpeningResultDTO> selectListGridHasMaCode(Map<String, Object> params);
 
 
+
+   /***
+    * 获取导入数据
+    * @param params
+    * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+    * @author qushutong
+    * @date 2020/3/25 19:13
+    */
+    List<GridOpeningResultDTO> getToLeadGridOpenings(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/MetaUserGridOpiningServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
index 99c6a0df2..e40107c7c 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
@@ -124,8 +124,9 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
 
 
     @Override
+    @DataSource(name = DataSourceNames.TWELVE)
     public Result createUserAnalysisData() {
-        List<GridOpeningResultDTO> list = userAnalysisService.listPageGridOpeningsForExport(new HashMap<>());
+        List<GridOpeningResultDTO> list = userAnalysisService.getToLeadGridOpenings(new HashMap<>());
         List<MetaUserGridOpiningEntity> metaUserGridOpiningEntities = ConvertUtils.sourceToTarget(list, MetaUserGridOpiningEntity.class);
         boolean b = insertBatch(metaUserGridOpiningEntities);
         return b?new Result<>():new Result().error("录入失败");
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 6ab47fcba..9815dfa21 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
@@ -285,9 +285,17 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
     @Override
     public List<GridOpeningResultDTO> selectListGridHasMaCode(Map<String, Object> params) {
         params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
-        params.put("category",1);
+        params.put("category",YesOrNoEnum.YES.value());
         return baseDao.selectListGridHasMaCode(params);
     }
 
+    @Override
+    public List<GridOpeningResultDTO> getToLeadGridOpenings(Map<String, Object> params) {
+        params.put("category",YesOrNoEnum.YES.value());
+        List<GridOpeningResultDTO> list = baseDao.selectListGridHasMaCode(params);
+        list = fillFieldForGridOpening(list, params);
+        return list;
+    }
+
 
 }

From e3dbc9d3b6f96e3a6c64ff50bb448e03783ecef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Wed, 25 Mar 2020 19:47:54 +0800
Subject: [PATCH 15/38] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E7=AB=AF=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/SysAnalysisMenuDTO.java     | 141 +++++++++++++++
 .../esua/epdc/dto/SysAnalysisRoleMenuDTO.java |  61 +++++++
 .../com/elink/esua/epdc/dto/SysRoleDTO.java   |   5 +
 .../elink/esua/epdc/enums/MenuTableEnum.java  |   6 +-
 .../controller/SysAnalysisMenuController.java | 132 ++++++++++++++
 .../SysAnalysisRoleMenuController.java        |  94 ++++++++++
 .../epdc/controller/SysRoleController.java    |  10 +-
 .../esua/epdc/dao/SysAnalysisMenuDao.java     |  84 +++++++++
 .../esua/epdc/dao/SysAnalysisRoleMenuDao.java |  50 ++++++
 .../epdc/entity/SysAnalysisMenuEntity.java    | 120 +++++++++++++
 .../entity/SysAnalysisRoleMenuEntity.java     |  63 +++++++
 .../esua/epdc/excel/SysAnalysisMenuExcel.java |  83 +++++++++
 .../epdc/excel/SysAnalysisRoleMenuExcel.java  |  50 ++++++
 .../esua/epdc/redis/SysAnalysisMenuRedis.java |  47 +++++
 .../epdc/redis/SysAnalysisRoleMenuRedis.java  |  47 +++++
 .../epdc/service/SysAnalysisMenuService.java  | 125 ++++++++++++++
 .../service/SysAnalysisRoleMenuService.java   | 111 ++++++++++++
 .../impl/SysAnalysisMenuServiceImpl.java      | 162 ++++++++++++++++++
 .../impl/SysAnalysisRoleMenuServiceImpl.java  | 150 ++++++++++++++++
 .../epdc/service/impl/SysRoleServiceImpl.java |   7 +
 .../resources/mapper/SysAnalysisMenuDao.xml   | 132 ++++++++++++++
 .../mapper/SysAnalysisRoleMenuDao.xml         |  21 +++
 22 files changed, 1696 insertions(+), 5 deletions(-)
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisRoleMenuDTO.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysAnalysisMenuController.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysAnalysisRoleMenuController.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysAnalysisMenuDao.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysAnalysisRoleMenuDao.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysAnalysisMenuEntity.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysAnalysisRoleMenuEntity.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysAnalysisMenuExcel.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysAnalysisRoleMenuExcel.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/SysAnalysisMenuRedis.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/SysAnalysisRoleMenuRedis.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysAnalysisMenuService.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysAnalysisRoleMenuService.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisMenuServiceImpl.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisRoleMenuServiceImpl.java
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysAnalysisMenuDao.xml
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysAnalysisRoleMenuDao.xml

diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java
new file mode 100644
index 000000000..c06629052
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java
@@ -0,0 +1,141 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * 菜单管理
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Data
+public class SysAnalysisMenuDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @NotNull(message = "{id.require}", groups = UpdateGroup.class)
+    private Long id;
+
+    /**
+     * 上级ID，一级菜单为0
+     */
+    @NotNull(message = "{sysmenu.pid.require}", groups = DefaultGroup.class)
+    private Long pid;
+
+    /**
+     * 类型   0：菜单   1：按钮
+     */
+    @Range(min = 0, max = 1, message = "{sysmenu.type.range}", groups = DefaultGroup.class)
+    private Integer type;
+
+    /**
+     * 菜单图标
+     */
+    private String icon;
+
+    /**
+     * 样式名称
+     */
+    private String className;
+
+    /**
+     * 排序
+     */
+    @Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
+    private Integer sort;
+
+    /**
+     * 删除标识  0：未删除    1：删除
+     */
+    private Integer delFlag;
+
+    /**
+     * 创建者
+     */
+    private Long creator;
+
+    /**
+     * 创建时间
+     */
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private Date createDate;
+
+    /**
+     * 更新者
+     */
+    private Long updater;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+    /**
+     * 菜单编码
+     */
+    private String menuCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 子模板ID
+     */
+    private String templateId;
+
+    @NotBlank(message = "{sysmenu.name.require}", groups = DefaultGroup.class)
+    private String name;
+
+    /**
+     * 是否显示数字 0否 1是
+     */
+    private String numFlag;
+
+    //虚字段
+
+    /**
+     * 上级菜单名称
+     */
+    private String parentName;
+
+    /**
+     * 模块名称
+     */
+	private String modelname;
+
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisRoleMenuDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisRoleMenuDTO.java
new file mode 100644
index 000000000..b5a712cf9
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisRoleMenuDTO.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 角色菜单关系
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Data
+public class SysAnalysisRoleMenuDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+	private Long id;
+
+    /**
+     * 角色ID
+     */
+	private Long roleId;
+
+    /**
+     * 菜单ID
+     */
+	private Long menuId;
+
+    /**
+     * 创建者
+     */
+	private Long creator;
+
+    /**
+     * 创建时间
+     */
+	private Date createDate;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java
index 74a07bb20..839e9317a 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java
@@ -72,4 +72,9 @@ public class SysRoleDTO implements Serializable {
      * app菜单ID列表
      */
     private List<Long> appMenuIdList;
+
+    /**
+     * 数据端菜单ID列表
+     */
+    private List<Long> analysisMenuIdList;
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/enums/MenuTableEnum.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/enums/MenuTableEnum.java
index 6a1b53042..5874ba30f 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/enums/MenuTableEnum.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/enums/MenuTableEnum.java
@@ -22,7 +22,11 @@ public enum MenuTableEnum {
     /**
      * 非菜单资源
      */
-    APP("sys_app_menu");
+    APP("sys_app_menu"),
+    /**
+     * 领导端资源
+     */
+    ANALYSIS("sys_analysis_menu");
 
     private String value;
 
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysAnalysisMenuController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysAnalysisMenuController.java
new file mode 100644
index 000000000..04ee8c900
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysAnalysisMenuController.java
@@ -0,0 +1,132 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
+import com.elink.esua.epdc.excel.*;
+import com.elink.esua.epdc.service.SysAnalysisMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 菜单管理
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@RestController
+@RequestMapping("analysismenu")
+public class SysAnalysisMenuController {
+    
+    @Autowired
+    private SysAnalysisMenuService sysAnalysisMenuService;
+
+    /**
+     * 获取APP菜单列表
+     *
+     * @param type 菜单类型 0：菜单 1：按钮  null：全部
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.AppMenuDTO>>
+     * @author work@yujt.net.cn
+     * @date 2019/11/19 13:26
+     */
+    @GetMapping("list")
+    public Result<List<AppMenuDTO>> list(Integer type) {
+        List<AppMenuDTO> list = sysAnalysisMenuService.getAnalysisMenuList(type);
+        return new Result<List<AppMenuDTO>>().ok(list);
+    }
+
+    @GetMapping("page")
+    public Result<PageData<SysAnalysisMenuDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<SysAnalysisMenuDTO> page = sysAnalysisMenuService.page(params);
+        return new Result<PageData<SysAnalysisMenuDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<SysAnalysisMenuDTO> get(@PathVariable("id") String id){
+        SysAnalysisMenuDTO data = sysAnalysisMenuService.get(id);
+        return new Result<SysAnalysisMenuDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody SysAnalysisMenuDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        sysAnalysisMenuService.save(dto);
+        return new Result();
+    }
+    @GetMapping("select")
+    public Result<List<AppMenuDTO>> select(UserDetail userDetail) {
+        List<AppMenuDTO> list = sysAnalysisMenuService.getUserMenuList(userDetail, null);
+
+        return new Result<List<AppMenuDTO>>().ok(list);
+    }
+
+    @PutMapping
+    public Result update(@RequestBody SysAnalysisMenuDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        sysAnalysisMenuService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping("{id}")
+    public Result delete(@PathVariable("id") Long id){
+        //效验数据
+        AssertUtils.isNull(id, "id");
+        //判断是否有子菜单或按钮
+        if(sysAnalysisMenuService.hasChileMenu(id)){
+            return new Result().error(ErrorCode.SUB_MENU_EXIST);
+        }
+        sysAnalysisMenuService.delete(id);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<SysAnalysisMenuDTO> list = sysAnalysisMenuService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, SysAnalysisMenuExcel.class);
+    }
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO>>
+     * @Author lpf
+     * @Description 首页面板 获取数据端APP菜单
+     * @Date 2020/03/18 10:42
+     **/
+    @GetMapping("/analysisIndexPanel/{userId}")
+    public Result<List<EpdcAppChildNavResultDTO>> analysisIndexPanel(@PathVariable("userId") String userId) {
+        return sysAnalysisMenuService.getAnalysisIndexPanel(userId);
+    }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysAnalysisRoleMenuController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysAnalysisRoleMenuController.java
new file mode 100644
index 000000000..65deebc6d
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysAnalysisRoleMenuController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.excel.*;
+import com.elink.esua.epdc.service.SysAnalysisRoleMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 角色菜单关系
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@RestController
+@RequestMapping("analysisrolemenu")
+public class SysAnalysisRoleMenuController {
+    
+    @Autowired
+    private SysAnalysisRoleMenuService sysAnalysisRoleMenuService;
+
+    @GetMapping("page")
+    public Result<PageData<SysAnalysisRoleMenuDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<SysAnalysisRoleMenuDTO> page = sysAnalysisRoleMenuService.page(params);
+        return new Result<PageData<SysAnalysisRoleMenuDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<SysAnalysisRoleMenuDTO> get(@PathVariable("id") String id){
+        SysAnalysisRoleMenuDTO data = sysAnalysisRoleMenuService.get(id);
+        return new Result<SysAnalysisRoleMenuDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody SysAnalysisRoleMenuDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        sysAnalysisRoleMenuService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody SysAnalysisRoleMenuDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        sysAnalysisRoleMenuService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        sysAnalysisRoleMenuService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<SysAnalysisRoleMenuDTO> list = sysAnalysisRoleMenuService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, SysAnalysisRoleMenuExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java
index b9eab566e..c284327b8 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java
@@ -18,10 +18,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.SysRoleDTO;
-import com.elink.esua.epdc.service.AppRoleMenuService;
-import com.elink.esua.epdc.service.SysRoleDataScopeService;
-import com.elink.esua.epdc.service.SysRoleMenuService;
-import com.elink.esua.epdc.service.SysRoleService;
+import com.elink.esua.epdc.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -52,6 +49,8 @@ public class SysRoleController {
     private SysRoleDataScopeService sysRoleDataScopeService;
     @Autowired
     private AppRoleMenuService appRoleMenuService;
+     @Autowired
+     private SysAnalysisRoleMenuService sysAnalysisRoleMenuService;
 
     @GetMapping("page")
     @ApiOperation("分页")
@@ -92,6 +91,9 @@ public class SysRoleController {
         //查询角色对应app菜单权限
         List<Long> appMenuIdList = appRoleMenuService.getAppMenuIdList(id);
         data.setAppMenuIdList(appMenuIdList);
+        //查询角色对应数据端菜单权限
+        List<Long> analysisMenuIdList = sysAnalysisRoleMenuService.getAnalysisMenuIdList(id);
+        data.setAnalysisMenuIdList(analysisMenuIdList);
         return new Result<SysRoleDTO>().ok(data);
     }
 
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysAnalysisMenuDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysAnalysisMenuDao.java
new file mode 100644
index 000000000..e0c83b877
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysAnalysisMenuDao.java
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.AppMenuDTO;
+import com.elink.esua.epdc.dto.SysAnalysisMenuDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
+import com.elink.esua.epdc.entity.AppMenuEntity;
+import com.elink.esua.epdc.entity.SysAnalysisMenuEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 菜单管理
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Mapper
+public interface SysAnalysisMenuDao extends BaseDao<SysAnalysisMenuEntity> {
+
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO>>
+     * @Author lpf
+     * @Description 首页面板 获取数据端APP菜单
+     * @Date 2020/03/18 10:42
+     **/
+    List<EpdcAppChildNavResultDTO> getAnalysisIndexPanel(String userId);
+
+    /**
+     * 获取菜单详细信息
+     * @param id
+     * @return
+     */
+    SysAnalysisMenuDTO selectByIdDIY(@Param("id") String id, @Param("language") String language);
+
+    /**
+     * 查询所有菜单列表
+     *
+     * @param type     菜单类型
+     * @param language 语言
+     */
+    List<AppMenuEntity> getMenuList(@Param("type") Integer type, @Param("language") String language);
+
+    /**
+     * 查询用户菜单列表
+     *
+     * @param userId   用户ＩＤ
+     * @param type     菜单类型
+     * @param language 语言
+     */
+    List<AppMenuEntity> getUserMenuList(@Param("userId") Long userId, @Param("type") Integer type, @Param("language") String language);
+
+    /**
+     * 获取app菜单列表
+     *
+     * @param type     菜单类型
+     * @param language 语言
+     * @return java.util.List<com.elink.esua.epdc.dto.AppMenuDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/11/19 13:43
+     */
+    List<AppMenuDTO> selectListAppMenu(@Param("type") Integer type, @Param("language") String language);
+	
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysAnalysisRoleMenuDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysAnalysisRoleMenuDao.java
new file mode 100644
index 000000000..e817fc77f
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysAnalysisRoleMenuDao.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.entity.SysAnalysisRoleMenuEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 角色菜单关系
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Mapper
+public interface SysAnalysisRoleMenuDao extends BaseDao<SysAnalysisRoleMenuEntity> {
+
+    /**
+     * 根据角色id，删除角色数据权限关系
+     *
+     * @param roleId 角色id
+     */
+    void deleteByRoleId(Long roleId);
+
+    /**
+     * 根据角色ID，获取菜单ID列表
+     *
+     * @param id
+     * @return
+     */
+    List<Long> getAnalysisMenuIdList(Long id);
+	
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysAnalysisMenuEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysAnalysisMenuEntity.java
new file mode 100644
index 000000000..ac45ced4b
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysAnalysisMenuEntity.java
@@ -0,0 +1,120 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 菜单管理
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_analysis_menu")
+public class SysAnalysisMenuEntity extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	 * 上级ID，一级菜单为0
+	 */
+	private Long pid;
+
+	/**
+	 * 菜单名称
+	 */
+	@TableField(exist = false)
+	private String name;
+
+	/**
+	 * 类型   0：菜单   1：按钮
+	 */
+	private Integer type;
+
+	/**
+	 * 菜单图标
+	 */
+	private String icon;
+
+	/**
+	 * 样式名称
+	 */
+	private String className;
+
+	/**
+	 * 排序
+	 */
+	private Integer sort;
+
+	/**
+	 * 删除标识  0：未删除    1：删除
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Integer delFlag;
+
+	/**
+	 * 更新者
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Long updater;
+
+	/**
+	 * 更新时间
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Date updateDate;
+
+	/**
+	 * 上级菜单名称
+	 */
+	@TableField(exist = false)
+	private String parentName;
+
+	/**
+	 * 菜单编码
+	 */
+	private String menuCode;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	/**
+	 * 子模板ID
+	 */
+	private String templateId;
+
+	/**
+	 * 是否显示数字 0否 1是
+	 */
+	private String numFlag;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysAnalysisRoleMenuEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysAnalysisRoleMenuEntity.java
new file mode 100644
index 000000000..0b05aaa73
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysAnalysisRoleMenuEntity.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 角色菜单关系
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_analysis_role_menu")
+public class SysAnalysisRoleMenuEntity extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 角色ID
+     */
+	private Long roleId;
+
+    /**
+     * 菜单ID
+     */
+	private Long menuId;
+
+    /**
+     * 创建者
+     */
+	private Long creator;
+
+    /**
+     * 创建时间
+     */
+	private Date createDate;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysAnalysisMenuExcel.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysAnalysisMenuExcel.java
new file mode 100644
index 000000000..9e2c7baa4
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysAnalysisMenuExcel.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 菜单管理
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Data
+public class SysAnalysisMenuExcel {
+
+    @Excel(name = "id")
+    private Long id;
+
+    @Excel(name = "上级ID，一级菜单为0")
+    private Long pid;
+
+    @Excel(name = "类型   0：菜单   1：按钮")
+    private Integer type;
+
+    @Excel(name = "模块名称")
+    private String modelname;
+
+    @Excel(name = "菜单图标")
+    private String icon;
+
+    @Excel(name = "样式名称")
+    private String className;
+
+    @Excel(name = "菜单编码（议题管理-待回应：10001，议题管理-待处理：10002，项目管理-待处理：10003，用户管理-待认证居民：10004，消息：10005）")
+    private String menuCode;
+
+    @Excel(name = "模板ID")
+    private String templateId;
+
+    @Excel(name = "是否显示数字 0否 1是")
+    private String numFlag;
+
+    @Excel(name = "排序")
+    private Integer sort;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    @Excel(name = "删除标识  0：未删除    1：删除")
+    private Integer delFlag;
+
+    @Excel(name = "创建者")
+    private Long creator;
+
+    @Excel(name = "创建时间")
+    private Date createDate;
+
+    @Excel(name = "更新者")
+    private Long updater;
+
+    @Excel(name = "更新时间")
+    private Date updateDate;
+
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysAnalysisRoleMenuExcel.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysAnalysisRoleMenuExcel.java
new file mode 100644
index 000000000..629ac017f
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysAnalysisRoleMenuExcel.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 角色菜单关系
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Data
+public class SysAnalysisRoleMenuExcel {
+
+    @Excel(name = "id")
+    private Long id;
+
+    @Excel(name = "角色ID")
+    private Long roleId;
+
+    @Excel(name = "菜单ID")
+    private Long menuId;
+
+    @Excel(name = "创建者")
+    private Long creator;
+
+    @Excel(name = "创建时间")
+    private Date createDate;
+
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/SysAnalysisMenuRedis.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/SysAnalysisMenuRedis.java
new file mode 100644
index 000000000..3349f7c1b
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/SysAnalysisMenuRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 菜单管理
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Component
+public class SysAnalysisMenuRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/SysAnalysisRoleMenuRedis.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/SysAnalysisRoleMenuRedis.java
new file mode 100644
index 000000000..f660239da
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/SysAnalysisRoleMenuRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 角色菜单关系
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Component
+public class SysAnalysisRoleMenuRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysAnalysisMenuService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysAnalysisMenuService.java
new file mode 100644
index 000000000..a59c4e775
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysAnalysisMenuService.java
@@ -0,0 +1,125 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
+import com.elink.esua.epdc.entity.SysAnalysisMenuEntity;
+import com.elink.esua.epdc.dto.*;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 菜单管理
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+public interface SysAnalysisMenuService extends BaseService<SysAnalysisMenuEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<SysAnalysisMenuDTO>
+     * @author generator
+     * @date 2020-03-25
+     */
+    PageData<SysAnalysisMenuDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<SysAnalysisMenuDTO>
+     * @author generator
+     * @date 2020-03-25
+     */
+    List<SysAnalysisMenuDTO> list(Map<String, Object> params);
+
+    /**
+     * 判断是否有子级菜单
+     *
+     * @param id 菜单ID
+     * @return boolean
+     * @author work@yujt.net.cn
+     * @date 2019/11/19 14:30
+     */
+    boolean hasChileMenu(Long id);
+
+    List<AppMenuDTO> getAnalysisMenuList(Integer type);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return SysAnalysisMenuDTO
+     * @author generator
+     * @date 2020-03-25
+     */
+    SysAnalysisMenuDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-25
+     */
+    void save(SysAnalysisMenuDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-25
+     */
+    void update(SysAnalysisMenuDTO dto);
+
+    /**
+     * 用户app端菜单列表
+     *
+     * @param userDetail 用户信息
+     * @param type       菜单类型
+     */
+    List<AppMenuDTO> getUserMenuList(UserDetail userDetail, Integer type);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-03-25
+     */
+    void delete(Long id);
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO>>
+     * @Author lpf
+     * @Description 首页面板 获取数据端APP菜单
+     * @Date 2020/03/18 10:42
+     **/
+    Result<List<EpdcAppChildNavResultDTO>> getAnalysisIndexPanel(String userId);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysAnalysisRoleMenuService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysAnalysisRoleMenuService.java
new file mode 100644
index 000000000..9ccfd8c74
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysAnalysisRoleMenuService.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.entity.SysAnalysisRoleMenuEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 角色菜单关系
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+public interface SysAnalysisRoleMenuService extends BaseService<SysAnalysisRoleMenuEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<SysAnalysisRoleMenuDTO>
+     * @author generator
+     * @date 2020-03-25
+     */
+    PageData<SysAnalysisRoleMenuDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<SysAnalysisRoleMenuDTO>
+     * @author generator
+     * @date 2020-03-25
+     */
+    List<SysAnalysisRoleMenuDTO> list(Map<String, Object> params);
+
+    /**
+     * 保存或修改
+     *
+     * @param roleId        角色ID
+     * @param analysisMenuIdList 菜单ID列表
+     */
+    void saveOrUpdate(Long roleId, List<Long> analysisMenuIdList);
+
+    /**
+     * 根据角色id，删除角色数据权限关系
+     *
+     * @param roleId 角色id
+     */
+    void deleteByRoleId(Long roleId);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return SysAnalysisRoleMenuDTO
+     * @author generator
+     * @date 2020-03-25
+     */
+    SysAnalysisRoleMenuDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-25
+     */
+    void save(SysAnalysisRoleMenuDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-25
+     */
+    void update(SysAnalysisRoleMenuDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-03-25
+     */
+    void delete(String[] ids);
+    List<Long> getAnalysisMenuIdList(Long id);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisMenuServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisMenuServiceImpl.java
new file mode 100644
index 000000000..a4db1690f
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisMenuServiceImpl.java
@@ -0,0 +1,162 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.HttpContextUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
+import com.elink.esua.epdc.dao.SysAnalysisMenuDao;
+import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
+import com.elink.esua.epdc.entity.AppMenuEntity;
+import com.elink.esua.epdc.entity.SysAnalysisMenuEntity;
+import com.elink.esua.epdc.enums.MenuTableEnum;
+import com.elink.esua.epdc.redis.SysAnalysisMenuRedis;
+import com.elink.esua.epdc.service.SysAnalysisMenuService;
+import com.elink.esua.epdc.service.SysLanguageService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 菜单管理
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Service
+public class SysAnalysisMenuServiceImpl extends BaseServiceImpl<SysAnalysisMenuDao, SysAnalysisMenuEntity> implements SysAnalysisMenuService {
+
+    @Autowired
+    private SysAnalysisMenuRedis sysAnalysisMenuRedis;
+    @Autowired
+    private SysLanguageService sysLanguageService;
+
+    @Override
+    public PageData<SysAnalysisMenuDTO> page(Map<String, Object> params) {
+        IPage<SysAnalysisMenuEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, SysAnalysisMenuDTO.class);
+    }
+
+    @Override
+    public List<SysAnalysisMenuDTO> list(Map<String, Object> params) {
+        List<SysAnalysisMenuEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, SysAnalysisMenuDTO.class);
+    }
+
+    private QueryWrapper<SysAnalysisMenuEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<SysAnalysisMenuEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+    @Override
+    public List<AppMenuDTO> getAnalysisMenuList(Integer type) {
+        List<AppMenuDTO> menuList = baseDao.selectListAppMenu(type, HttpContextUtils.getLanguage());
+        return TreeUtils.build(menuList, Constant.MENU_ROOT);
+    }
+
+    @Override
+    public SysAnalysisMenuDTO get(String id) {
+        SysAnalysisMenuDTO dto = baseDao.selectByIdDIY(id,HttpContextUtils.getLanguage());
+        return dto;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(SysAnalysisMenuDTO dto) {
+        SysAnalysisMenuEntity entity = ConvertUtils.sourceToTarget(dto, SysAnalysisMenuEntity.class);
+        insert(entity);
+        sysLanguageService.saveOrUpdate(MenuTableEnum.ANALYSIS.value(), entity.getId(), "name", dto.getName(), HttpContextUtils.getLanguage());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(SysAnalysisMenuDTO dto) {
+        SysAnalysisMenuEntity entity = ConvertUtils.sourceToTarget(dto, SysAnalysisMenuEntity.class);
+        updateById(entity);
+        sysLanguageService.saveOrUpdate(MenuTableEnum.ANALYSIS.value(), entity.getId(), "name", dto.getName(), HttpContextUtils.getLanguage());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long id) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteById(id);
+    }
+    @Override
+    public boolean hasChileMenu(Long id) {
+        QueryWrapper<SysAnalysisMenuEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("pid", id)
+                .eq(FieldConstant.DEL_FLAG, DelFlagEnum.NORMAL.value());
+        Integer selectCount = baseDao.selectCount(wrapper);
+        return selectCount > NumConstant.ZERO;
+    }
+    /**
+     * 用户app端菜单列表
+     *
+     * @param userDetail 用户信息
+     * @param type       菜单类型
+     */
+    @Override
+    public List<AppMenuDTO> getUserMenuList(UserDetail userDetail, Integer type) {
+        List<AppMenuEntity> menuList;
+
+        //系统管理员，拥有最高权限
+        if (userDetail.getSuperAdmin() == SuperAdminEnum.YES.value()) {
+            menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage());
+        } else {
+            menuList = baseDao.getUserMenuList(userDetail.getId(), type, HttpContextUtils.getLanguage());
+        }
+
+        List<AppMenuDTO> dtoList = ConvertUtils.sourceToTarget(menuList, AppMenuDTO.class);
+
+        return TreeUtils.build(dtoList);
+    }
+    @Override
+    public Result<List<EpdcAppChildNavResultDTO>> getAnalysisIndexPanel(String userId) {
+        if (StringUtils.isBlank(userId)) {
+            return new Result().error("用户Id不能为空");
+        }
+        List<EpdcAppChildNavResultDTO> list = this.baseDao.getAnalysisIndexPanel(userId);
+        return new Result().ok(list);
+    }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisRoleMenuServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisRoleMenuServiceImpl.java
new file mode 100644
index 000000000..81737ec1c
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysAnalysisRoleMenuServiceImpl.java
@@ -0,0 +1,150 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.dao.SysAnalysisRoleMenuDao;
+import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.entity.SysAnalysisRoleMenuEntity;
+import com.elink.esua.epdc.redis.SysAnalysisRoleMenuRedis;
+import com.elink.esua.epdc.service.SysAnalysisRoleMenuService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 角色菜单关系
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Service
+public class SysAnalysisRoleMenuServiceImpl extends BaseServiceImpl<SysAnalysisRoleMenuDao, SysAnalysisRoleMenuEntity> implements SysAnalysisRoleMenuService {
+
+    @Autowired
+    private SysAnalysisRoleMenuRedis sysAnalysisRoleMenuRedis;
+
+    @Override
+    public PageData<SysAnalysisRoleMenuDTO> page(Map<String, Object> params) {
+        IPage<SysAnalysisRoleMenuEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, SysAnalysisRoleMenuDTO.class);
+    }
+
+    @Override
+    public List<SysAnalysisRoleMenuDTO> list(Map<String, Object> params) {
+        List<SysAnalysisRoleMenuEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, SysAnalysisRoleMenuDTO.class);
+    }
+
+    private QueryWrapper<SysAnalysisRoleMenuEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<SysAnalysisRoleMenuEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+    /**
+     * 保存或修改
+     *
+     * @param roleId        角色ID
+     * @param appMenuIdList 菜单ID列表
+     */
+    @Override
+    public void saveOrUpdate(Long roleId, List<Long> analysisMenuIdList) {
+        //先删除角色菜单权限关系
+        deleteByRoleId(roleId);
+
+        //角色没有一个菜单权限的情况
+        if (CollUtil.isEmpty(analysisMenuIdList)) {
+            return;
+        }
+
+        //保存角色菜单权限关系
+        for (Long menuId : analysisMenuIdList) {
+            SysAnalysisRoleMenuEntity appRoleMenuEntity = new SysAnalysisRoleMenuEntity();
+            appRoleMenuEntity.setMenuId(menuId);
+            appRoleMenuEntity.setRoleId(roleId);
+
+            //保存
+            insert(appRoleMenuEntity);
+        }
+    }
+    /**
+     * 根据角色id，删除角色数据权限关系
+     *
+     * @param roleId 角色id
+     */
+    @Override
+    public void deleteByRoleId(Long roleId) {
+        baseDao.deleteByRoleId(roleId);
+    }
+
+    @Override
+    public SysAnalysisRoleMenuDTO get(String id) {
+        SysAnalysisRoleMenuEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, SysAnalysisRoleMenuDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(SysAnalysisRoleMenuDTO dto) {
+        SysAnalysisRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, SysAnalysisRoleMenuEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(SysAnalysisRoleMenuDTO dto) {
+        SysAnalysisRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, SysAnalysisRoleMenuEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+    /**
+     * 根据角色ID，获取菜单ID列表
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public List<Long> getAnalysisMenuIdList(Long id) {
+        return baseDao.getAnalysisMenuIdList(id);
+    }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
index cb1e6613c..622aee764 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
@@ -54,6 +54,8 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
     private SysDeptService sysDeptService;
     @Autowired
     private AppRoleMenuService appRoleMenuService;
+    @Autowired
+    private SysAnalysisRoleMenuService sysAnalysisRoleMenuService;
 
     @Override
     public PageData<SysRoleDTO> page(Map<String, Object> params) {
@@ -121,6 +123,9 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
         //保存角色与app菜单关系
         appRoleMenuService.saveOrUpdate(entity.getId(), dto.getAppMenuIdList());
 
+//        //更新角色与数据端菜单关系
+//        sysAnalysisRoleMenuService.saveOrUpdate(entity.getId(), dto.getAnalysisMenuIdList());
+
     }
 
     /**
@@ -175,6 +180,8 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
 
         //更新角色与app菜单关系
         appRoleMenuService.saveOrUpdate(entity.getId(), dto.getAppMenuIdList());
+        //更新角色与数据端菜单关系
+        sysAnalysisRoleMenuService.saveOrUpdate(entity.getId(), dto.getAnalysisMenuIdList());
 
     }
 
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysAnalysisMenuDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysAnalysisMenuDao.xml
new file mode 100644
index 000000000..649e12cdf
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysAnalysisMenuDao.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.dao.SysAnalysisMenuDao">
+
+    <resultMap type="com.elink.esua.epdc.entity.SysAnalysisMenuEntity" id="sysAnalysisMenuMap">
+        <result property="id" column="id"/>
+        <result property="pid" column="pid"/>
+        <result property="type" column="type"/>
+        <result property="modelname" column="modelName"/>
+        <result property="icon" column="icon"/>
+        <result property="className" column="class_name"/>
+        <result property="menuCode" column="menu_code"/>
+        <result property="templateId" column="template_id"/>
+        <result property="numFlag" column="num_flag"/>
+        <result property="sort" column="sort"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="creator" column="creator"/>
+        <result property="createDate" column="create_date"/>
+        <result property="updater" column="updater"/>
+        <result property="updateDate" column="update_date"/>
+    </resultMap>
+
+    <select id="selectListAppMenu" resultType="com.elink.esua.epdc.dto.AppMenuDTO">
+        SELECT
+        m.*,
+        l.field_value AS `NAME`
+        FROM
+        sys_analysis_menu m
+        LEFT JOIN sys_language l ON m.id = l.table_id AND l.table_name = 'sys_analysis_menu' AND l.field_name = 'name' AND l.LANGUAGE = #{language}
+        WHERE m.del_flag = 0
+        <if test="type != null">AND m.type = #{type}</if>
+        ORDER BY m.sort ASC
+    </select>
+    <select id="selectByIdDIY" resultType="com.elink.esua.epdc.dto.SysAnalysisMenuDTO">
+        SELECT
+          m.*,
+          l.field_value AS `NAME`,
+          ll.field_value as parentName
+        FROM
+          sys_analysis_menu m
+        LEFT JOIN sys_language ll ON m.pid = ll.table_id
+        LEFT JOIN sys_language l ON m.id = l.table_id AND l.table_name = 'sys_analysis_menu' AND l.field_name = 'name' AND l.LANGUAGE = #{language}
+        WHERE m.del_flag = 0
+        AND m.id = #{id}
+    </select>
+    <select id="getMenuList" resultType="com.elink.esua.epdc.entity.AppMenuEntity">
+        select t1.*, (
+        SELECT
+        lang.field_value
+        FROM
+        sys_language lang
+        WHERE
+        lang.table_name = 'sys_analysis_menu'
+        AND lang.field_name = 'name'
+        AND lang.table_id = t1.id
+        AND lang.LANGUAGE = #{language}
+        ) as name
+        from sys_analysis_menu t1
+        where t1.del_flag = 0
+        <if test="type != null">
+            and t1.type = #{type}
+        </if>
+        order by t1.sort asc
+    </select>
+
+    <select id="getUserMenuList" resultType="com.elink.esua.epdc.entity.AppMenuEntity">
+        select t3.*,(
+        SELECT
+        lang.field_value
+        FROM
+        sys_language lang
+        WHERE
+        lang.table_name = 'sys_analysis_menu'
+        AND lang.field_name = 'name'
+        AND lang.table_id = t3.id
+        AND lang.LANGUAGE = #{language}
+        ) as name
+        from sys_role_user t1
+        left join sys_analysis_role_menu t2 on t1.role_id = t2.role_id
+        left join sys_analysis_menu t3 on t2.menu_id = t3.id
+        where t1.user_id = #{userId} and t3.del_flag = 0
+        <if test="type != null">
+            and t3.type = #{type}
+        </if>
+        order by t3.sort asc
+    </select>
+
+    <resultMap id="AnalysisIndexPanelResultDTOMap" type="com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO">
+        <id column="label" property="label"/>
+        <result column="navCode" property="navCode"/>
+        <result column="remark" property="remark"/>
+        <result column="icon" property="icon"/>
+        <result column="className" property="className"/>
+        <result column="numFlag" property="numFlag"/>
+    </resultMap>
+
+    <select id="getAnalysisIndexPanel" resultMap="AnalysisIndexPanelResultDTOMap">
+         SELECT
+            lc.field_value AS label,
+            mc.menu_code AS navCode,
+            mc.remark,
+            mc.class_name AS className,
+            mc.icon,
+			mc.num_flag as numFlag
+        FROM
+            sys_analysis_menu mp
+            LEFT JOIN sys_language lp ON lp.table_id = mp.id
+            LEFT JOIN sys_analysis_menu mc ON mp.id = mc.pid
+            LEFT JOIN sys_language lc ON lc.table_id = mc.id
+        WHERE
+            mc.id IN (
+        SELECT
+            m.id meauId
+        FROM
+            sys_user u
+            LEFT JOIN sys_role_user ru ON ru.user_id = u.id
+            LEFT JOIN sys_analysis_role_menu am ON am.role_id = ru.role_id
+            LEFT JOIN sys_analysis_menu m ON am.menu_id = m.id  and m.del_flag = 0
+			LEFT JOIN sys_analysis_menu m1 ON m1.id = m.pid and m1.del_flag = 0
+        WHERE
+			u.id =#{userId}
+			and u.del_flag = 0
+            and am.menu_id IS NOT NULL
+            AND m.pid != 0
+			and m1.menu_code = 10010
+            )order by mp.sort asc,mc.sort asc
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysAnalysisRoleMenuDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysAnalysisRoleMenuDao.xml
new file mode 100644
index 000000000..e06a1bea3
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysAnalysisRoleMenuDao.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.dao.SysAnalysisRoleMenuDao">
+
+    <resultMap type="com.elink.esua.epdc.entity.SysAnalysisRoleMenuEntity" id="sysAnalysisRoleMenuMap">
+        <result property="id" column="id"/>
+        <result property="roleId" column="role_id"/>
+        <result property="menuId" column="menu_id"/>
+        <result property="creator" column="creator"/>
+        <result property="createDate" column="create_date"/>
+    </resultMap>
+    <delete id="deleteByRoleId">
+        delete from sys_analysis_role_menu where role_id = #{value}
+    </delete>
+
+    <select id="getAnalysisMenuIdList" resultType="long">
+        select menu_id from sys_analysis_role_menu where role_id = #{value}
+    </select>
+
+</mapper>
\ No newline at end of file

From 7f54c0c9b0934ee3e5c279e2403c40cc4dce857c Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Thu, 26 Mar 2020 09:43:05 +0800
Subject: [PATCH 16/38] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/controller/PartyMembersController.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
index 67ef6c2ac..3f864a4e8 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
@@ -112,7 +112,7 @@ public class PartyMembersController {
     public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
-        return  partyMembersService.delete(ids);
+        return partyMembersService.delete(ids);
     }
 
     @GetMapping("export")
@@ -166,7 +166,7 @@ public class PartyMembersController {
     /***
      * 已认证党员优化
      * @param params
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.PartyMembersDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.PartyMembersDTO>>
      * @author qushutong
      * @date 2020/3/19 13:34
      */

From e6bd6eb3d5a03a78f707bef1e5f11da65b4526e2 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, 26 Mar 2020 10:15:52 +0800
Subject: [PATCH 17/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=80=E9=80=9A=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/commons/tools/utils/DateUtils.java   | 26 +++++++++++++++++++
 .../epdc/dto/user/MetaUserGridOpiningDTO.java | 26 +++++++++----------
 .../entity/MetaUserGridOpiningEntity.java     |  2 +-
 .../impl/MetaUserGridOpiningServiceImpl.java  | 16 +++++++-----
 4 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java
index 0de5d2834..bff6daf43 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java
@@ -14,9 +14,11 @@ import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 /**
  * 日期处理工具类
@@ -185,4 +187,28 @@ public class DateUtils {
         DateTime dateTime = new DateTime(date);
         return dateTime.plusYears(years).toDate();
     }
+
+    /***
+     * 前端上传信息解析
+     * @param oldDate
+     * @return java.lang.String
+     * @author qushutong
+     * @date 2020/3/26 10:09
+     */
+    public static String dealDateFormat(String oldDate) {
+        Date date1 = null;
+        DateFormat df2 = null;
+        try {
+            oldDate= oldDate.replace("Z", " UTC");
+            DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS Z");
+            Date date = df.parse(oldDate);
+            SimpleDateFormat df1 = new SimpleDateFormat ("EEE MMM dd HH:mm:ss Z yyyy", Locale.UK);
+            date1 = df1.parse(date.toString());
+            df2 = new SimpleDateFormat("yyyy-MM-dd");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return df2.format(date1);
+    }
+
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
index 7bf3ea654..04b6e468d 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
@@ -41,67 +41,67 @@ public class MetaUserGridOpiningDTO implements Serializable {
     /**
      * 网格id
      */
-	private Long gridId;
+	private String gridId;
 
     /**
      * 用户总数
      */
-	private String registerCount;
+	private int registerCount;
 
     /**
      * 党员数
      */
-	private String partyCount;
+	private int partyCount;
 
     /**
      * 已注册居民
      */
-	private String residentCount;
+	private int residentCount;
 
     /**
      * 未注册居民
      */
-	private String unAuthorizedCount;
+	private int unAuthorizedCount;
 
     /**
      * 新闻发布数
      */
-	private String newsCount;
+	private int newsCount;
 
     /**
      * 社群数
      */
-	private String communityCount;
+	private int communityCount;
 
     /**
      * 群成员数
      */
-	private String communityMemberCount;
+	private int communityMemberCount;
 
     /**
      * 群话题数
      */
-	private String communityTopicCount;
+	private int communityTopicCount;
 
     /**
      * 议题总数
      */
-	private String eventCount;
+	private int eventCount;
 
     /**
      * 项目数
      */
-	private String itemCount;
+	private int itemCount;
 
     /**
      * 项目已解决数
      */
-	private String itemCloseCount;
+	private int itemCloseCount;
 
     /**
      * 好评数
      */
-	private String itemPraiseCount;
+	private int itemPraiseCount;
 
     /**
      * 网格名称
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java
index fc3d5a41a..40dc437bd 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java
@@ -41,7 +41,7 @@ public class MetaUserGridOpiningEntity extends BaseEpdcEntity {
     /**
      * 网格id
      */
-	private Long gridId;
+	private String gridId;
 
     /**
      * 用户总数
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
index e40107c7c..a8e0dbba3 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
@@ -24,6 +24,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.datasources.DataSourceNames;
@@ -39,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -66,14 +68,14 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
         for(GridOpeningResultDTO item:gridOpeningResultDTOS){
             deptIdList.add(item.getGridId());
         }
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         params.put("deptIdList",deptIdList);
-        String createdTime = (String) params.get("createdTime");
-        if(StringUtils.isBlank(createdTime)){
-            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-            Calendar c = Calendar.getInstance();
-            c.add(Calendar.DATE, -1);
-            Date time = c.getTime();
-            createdTime = format.format(time);
+        String time = (String) params.get("createdTime");
+        if(StringUtils.isBlank(time)){
+            String createdTime = format.format(new Date());
+            params.put("createdTime",createdTime);
+        }else {
+            String createdTime = DateUtils.dealDateFormat(time);
             params.put("createdTime",createdTime);
         }
         List<MetaUserGridOpiningEntity> metaUserGridOpiningEntityList = baseDao.pageselectListPage(params);

From 124cd5fef544b0d7b50840678f32cfac4184bcb7 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, 26 Mar 2020 10:28:10 +0800
Subject: [PATCH 18/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java    | 2 +-
 .../epdc/modules/user/entity/MetaUserGridOpiningEntity.java     | 2 +-
 .../src/main/resources/mapper/user/MetaUserGridOpiningDao.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
index 04b6e468d..c3b3d3769 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
@@ -106,7 +106,7 @@ public class MetaUserGridOpiningDTO implements Serializable {
     /**
      * 网格名称
      */
-	private String allDeptNames;
+	private String allDeptName;
 
     /**
      * 网格党建指导员姓名
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java
index 40dc437bd..cda46a4a2 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java
@@ -106,7 +106,7 @@ public class MetaUserGridOpiningEntity extends BaseEpdcEntity {
     /**
      * 网格名称
      */
-	private String allDeptNames;
+	private String allDeptName;
 
     /**
      * 网格党建指导员姓名
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml
index 19d52d46e..363aff585 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserGridOpiningDao.xml
@@ -18,7 +18,7 @@
         <result property="itemCount" column="ITEM_COUNT"/>
         <result property="itemCloseCount" column="ITEM_CLOSE_COUNT"/>
         <result property="itemPraiseCount" column="ITEM_PRAISE_COUNT"/>
-        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="allDeptName" column="ALL_DEPT_NAME"/>
         <result property="gridLeader" column="GRID_LEADER"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>

From 1ee289ee05fcb1b2bf4a05e70cfb2a334d6686d5 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, 26 Mar 2020 14:41:25 +0800
Subject: [PATCH 19/38] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E5=AF=BC=E5=85=A5=E5=85=83=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/user/MetaUserRegisterRankDTO.java     | 137 ++++++++++++++++++
 .../MetaUserRegisterRankController.java       | 104 +++++++++++++
 .../user/dao/MetaUserRegisterRankDao.java     |  33 +++++
 .../entity/MetaUserRegisterRankEntity.java    | 107 ++++++++++++++
 .../user/excel/MetaUserGridOpiningExcel.java  |  35 ++---
 .../user/excel/MetaUserRegisterRankExcel.java |  96 ++++++++++++
 .../service/MetaUserRegisterRankService.java  | 105 ++++++++++++++
 .../user/service/UserAnalysisService.java     |   9 ++
 .../impl/MetaUserRegisterRankServiceImpl.java | 118 +++++++++++++++
 .../service/impl/UserAnalysisServiceImpl.java |  12 +-
 .../mapper/user/MetaUserRegisterRankDao.xml   |  30 ++++
 .../resources/mapper/user/UserAnalysisDao.xml |   1 +
 12 files changed, 766 insertions(+), 21 deletions(-)
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserRegisterRankController.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserRegisterRankDao.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserRegisterRankEntity.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserRegisterRankExcel.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java
new file mode 100644
index 000000000..52f3b7107
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java
@@ -0,0 +1,137 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.user;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 用户注册排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@Data
+public class MetaUserRegisterRankDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 街道id
+     */
+	private String streetId;
+
+    /**
+     * 街道名称
+     */
+	private String streetName;
+
+    /**
+     * 用户总数
+     */
+	private Integer userCount;
+
+    /**
+     * 党员数
+     */
+	private Integer partyMemberCount;
+
+    /**
+     * 已注册居民
+     */
+	private Integer residentCount;
+
+    /**
+     * 为注册居民
+     */
+	private Integer unAuthorizedCount;
+
+    /**
+     * 年龄超过50岁
+     */
+	private Integer oldCount;
+
+    /**
+     * 老龄化比例
+     */
+	private BigDecimal oldPercent;
+
+    /**
+     * 50岁以下用户数量
+     */
+	private Integer youngCount;
+
+    /**
+     * 年轻化比例
+     */
+	private BigDecimal youngPercent;
+
+    /**
+     * 男
+     */
+	private Integer maleCount;
+
+    /**
+     * 女
+     */
+	private Integer femaleCount;
+
+    /**
+     * 未知性别
+     */
+	private Integer unknownSexCount;
+
+    /**
+     * 删除标记
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 注册时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserRegisterRankController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserRegisterRankController.java
new file mode 100644
index 000000000..e3f049e58
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserRegisterRankController.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.user.MetaUserRegisterRankDTO;
+import com.elink.esua.epdc.modules.user.excel.MetaUserRegisterRankExcel;
+import com.elink.esua.epdc.modules.user.service.MetaUserRegisterRankService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 用户注册排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@RestController
+@RequestMapping("metauserregisterrank")
+public class MetaUserRegisterRankController {
+    
+    @Autowired
+    private MetaUserRegisterRankService metaUserRegisterRankService;
+
+    @GetMapping("page")
+    public Result<PageData<MetaUserRegisterRankDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<MetaUserRegisterRankDTO> page = metaUserRegisterRankService.page(params);
+        return new Result<PageData<MetaUserRegisterRankDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<MetaUserRegisterRankDTO> get(@PathVariable("id") String id){
+        MetaUserRegisterRankDTO data = metaUserRegisterRankService.get(id);
+        return new Result<MetaUserRegisterRankDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody MetaUserRegisterRankDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        metaUserRegisterRankService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody MetaUserRegisterRankDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        metaUserRegisterRankService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        metaUserRegisterRankService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<MetaUserRegisterRankDTO> list = metaUserRegisterRankService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, MetaUserRegisterRankExcel.class);
+    }
+    /***
+     * 定时任务用户注册排行导入数据
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author qushutong
+     * @date 2020/3/26 13:44
+     */
+    @GetMapping("toLeadUserRegisterRandData")
+    public Result toLeadUserRegisterRandData(){
+        return metaUserRegisterRankService.toLeadUserRegisterRandData();
+    }
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserRegisterRankDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserRegisterRankDao.java
new file mode 100644
index 000000000..f027e96ee
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserRegisterRankDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.modules.user.entity.MetaUserRegisterRankEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户注册排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@Mapper
+public interface MetaUserRegisterRankDao extends BaseDao<MetaUserRegisterRankEntity> {
+	
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserRegisterRankEntity.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserRegisterRankEntity.java
new file mode 100644
index 000000000..08f60b8be
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserRegisterRankEntity.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 用户注册排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("meta_epdc_user_register_rank")
+public class MetaUserRegisterRankEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 街道id
+     */
+	private String streetId;
+
+    /**
+     * 街道名称
+     */
+	private String streetName;
+
+    /**
+     * 用户总数
+     */
+	private Integer userCount;
+
+    /**
+     * 党员数
+     */
+	private Integer partyMemberCount;
+
+    /**
+     * 已注册居民
+     */
+	private Integer residentCount;
+
+    /**
+     * 为注册居民
+     */
+	private Integer unAuthorizedCount;
+
+    /**
+     * 年龄超过50岁
+     */
+	private Integer oldCount;
+
+    /**
+     * 老龄化比例
+     */
+	private BigDecimal oldPercent;
+
+    /**
+     * 50岁以下用户数量
+     */
+	private Integer youngCount;
+
+    /**
+     * 年轻化比例
+     */
+	private BigDecimal youngPercent;
+
+    /**
+     * 男
+     */
+	private Integer maleCount;
+
+    /**
+     * 女
+     */
+	private Integer femaleCount;
+
+    /**
+     * 未知性别
+     */
+	private Integer unknownSexCount;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java
index 2da7a72da..d5eb48161 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java
@@ -31,53 +31,48 @@ import java.util.Date;
 @Data
 public class MetaUserGridOpiningExcel {
 
-    @Excel(name = "主键")
-    private String id;
+    @Excel(name = "网格名称")
+    private String allDeptNames;
 
-    @Excel(name = "网格id")
-    private Long gridId;
+    @Excel(name = "网格党建指导员姓名")
+    private String gridLeader;
 
     @Excel(name = "用户总数")
-    private String registerCount;
+    private int registerCount;
 
     @Excel(name = "党员数")
-    private String partyCount;
+    private int partyCount;
 
     @Excel(name = "已注册居民")
-    private String residentCount;
+    private int residentCount;
 
     @Excel(name = "未注册居民")
-    private String unAuthorizedCount;
+    private int unAuthorizedCount;
 
     @Excel(name = "新闻发布数")
     private String newsCount;
 
     @Excel(name = "社群数")
-    private String communityCount;
+    private int communityCount;
 
     @Excel(name = "群成员数")
-    private String communityMemberCount;
+    private int communityMemberCount;
 
     @Excel(name = "群话题数")
-    private String communityTopicCount;
+    private int communityTopicCount;
 
     @Excel(name = "议题总数")
-    private String eventCount;
+    private int eventCount;
 
     @Excel(name = "项目数")
-    private String itemCount;
+    private int itemCount;
 
     @Excel(name = "项目已解决数")
-    private String itemCloseCount;
+    private int itemCloseCount;
 
     @Excel(name = "好评数")
-    private String itemPraiseCount;
+    private int itemPraiseCount;
 
-    @Excel(name = "网格名称")
-    private String allDeptNames;
-
-    @Excel(name = "网格党建指导员姓名")
-    private String gridLeader;
 
     @Excel(name = "删除标记")
     private String delFlag;
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserRegisterRankExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserRegisterRankExcel.java
new file mode 100644
index 000000000..fba1d7a65
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserRegisterRankExcel.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 用户注册排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@Data
+public class MetaUserRegisterRankExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "街道id")
+    private String streetId;
+
+    @Excel(name = "街道名称")
+    private String streetName;
+
+    @Excel(name = "用户总数")
+    private Integer userCount;
+
+    @Excel(name = "党员数")
+    private Integer partyMemberCount;
+
+    @Excel(name = "已注册居民")
+    private Integer residentCount;
+
+    @Excel(name = "为注册居民")
+    private Integer unAuthorizedCount;
+
+    @Excel(name = "年龄超过50岁")
+    private Integer oldCount;
+
+    @Excel(name = "老龄化比例")
+    private BigDecimal oldPercent;
+
+    @Excel(name = "50岁以下用户数量")
+    private Integer youngCount;
+
+    @Excel(name = "年轻化比例")
+    private BigDecimal youngPercent;
+
+    @Excel(name = "男")
+    private Integer maleCount;
+
+    @Excel(name = "女")
+    private Integer femaleCount;
+
+    @Excel(name = "未知性别")
+    private Integer unknownSexCount;
+
+    @Excel(name = "删除标记")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "注册时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java
new file mode 100644
index 000000000..447a89e68
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java
@@ -0,0 +1,105 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.user.MetaUserRegisterRankDTO;
+import com.elink.esua.epdc.modules.user.entity.MetaUserRegisterRankEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户注册排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+public interface MetaUserRegisterRankService extends BaseService<MetaUserRegisterRankEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<MetaUserRegisterRankDTO>
+     * @author generator
+     * @date 2020-03-26
+     */
+    PageData<MetaUserRegisterRankDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<MetaUserRegisterRankDTO>
+     * @author generator
+     * @date 2020-03-26
+     */
+    List<MetaUserRegisterRankDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return MetaUserRegisterRankDTO
+     * @author generator
+     * @date 2020-03-26
+     */
+    MetaUserRegisterRankDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-26
+     */
+    void save(MetaUserRegisterRankDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-26
+     */
+    void update(MetaUserRegisterRankDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-03-26
+     */
+    void delete(String[] ids);
+
+    /***
+     * 导入用户注册排行
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author qushutong
+     * @date 2020/3/26 13:26
+     */
+    Result toLeadUserRegisterRandData();
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
index b55a398fb..95bd2edd4 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
@@ -110,4 +110,13 @@ public interface UserAnalysisService {
     * @date 2020/3/25 19:13
     */
     List<GridOpeningResultDTO> getToLeadGridOpenings(Map<String, Object> params);
+
+    /***
+     * 获取导入用户排行数据
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO>
+     * @author qushutong
+     * @date 2020/3/26 13:32
+     */
+    List<UserDataRankResultDTO> getToLeadUserRegisterRandData(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/MetaUserRegisterRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
new file mode 100644
index 000000000..f3bdf02b5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.datasources.DataSourceNames;
+import com.elink.esua.epdc.datasources.annotation.DataSource;
+import com.elink.esua.epdc.dto.user.MetaUserRegisterRankDTO;
+import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
+import com.elink.esua.epdc.modules.user.dao.MetaUserRegisterRankDao;
+import com.elink.esua.epdc.modules.user.entity.MetaUserRegisterRankEntity;
+import com.elink.esua.epdc.modules.user.service.MetaUserRegisterRankService;
+import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户注册排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@Service
+public class MetaUserRegisterRankServiceImpl extends BaseServiceImpl<MetaUserRegisterRankDao, MetaUserRegisterRankEntity> implements MetaUserRegisterRankService {
+
+    @Autowired
+    private UserAnalysisService userAnalysisService;
+    @Override
+    public PageData<MetaUserRegisterRankDTO> page(Map<String, Object> params) {
+        IPage<MetaUserRegisterRankEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, MetaUserRegisterRankDTO.class);
+    }
+
+    @Override
+    public List<MetaUserRegisterRankDTO> list(Map<String, Object> params) {
+        List<MetaUserRegisterRankEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, MetaUserRegisterRankDTO.class);
+    }
+
+    private QueryWrapper<MetaUserRegisterRankEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<MetaUserRegisterRankEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public MetaUserRegisterRankDTO get(String id) {
+        MetaUserRegisterRankEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, MetaUserRegisterRankDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(MetaUserRegisterRankDTO dto) {
+        MetaUserRegisterRankEntity entity = ConvertUtils.sourceToTarget(dto, MetaUserRegisterRankEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(MetaUserRegisterRankDTO dto) {
+        MetaUserRegisterRankEntity entity = ConvertUtils.sourceToTarget(dto, MetaUserRegisterRankEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @DataSource(name = DataSourceNames.TWELVE)
+    public Result toLeadUserRegisterRandData() {
+        // 获取导出数据
+        List<UserDataRankResultDTO> toLeadUserRegisterRandData = userAnalysisService.getToLeadUserRegisterRandData(new HashMap<>());
+        // 导入数据
+        List<MetaUserRegisterRankEntity> metaUserRegisterRankEntities = ConvertUtils.sourceToTarget(toLeadUserRegisterRandData, MetaUserRegisterRankEntity.class);
+        return insertBatch(metaUserRegisterRankEntities) ? new Result():new Result().error("导入注册用户排行失败");
+    }
+
+}
\ No newline at end of file
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 9815dfa21..6b80a5320 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
@@ -143,6 +143,11 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         UserDetail userDetail = SecurityUser.getUser();
         params.put("deptIdList", userDetail.getDeptIdList());
         IPage<UserDataRankResultDTO> page = getPage(params);
+        List<UserDataRankResultDTO> list = getListUserDataRankResultDro(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
+    private List<UserDataRankResultDTO> getListUserDataRankResultDro(Map<String, Object> params) {
         List<UserDataRankResultDTO> list = baseDao.selectListUserDataRank(params);
 
         if (CollUtil.isNotEmpty(list)) {
@@ -177,7 +182,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
                 }
             }
         }
-        return new PageData<>(list, page.getTotal());
+        return list;
     }
 
 
@@ -297,5 +302,10 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         return list;
     }
 
+    @Override
+    public List<UserDataRankResultDTO> getToLeadUserRegisterRandData(Map<String, Object> params) {
+        return getListUserDataRankResultDro(params);
+    }
+
 
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
new file mode 100644
index 000000000..d7fd20494
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.modules.user.dao.MetaUserRegisterRankDao">
+
+    <resultMap type="com.elink.esua.epdc.modules.user.entity.MetaUserRegisterRankEntity" id="metaUserRegisterRankMap">
+        <result property="id" column="ID"/>
+        <result property="streetId" column="STREET_ID"/>
+        <result property="streetName" column="STREET_NAME"/>
+        <result property="userCount" column="USER_COUNT"/>
+        <result property="partyMemberCount" column="PARTY_MEMBER_COUNT"/>
+        <result property="residentCount" column="RESIDENT_COUNT"/>
+        <result property="unAuthorizedCount" column="UN_AUTHORIZED_COUNT"/>
+        <result property="oldCount" column="OLD_COUNT"/>
+        <result property="oldPercent" column="OLD_PERCENT"/>
+        <result property="youngCount" column="YOUNG_COUNT"/>
+        <result property="youngPercent" column="YOUNG_PERCENT"/>
+        <result property="maleCount" column="MALE_COUNT"/>
+        <result property="femaleCount" column="FEMALE_COUNT"/>
+        <result property="unknownSexCount" column="UNKNOWN_SEX_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
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 32b76a81e..2ba9cc09a 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
@@ -44,6 +44,7 @@
                     <if test="startTime != null and endTime != null and endTime != ''">
                         AND uu.CREATED_TIME BETWEEN #{startTime} AND #{endTime}
                     </if>
+                    AND ad2.id is NOT NULL
                     AND ad.id IS NOT NULL
                 ) t GROUP BY t.streetId
             ) t1

From c52c3b92f0f6f5b0844d4fedbca180cff8d86e1d 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, 26 Mar 2020 16:46:54 +0800
Subject: [PATCH 20/38] =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/service/impl/MetaUserGridOpiningServiceImpl.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
index a8e0dbba3..6f8be2ed9 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
@@ -58,10 +58,7 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
     @Override
     @DataSource(name = DataSourceNames.TWELVE)
     public PageData<MetaUserGridOpiningDTO> page(Map<String, Object> params) {
-        IPage<MetaUserGridOpiningEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
+        IPage<MetaUserGridOpiningEntity> page = getPage(params);
         // 获取所有网格
         List<GridOpeningResultDTO> gridOpeningResultDTOS = userAnalysisService.selectListGridHasMaCode(params);
         List<String> deptIdList = new ArrayList<>();

From 79dbecf6fa018863315ce9adf2cd344cd6c53330 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, 26 Mar 2020 17:32:35 +0800
Subject: [PATCH 21/38] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=20=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/dao/MetaUserRegisterRankDao.java     | 24 ++++++++++-
 .../service/MetaUserRegisterRankService.java  |  2 +-
 .../impl/MetaUserRegisterRankServiceImpl.java | 42 ++++++++++++++----
 .../mapper/user/MetaUserRegisterRankDao.xml   | 43 ++++++++++++++++++-
 4 files changed, 99 insertions(+), 12 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserRegisterRankDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserRegisterRankDao.java
index f027e96ee..86223fd00 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserRegisterRankDao.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserRegisterRankDao.java
@@ -17,10 +17,14 @@
 
 package com.elink.esua.epdc.modules.user.dao;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.user.entity.MetaUserRegisterRankEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 用户注册排行
  *
@@ -29,5 +33,23 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface MetaUserRegisterRankDao extends BaseDao<MetaUserRegisterRankEntity> {
-	
+
+    /***
+     * 分页
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.modules.user.entity.MetaUserRegisterRankEntity>
+     * @author qushutong
+     * @date 2020/3/26 15:41
+     */
+    List<MetaUserRegisterRankEntity> selectPageUserRegisterRank(Map<String,Object> params);
+
+
+    /***
+     * 获取当前用户拥有权限的街道id
+     * @param params
+     * @return java.util.List<java.lang.String>
+     * @author qushutong
+     * @date 2020/3/26 16:54
+     */
+    List<String> selectListStreetId(Map<String,Object> params);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java
index 447a89e68..82adfb5f2 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java
@@ -95,7 +95,7 @@ public interface MetaUserRegisterRankService extends BaseService<MetaUserRegiste
     void delete(String[] ids);
 
     /***
-     * 导入用户注册排行
+     * 导入用户注册
      * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author qushutong
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
index f3bdf02b5..725348551 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
@@ -21,8 +21,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.datasources.DataSourceNames;
 import com.elink.esua.epdc.datasources.annotation.DataSource;
@@ -37,10 +39,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 用户注册排行
@@ -54,12 +54,23 @@ public class MetaUserRegisterRankServiceImpl extends BaseServiceImpl<MetaUserReg
     @Autowired
     private UserAnalysisService userAnalysisService;
     @Override
+    @DataSource(name = DataSourceNames.TWELVE)
     public PageData<MetaUserRegisterRankDTO> page(Map<String, Object> params) {
-        IPage<MetaUserRegisterRankEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, MetaUserRegisterRankDTO.class);
+        IPage<MetaUserRegisterRankEntity> page = getPage(params);
+        // 获取权限下的街道id
+        List<String> streetIdList = getListStreetId();
+        params.put("streetIdList",streetIdList);
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String time = (String) params.get("createdTime");
+        if(StringUtils.isBlank(time)){
+            String createdTime = format.format(new Date());
+            params.put("createdTime",createdTime);
+        }else {
+            String createdTime = DateUtils.dealDateFormat(time);
+            params.put("createdTime",createdTime);
+        }
+        List<MetaUserRegisterRankEntity> metaUserRegisterRankEntities = baseDao.selectPageUserRegisterRank(params);
+        return getPageData(metaUserRegisterRankEntities,page.getTotal(), MetaUserRegisterRankDTO.class);
     }
 
     @Override
@@ -115,4 +126,17 @@ public class MetaUserRegisterRankServiceImpl extends BaseServiceImpl<MetaUserReg
         return insertBatch(metaUserRegisterRankEntities) ? new Result():new Result().error("导入注册用户排行失败");
     }
 
+    /***
+     * 获取当前用户拥有权限的街道id
+     * @param
+     * @return java.util.List<java.lang.String>
+     * @author qushutong
+     * @date 2020/3/26 16:57
+     */
+    public List<String> getListStreetId() {
+        Map params = new HashMap();
+        params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
+        return baseDao.selectListStreetId(params);
+    }
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
index d7fd20494..592c90d7c 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
@@ -25,6 +25,47 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectPageUserRegisterRank" resultMap="metaUserRegisterRankMap">
+        SELECT
+        *
+        FROM
+        meta_epdc_user_register_rank rr
+        WHERE
+        del_flag = '0'
+        <if test="streetId!=null and streetId != ''">
+            and rr.STREET_ID = #{streetId}
+        </if>
+        <if test="createdTime!=null and  createdTime != ''">
+            and rr.CREATED_TIME like concat('%', #{createdTime}, '%')
+        </if>
+        <if test="streetIdList!=null and streetIdList.size()>0">
+            and rr.STREET_ID in
+            <foreach collection="streetIdList" index="index" item="streetId" open="(" separator="," close=")">
+                #{streetId}
+            </foreach>
+        </if>
+    </select>
 
-
+    <select id="selectListStreetId" resultType="String">
+          SELECT
+             ad2.id streetId
+            FROM
+                esua_epdc_user.epdc_user uu
+            LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID
+            AND ad.type_key = 'grid_party'
+            LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid
+            LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
+            WHERE
+                uu.DEL_FLAG = '0'
+                <if test="deptIdList!=null and deptIdList.size()>0">
+                    and ad2.ID in
+                    <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+                        #{deptId}
+                    </foreach>
+                </if>
+            AND ad.id IS NOT NULL
+            AND ad2.id IS NOT NULL
+            GROUP BY
+                ad2.id
+    </select>
 </mapper>
\ No newline at end of file

From 5bef1d45df22d3385d7291c6bf965610dc8b9c98 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, 26 Mar 2020 17:52:54 +0800
Subject: [PATCH 22/38] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/feign/UserFeignClint.java   | 17 ++++++++++++++++-
 .../feign/fallback/UserFeignClintFallback.java  |  5 +++++
 .../impl/ScheduleJobUserServiceImpl.java        |  5 +++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java
index aa3393b8b..335871ed3 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java
@@ -1,6 +1,9 @@
 package com.elink.esua.epdc.feign;
 
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.fallback.UserFeignClintFallback;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
 /**
@@ -8,6 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  *  @Date: 2020/3/25 10:20
  *  @Description: 用户数据分析
  */
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = UserFeignClintFallback.class)
 public interface UserFeignClint {
 
     /***
@@ -17,6 +21,17 @@ public interface UserFeignClint {
      * @author qushutong
      * @date 2020/3/25 10:19
      */
-    @GetMapping("analysis/user/tolead")
+    @GetMapping("analysis/metausergridopining/tolead")
     Result createUserAnalysisData();
+
+    /***
+     * 用户注册排行导入数据
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author qushutong
+     * @date 2020/3/26 17:45
+     */
+    @GetMapping("analysis/metauserregisterrank/toLeadUserRegisterRandData")
+    Result toLeadUserRegisterRandData();
+
 }
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
index 43636d315..0fc95fe4e 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
@@ -16,4 +16,9 @@ public class UserFeignClintFallback implements UserFeignClint {
     public Result createUserAnalysisData() {
         return  ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "createUserAnalysisData", "");
     }
+
+    @Override
+    public Result toLeadUserRegisterRandData() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "toLeadUserRegisterRandData", "");
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
index a19d0ef7e..115c30485 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
@@ -3,18 +3,23 @@ package com.elink.esua.epdc.service.impl;
 import com.elink.esua.epdc.feign.UserFeignClint;
 import com.elink.esua.epdc.service.ScheduleJobUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  *  @author: qushutong
  *  @Date: 2020/3/25 10:15
  *  @Description: 用户数据数据分析
  */
+@Service
 public class ScheduleJobUserServiceImpl implements ScheduleJobUserService {
     @Autowired
     private UserFeignClint userFeignClint;
 
     @Override
     public void createUserAnalysisData() {
+        // 网格开通
         userFeignClint.createUserAnalysisData();
+        // 用户注册
+        userFeignClint.toLeadUserRegisterRandData();
     }
 }

From 310fa681b687952368723654c3abe3979608efb9 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Thu, 26 Mar 2020 18:02:47 +0800
Subject: [PATCH 23/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0openid=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/service/impl/UserServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 66b43edac..92c610de2 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -602,6 +602,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser, UserDTO.class);
         userDto.setWxUnionId(StringUtils.isBlank(userDto.getWxUnionId()) ? null : userDto.getWxUnionId());
         userDto.setFaceImg(StringUtils.isBlank(userDto.getFaceImg()) ? null : userDto.getFaceImg());
+        userDto.setWxOpenId(StringUtils.isBlank(userDto.getWxOpenId()) ? null : userDto.getWxOpenId());
         UserGridRelationDTO userGridRelation = formDto.getUserGridRelation();
 
         String userId = userDto.getId();
@@ -867,7 +868,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     /**
      * @param gridIdList
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List   <   com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO>>
      * @Author yinzuomei
      * @Description 根据网格id查询网格下所有的用户
      * @Date 2019/12/19 15:03

From 2e3e2b2716a4ebfb61e5415c8f6851f9f555084c 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, 26 Mar 2020 18:13:13 +0800
Subject: [PATCH 24/38] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=8E=92=E8=A1=8C=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/user/MetaUserPartyRankDTO.java   | 127 ++++++++++++++++++
 .../MetaUserPartyRankController.java          |  94 +++++++++++++
 .../user/dao/MetaUserPartyRankDao.java        |  32 +++++
 .../user/entity/MetaUserPartyRankEntity.java  |  97 +++++++++++++
 .../user/excel/MetaUserPartyRankExcel.java    |  90 +++++++++++++
 .../service/MetaUserPartyRankService.java     |  95 +++++++++++++
 .../impl/MetaUserPartyRankServiceImpl.java    | 101 ++++++++++++++
 .../mapper/user/MetaUserPartyRankDao.xml      |  28 ++++
 8 files changed, 664 insertions(+)
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserPartyRankDao.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserPartyRankEntity.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserPartyRankExcel.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserPartyRankDao.xml

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java
new file mode 100644
index 000000000..be8c514e5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java
@@ -0,0 +1,127 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.user;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 党员排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@Data
+public class MetaUserPartyRankDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 街道id
+     */
+	private String streetId;
+
+    /**
+     * 街道名称
+     */
+	private String streetName;
+
+    /**
+     * 已注册党员数量（已认证）
+     */
+	private Integer partyMemberCount;
+
+    /**
+     * 年龄超过50岁党员数量
+     */
+	private Integer oldCount;
+
+    /**
+     * 老龄化比例
+     */
+	private BigDecimal oldPercent;
+
+    /**
+     * 年龄50岁以下的党员数量
+     */
+	private Integer youngCount;
+
+    /**
+     * 年轻化比例
+     */
+	private BigDecimal youngPercent;
+
+    /**
+     * 男
+     */
+	private Integer maleCount;
+
+    /**
+     * 女
+     */
+	private Integer femaleCount;
+
+    /**
+     * 未知性别
+     */
+	private Integer unknownSexCount;
+
+    /**
+     * 党员认证失败数
+     */
+	private Integer partyAuthFailureCount;
+
+    /**
+     * 删除标记
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 注册时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java
new file mode 100644
index 000000000..75c5f3ed5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.user.MetaUserPartyRankDTO;
+import com.elink.esua.epdc.modules.user.excel.MetaUserPartyRankExcel;
+import com.elink.esua.epdc.modules.user.service.MetaUserPartyRankService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 党员排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@RestController
+@RequestMapping("metauserpartyrank")
+public class MetaUserPartyRankController {
+    
+    @Autowired
+    private MetaUserPartyRankService metaUserPartyRankService;
+
+    @GetMapping("page")
+    public Result<PageData<MetaUserPartyRankDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<MetaUserPartyRankDTO> page = metaUserPartyRankService.page(params);
+        return new Result<PageData<MetaUserPartyRankDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<MetaUserPartyRankDTO> get(@PathVariable("id") String id){
+        MetaUserPartyRankDTO data = metaUserPartyRankService.get(id);
+        return new Result<MetaUserPartyRankDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody MetaUserPartyRankDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        metaUserPartyRankService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody MetaUserPartyRankDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        metaUserPartyRankService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        metaUserPartyRankService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<MetaUserPartyRankDTO> list = metaUserPartyRankService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, MetaUserPartyRankExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserPartyRankDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserPartyRankDao.java
new file mode 100644
index 000000000..c712f2ccc
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserPartyRankDao.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.dao;
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 党员排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@Mapper
+public interface MetaUserPartyRankDao extends BaseDao<MetaUserPartyRankEntity> {
+	
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserPartyRankEntity.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserPartyRankEntity.java
new file mode 100644
index 000000000..eec5ce88e
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserPartyRankEntity.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 党员排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("meta_epdc_user_party_rank")
+public class MetaUserPartyRankEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 街道id
+     */
+	private String streetId;
+
+    /**
+     * 街道名称
+     */
+	private String streetName;
+
+    /**
+     * 已注册党员数量（已认证）
+     */
+	private Integer partyMemberCount;
+
+    /**
+     * 年龄超过50岁党员数量
+     */
+	private Integer oldCount;
+
+    /**
+     * 老龄化比例
+     */
+	private BigDecimal oldPercent;
+
+    /**
+     * 年龄50岁以下的党员数量
+     */
+	private Integer youngCount;
+
+    /**
+     * 年轻化比例
+     */
+	private BigDecimal youngPercent;
+
+    /**
+     * 男
+     */
+	private Integer maleCount;
+
+    /**
+     * 女
+     */
+	private Integer femaleCount;
+
+    /**
+     * 未知性别
+     */
+	private Integer unknownSexCount;
+
+    /**
+     * 党员认证失败数
+     */
+	private Integer partyAuthFailureCount;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserPartyRankExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserPartyRankExcel.java
new file mode 100644
index 000000000..c312a5f13
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserPartyRankExcel.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 党员排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@Data
+public class MetaUserPartyRankExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "街道id")
+    private String streetId;
+
+    @Excel(name = "街道名称")
+    private String streetName;
+
+    @Excel(name = "已注册党员数量（已认证）")
+    private Integer partyMemberCount;
+
+    @Excel(name = "年龄超过50岁党员数量")
+    private Integer oldCount;
+
+    @Excel(name = "老龄化比例")
+    private BigDecimal oldPercent;
+
+    @Excel(name = "年龄50岁以下的党员数量")
+    private Integer youngCount;
+
+    @Excel(name = "年轻化比例")
+    private BigDecimal youngPercent;
+
+    @Excel(name = "男")
+    private Integer maleCount;
+
+    @Excel(name = "女")
+    private Integer femaleCount;
+
+    @Excel(name = "未知性别")
+    private Integer unknownSexCount;
+
+    @Excel(name = "党员认证失败数")
+    private Integer partyAuthFailureCount;
+
+    @Excel(name = "删除标记")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "注册时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java
new file mode 100644
index 000000000..b73506c94
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.dto.user.MetaUserPartyRankDTO;
+import com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+public interface MetaUserPartyRankService extends BaseService<MetaUserPartyRankEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<MetaUserPartyRankDTO>
+     * @author generator
+     * @date 2020-03-26
+     */
+    PageData<MetaUserPartyRankDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<MetaUserPartyRankDTO>
+     * @author generator
+     * @date 2020-03-26
+     */
+    List<MetaUserPartyRankDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return MetaUserPartyRankDTO
+     * @author generator
+     * @date 2020-03-26
+     */
+    MetaUserPartyRankDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-26
+     */
+    void save(MetaUserPartyRankDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-26
+     */
+    void update(MetaUserPartyRankDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-03-26
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
new file mode 100644
index 000000000..234128f01
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.user.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.dto.user.MetaUserPartyRankDTO;
+import com.elink.esua.epdc.modules.user.dao.MetaUserPartyRankDao;
+import com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity;
+import com.elink.esua.epdc.modules.user.service.MetaUserPartyRankService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@Service
+public class MetaUserPartyRankServiceImpl extends BaseServiceImpl<MetaUserPartyRankDao, MetaUserPartyRankEntity> implements MetaUserPartyRankService {
+
+
+    @Override
+    public PageData<MetaUserPartyRankDTO> page(Map<String, Object> params) {
+        IPage<MetaUserPartyRankEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, MetaUserPartyRankDTO.class);
+    }
+
+    @Override
+    public List<MetaUserPartyRankDTO> list(Map<String, Object> params) {
+        List<MetaUserPartyRankEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, MetaUserPartyRankDTO.class);
+    }
+
+    private QueryWrapper<MetaUserPartyRankEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<MetaUserPartyRankEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public MetaUserPartyRankDTO get(String id) {
+        MetaUserPartyRankEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, MetaUserPartyRankDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(MetaUserPartyRankDTO dto) {
+        MetaUserPartyRankEntity entity = ConvertUtils.sourceToTarget(dto, MetaUserPartyRankEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(MetaUserPartyRankDTO dto) {
+        MetaUserPartyRankEntity entity = ConvertUtils.sourceToTarget(dto, MetaUserPartyRankEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserPartyRankDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserPartyRankDao.xml
new file mode 100644
index 000000000..83cc9377a
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserPartyRankDao.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.modules.user.dao.MetaUserPartyRankDao">
+
+    <resultMap type="com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity" id="metaUserPartyRankMap">
+        <result property="id" column="ID"/>
+        <result property="streetId" column="STREET_ID"/>
+        <result property="streetName" column="STREET_NAME"/>
+        <result property="partyMemberCount" column="PARTY_MEMBER_COUNT"/>
+        <result property="oldCount" column="OLD_COUNT"/>
+        <result property="oldPercent" column="OLD_PERCENT"/>
+        <result property="youngCount" column="YOUNG_COUNT"/>
+        <result property="youngPercent" column="YOUNG_PERCENT"/>
+        <result property="maleCount" column="MALE_COUNT"/>
+        <result property="femaleCount" column="FEMALE_COUNT"/>
+        <result property="unknownSexCount" column="UNKNOWN_SEX_COUNT"/>
+        <result property="partyAuthFailureCount" column="PARTY_AUTH_FAILURE_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file

From e320784bd2bf35ee1dbffacf32edf4b580234501 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, 26 Mar 2020 19:01:57 +0800
Subject: [PATCH 25/38] =?UTF-8?q?=E6=96=B0=E5=85=9A=E5=91=98=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MetaUserPartyRankController.java          | 13 +++++
 .../user/dao/MetaUserPartyRankDao.java        | 16 +++++-
 .../service/MetaUserPartyRankService.java     | 10 ++++
 .../impl/MetaUserPartyRankServiceImpl.java    | 50 ++++++++++++++++---
 4 files changed, 80 insertions(+), 9 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java
index 75c5f3ed5..b4d678432 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java
@@ -91,4 +91,17 @@ public class MetaUserPartyRankController {
         ExcelUtils.exportExcelToTarget(response, null, list, MetaUserPartyRankExcel.class);
     }
 
+    /***
+     * 定时任务导入
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author qushutong
+     * @date 2020/3/26 18:22
+     */
+    @GetMapping("toLeadPartyRankData")
+    public Result toLeadPartyRankData(){
+
+        return metaUserPartyRankService.toLeadPartyRankData();
+    }
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserPartyRankDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserPartyRankDao.java
index c712f2ccc..9bebf3d7a 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserPartyRankDao.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserPartyRankDao.java
@@ -16,10 +16,14 @@
  */
 
 package com.elink.esua.epdc.modules.user.dao;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 党员排行
  *
@@ -28,5 +32,15 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface MetaUserPartyRankDao extends BaseDao<MetaUserPartyRankEntity> {
-	
+
+    /***
+     * 分页
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity>
+     * @author qushutong
+     * @date 2020/3/26 18:36
+     */
+    List<MetaUserPartyRankEntity>  selectPagePartyRank(Map<String,Object> params);
+
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java
index b73506c94..b98990bbb 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java
@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.user.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.user.MetaUserPartyRankDTO;
 import com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity;
 
@@ -92,4 +93,13 @@ public interface MetaUserPartyRankService extends BaseService<MetaUserPartyRankE
      * @date 2020-03-26
      */
     void delete(String[] ids);
+
+    /***
+     * 定时任务导入党员排行
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author qushutong
+     * @date 2020/3/26 18:23
+     */
+    Result toLeadPartyRankData();
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
index 234128f01..4f03f96b4 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
@@ -20,21 +20,28 @@ package com.elink.esua.epdc.modules.user.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.datasources.DataSourceNames;
+import com.elink.esua.epdc.datasources.annotation.DataSource;
 import com.elink.esua.epdc.dto.user.MetaUserPartyRankDTO;
+import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
 import com.elink.esua.epdc.modules.user.dao.MetaUserPartyRankDao;
 import com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity;
 import com.elink.esua.epdc.modules.user.service.MetaUserPartyRankService;
+import com.elink.esua.epdc.modules.user.service.MetaUserRegisterRankService;
+import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 党员排行
@@ -45,14 +52,30 @@ import java.util.Map;
 @Service
 public class MetaUserPartyRankServiceImpl extends BaseServiceImpl<MetaUserPartyRankDao, MetaUserPartyRankEntity> implements MetaUserPartyRankService {
 
+    @Autowired
+    private UserAnalysisService userAnalysisService;
+
+    @Autowired
+    private MetaUserRegisterRankServiceImpl metaUserRegisterRankService;
 
     @Override
+    @DataSource(name = DataSourceNames.TWELVE)
     public PageData<MetaUserPartyRankDTO> page(Map<String, Object> params) {
-        IPage<MetaUserPartyRankEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, MetaUserPartyRankDTO.class);
+        IPage<MetaUserPartyRankEntity> page = getPage(params);
+        // 获取权限下的街道id
+        List<String> streetIdList = metaUserRegisterRankService.getListStreetId();
+        params.put("streetIdList",streetIdList);
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String time = (String) params.get("createdTime");
+        if(StringUtils.isBlank(time)){
+            String createdTime = format.format(new Date());
+            params.put("createdTime",createdTime);
+        }else {
+            String createdTime = DateUtils.dealDateFormat(time);
+            params.put("createdTime",createdTime);
+        }
+        List<MetaUserPartyRankEntity> metaUserRegisterRankEntities = baseDao.selectPagePartyRank(params);
+        return getPageData(metaUserRegisterRankEntities,page.getTotal(), MetaUserPartyRankDTO.class);
     }
 
     @Override
@@ -98,4 +121,15 @@ public class MetaUserPartyRankServiceImpl extends BaseServiceImpl<MetaUserPartyR
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    @DataSource(name = DataSourceNames.TWELVE)
+    public Result toLeadPartyRankData() {
+        // 获取导出数据
+        Map<String,Object> params = new HashMap<>();
+        params.put("partyFlag", YesOrNoEnum.YES.value());
+        List<UserDataRankResultDTO> toLeadUserRegisterRandData = userAnalysisService.getToLeadUserRegisterRandData(params);
+        List<MetaUserPartyRankEntity> metaUserPartyRankEntities = ConvertUtils.sourceToTarget(toLeadUserRegisterRandData, MetaUserPartyRankEntity.class);
+        return insertBatch(metaUserPartyRankEntities)? new Result(): new Result().error("导入党员排行失败") ;
+    }
+
 }
\ No newline at end of file

From 8d713c4a162a86e747ec0e1c418b6066a79052c7 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, 26 Mar 2020 19:02:13 +0800
Subject: [PATCH 26/38] =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/user/MetaUserPartyRankDao.xml      | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserPartyRankDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserPartyRankDao.xml
index 83cc9377a..fb795db24 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserPartyRankDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserPartyRankDao.xml
@@ -24,5 +24,25 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="selectPagePartyRank" resultMap="metaUserPartyRankMap">
+        SELECT
+        *
+        FROM
+        meta_epdc_user_party_rank pr
+        WHERE
+        del_flag = '0'
+        <if test="streetId!=null and streetId != ''">
+            and pr.STREET_ID = #{streetId}
+        </if>
+        <if test="createdTime!=null and  createdTime != ''">
+            and pr.CREATED_TIME like concat('%', #{createdTime}, '%')
+        </if>
+        <if test="streetIdList!=null and streetIdList.size()>0">
+            and pr.STREET_ID in
+            <foreach collection="streetIdList" index="index" item="streetId" open="(" separator="," close=")">
+                #{streetId}
+            </foreach>
+        </if>
+    </select>
 
 </mapper>
\ No newline at end of file

From a73350a0327a7445e04ddac882cca94535b8b96f 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, 26 Mar 2020 19:05:17 +0800
Subject: [PATCH 27/38] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E6=A6=9C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/elink/esua/epdc/feign/UserFeignClint.java  | 4 ++++
 .../esua/epdc/feign/fallback/UserFeignClintFallback.java     | 5 +++++
 .../esua/epdc/service/impl/ScheduleJobUserServiceImpl.java   | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java
index 335871ed3..c0b7e2ec5 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClint.java
@@ -34,4 +34,8 @@ public interface UserFeignClint {
     @GetMapping("analysis/metauserregisterrank/toLeadUserRegisterRandData")
     Result toLeadUserRegisterRandData();
 
+
+    @GetMapping("analysis/metauserpartyrank/toLeadPartyRankData")
+    Result toLeadPartyRankData();
+
 }
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
index 0fc95fe4e..cf6f3bb40 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
@@ -21,4 +21,9 @@ public class UserFeignClintFallback implements UserFeignClint {
     public Result toLeadUserRegisterRandData() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "toLeadUserRegisterRandData", "");
     }
+
+    @Override
+    public Result toLeadPartyRankData() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "toLeadPartyRankData", "");
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
index 115c30485..2cf6157e5 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
@@ -21,5 +21,8 @@ public class ScheduleJobUserServiceImpl implements ScheduleJobUserService {
         userFeignClint.createUserAnalysisData();
         // 用户注册
         userFeignClint.toLeadUserRegisterRandData();
+
+        // 党员排行绑
+        userFeignClint.toLeadPartyRankData();
     }
 }

From 57124ea489dcb48e345fd96a6306ecdc3ff5033f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 27 Mar 2020 14:49:36 +0800
Subject: [PATCH 28/38] =?UTF-8?q?=E4=B8=89=E5=88=97=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MetaUserGridOpiningServiceImpl.java   | 10 +++++++---
 .../service/impl/MetaUserPartyRankServiceImpl.java     | 10 +++++++---
 .../service/impl/MetaUserRegisterRankServiceImpl.java  | 10 +++++++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
index 6f8be2ed9..555ce3522 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
@@ -59,6 +59,11 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
     @DataSource(name = DataSourceNames.TWELVE)
     public PageData<MetaUserGridOpiningDTO> page(Map<String, Object> params) {
         IPage<MetaUserGridOpiningEntity> page = getPage(params);
+        List<MetaUserGridOpiningEntity> metaUserGridOpiningEntityList = getMetaUserGridOpiningEntities(params);
+        return getPageData(metaUserGridOpiningEntityList,page.getTotal(), MetaUserGridOpiningDTO.class);
+    }
+
+    private List<MetaUserGridOpiningEntity> getMetaUserGridOpiningEntities(Map<String, Object> params) {
         // 获取所有网格
         List<GridOpeningResultDTO> gridOpeningResultDTOS = userAnalysisService.selectListGridHasMaCode(params);
         List<String> deptIdList = new ArrayList<>();
@@ -75,13 +80,12 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
             String createdTime = DateUtils.dealDateFormat(time);
             params.put("createdTime",createdTime);
         }
-        List<MetaUserGridOpiningEntity> metaUserGridOpiningEntityList = baseDao.pageselectListPage(params);
-        return getPageData(metaUserGridOpiningEntityList,page.getTotal(), MetaUserGridOpiningDTO.class);
+        return baseDao.pageselectListPage(params);
     }
 
     @Override
     public List<MetaUserGridOpiningDTO> list(Map<String, Object> params) {
-        List<MetaUserGridOpiningEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<MetaUserGridOpiningEntity> entityList = getMetaUserGridOpiningEntities(params);
 
         return ConvertUtils.sourceToTarget(entityList, MetaUserGridOpiningDTO.class);
     }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
index 4f03f96b4..afa6720e0 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
@@ -62,6 +62,11 @@ public class MetaUserPartyRankServiceImpl extends BaseServiceImpl<MetaUserPartyR
     @DataSource(name = DataSourceNames.TWELVE)
     public PageData<MetaUserPartyRankDTO> page(Map<String, Object> params) {
         IPage<MetaUserPartyRankEntity> page = getPage(params);
+        List<MetaUserPartyRankEntity> metaUserRegisterRankEntities = getMetaUserPartyRankEntities(params);
+        return getPageData(metaUserRegisterRankEntities,page.getTotal(), MetaUserPartyRankDTO.class);
+    }
+
+    private List<MetaUserPartyRankEntity> getMetaUserPartyRankEntities(Map<String, Object> params) {
         // 获取权限下的街道id
         List<String> streetIdList = metaUserRegisterRankService.getListStreetId();
         params.put("streetIdList",streetIdList);
@@ -74,13 +79,12 @@ public class MetaUserPartyRankServiceImpl extends BaseServiceImpl<MetaUserPartyR
             String createdTime = DateUtils.dealDateFormat(time);
             params.put("createdTime",createdTime);
         }
-        List<MetaUserPartyRankEntity> metaUserRegisterRankEntities = baseDao.selectPagePartyRank(params);
-        return getPageData(metaUserRegisterRankEntities,page.getTotal(), MetaUserPartyRankDTO.class);
+        return baseDao.selectPagePartyRank(params);
     }
 
     @Override
     public List<MetaUserPartyRankDTO> list(Map<String, Object> params) {
-        List<MetaUserPartyRankEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<MetaUserPartyRankEntity> entityList = getMetaUserPartyRankEntities(params);
 
         return ConvertUtils.sourceToTarget(entityList, MetaUserPartyRankDTO.class);
     }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
index 725348551..83d6061ef 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
@@ -57,6 +57,11 @@ public class MetaUserRegisterRankServiceImpl extends BaseServiceImpl<MetaUserReg
     @DataSource(name = DataSourceNames.TWELVE)
     public PageData<MetaUserRegisterRankDTO> page(Map<String, Object> params) {
         IPage<MetaUserRegisterRankEntity> page = getPage(params);
+        List<MetaUserRegisterRankEntity> metaUserRegisterRankEntities = getMetaUserRegisterRankEntities(params);
+        return getPageData(metaUserRegisterRankEntities,page.getTotal(), MetaUserRegisterRankDTO.class);
+    }
+
+    private List<MetaUserRegisterRankEntity> getMetaUserRegisterRankEntities(Map<String, Object> params) {
         // 获取权限下的街道id
         List<String> streetIdList = getListStreetId();
         params.put("streetIdList",streetIdList);
@@ -69,13 +74,12 @@ public class MetaUserRegisterRankServiceImpl extends BaseServiceImpl<MetaUserReg
             String createdTime = DateUtils.dealDateFormat(time);
             params.put("createdTime",createdTime);
         }
-        List<MetaUserRegisterRankEntity> metaUserRegisterRankEntities = baseDao.selectPageUserRegisterRank(params);
-        return getPageData(metaUserRegisterRankEntities,page.getTotal(), MetaUserRegisterRankDTO.class);
+        return baseDao.selectPageUserRegisterRank(params);
     }
 
     @Override
     public List<MetaUserRegisterRankDTO> list(Map<String, Object> params) {
-        List<MetaUserRegisterRankEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<MetaUserRegisterRankEntity> entityList = getMetaUserRegisterRankEntities(params);
 
         return ConvertUtils.sourceToTarget(entityList, MetaUserRegisterRankDTO.class);
     }

From 5185ebfc5017b3c08951374575373b5a4f465cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 27 Mar 2020 15:13:59 +0800
Subject: [PATCH 29/38] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/service/impl/MetaUserGridOpiningServiceImpl.java        | 1 +
 .../modules/user/service/impl/MetaUserPartyRankServiceImpl.java  | 1 +
 .../user/service/impl/MetaUserRegisterRankServiceImpl.java       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
index 555ce3522..a126d5d1e 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
@@ -84,6 +84,7 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
     }
 
     @Override
+    @DataSource(name = DataSourceNames.TWELVE)
     public List<MetaUserGridOpiningDTO> list(Map<String, Object> params) {
         List<MetaUserGridOpiningEntity> entityList = getMetaUserGridOpiningEntities(params);
 
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
index afa6720e0..5da1eb35a 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
@@ -83,6 +83,7 @@ public class MetaUserPartyRankServiceImpl extends BaseServiceImpl<MetaUserPartyR
     }
 
     @Override
+    @DataSource(name = DataSourceNames.TWELVE)
     public List<MetaUserPartyRankDTO> list(Map<String, Object> params) {
         List<MetaUserPartyRankEntity> entityList = getMetaUserPartyRankEntities(params);
 
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
index 83d6061ef..6d89b576e 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
@@ -78,6 +78,7 @@ public class MetaUserRegisterRankServiceImpl extends BaseServiceImpl<MetaUserReg
     }
 
     @Override
+    @DataSource(name = DataSourceNames.TWELVE)
     public List<MetaUserRegisterRankDTO> list(Map<String, Object> params) {
         List<MetaUserRegisterRankEntity> entityList = getMetaUserRegisterRankEntities(params);
 

From 5625ab534ecefd7b511eff8d7be8a774ea9dd89b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 27 Mar 2020 16:05:15 +0800
Subject: [PATCH 30/38] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/ExportOperationDataResultDTO.java  |  5 ++++
 .../epdc/excel/ExportOperationDataExcel.java  |  3 ++
 .../modules/user/dao/UserAnalysisDao.java     | 11 +++++++
 .../service/impl/UserAnalysisServiceImpl.java |  5 ++++
 .../resources/mapper/user/UserAnalysisDao.xml | 30 +++++++++++++++++++
 5 files changed, 54 insertions(+)

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 cf87a8027..3762374e1 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,4 +73,9 @@ public class ExportOperationDataResultDTO implements Serializable {
      */
     private String streetName;
 
+    /**
+     * 企业数
+     */
+    private int enterpriseCount = 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 e61be0af4..4091895ea 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
@@ -23,6 +23,9 @@ public class ExportOperationDataExcel implements Serializable {
     @Excel(name = "居民数")
     private int registerCount = 0;
 
+    @Excel(name = "企业数")
+    private int enterpriseCount = 0;
+
     @Excel(name = "已认证党员数")
     private int partyCount = 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 6220046cb..5b7b63619 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
@@ -232,4 +232,15 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
      */
     List<ExportOperationDataResultDTO> selectExportTopicCount(ExportOperationFormDTO exportOperationFormDTO);
 
+
+    /***
+     * 运营数据导出企业数
+     * @param exportOperationFormDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/3/23 15:16
+     */
+    List<ExportOperationDataResultDTO> selectExportEnterpriseCount(ExportOperationFormDTO exportOperationFormDTO);
+
+
 }
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 6ee7b0f6c..79b3bf943 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
@@ -304,6 +304,9 @@ 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);
         //居民数
         for(int i= 0;i<exportOperationDataResultDTOS.size();i++){
             for(ExportOperationDataResultDTO item:unAuthorizedResultDTOS){
@@ -320,6 +323,8 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
             exportOperationDataResultDTOS.get(i).setCommunityCount(groupDataResultDTOS.get(i).getCommunityCount());
             exportOperationDataResultDTOS.get(i).setCommunityMemberCount(communityMemberDataResultDTOS.get(i).getCommunityMemberCount());
             exportOperationDataResultDTOS.get(i).setCommunityTopicCount(topicDataResultDTOS.get(i).getCommunityTopicCount());
+            exportOperationDataResultDTOS.get(i).setEnterpriseCount(enterpriseDataResultDTOS.get(i).getEnterpriseCount());
+
         }
         return exportOperationDataResultDTOS;
     }
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 c6b30f712..76944bafb 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
@@ -694,6 +694,36 @@
         t0.id ASC
     </select>
 
+    <select id="selectExportEnterpriseCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO">
+        SELECT
+            t0.`name` streetName,
+            count(uu.ID) enterpriseCount
+        FROM
+            (
+                SELECT
+                    ad.id,
+                    ad.`name`,
+                    ad.pid
+                FROM
+                    esua_epdc_admin.sys_dept ad
+                WHERE
+        ad.id IN <include refid="foreachAllDeptIdsShow"></include>
+                AND ad.del_flag = 0
+            ) t0
+        LEFT JOIN esua_epdc_custom.epdc_enterprise_info uu ON  find_in_set(t0.id,uu.ALL_DEPT_IDS)
+        AND uu.DEL_FLAG = '0'
+        <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
+            AND uu.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and uu.CREATED_TIME &lt;=#{endTime}
+        </if>
+        GROUP BY
+            t0.id
+        ORDER BY
+            t0.id ASC
+    </select>
+
     <!--循环街道id集合-->
     <sql id="foreachAllDeptIdsShow">
         <foreach collection="allStreetIds" item="item" open="(" separator="," close=")">

From 4bb2b3771214dbbf1e0d3936ee36c2c58803d485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Sat, 28 Mar 2020 10:30:29 +0800
Subject: [PATCH 31/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/feign/fallback/UserFeignClintFallback.java | 2 ++
 .../esua/epdc/service/impl/ScheduleJobUserServiceImpl.java     | 3 ++-
 .../com/elink/esua/epdc/task/analysis/UserAnalysisTask.java    | 2 +-
 .../elink/esua/epdc/task/analysis/UserAnalysisTaskImpl.java    | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
index cf6f3bb40..8a2a066dc 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClintFallback.java
@@ -4,12 +4,14 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.feign.UserFeignClint;
+import org.springframework.stereotype.Component;
 
 /**
  *  @author: qushutong
  *  @Date: 2020/3/25 10:22
  *  @Description: 用户数据分析
  */
+@Component
 public class UserFeignClintFallback implements UserFeignClint {
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
index 2cf6157e5..246f39540 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java
@@ -3,6 +3,7 @@ package com.elink.esua.epdc.service.impl;
 import com.elink.esua.epdc.feign.UserFeignClint;
 import com.elink.esua.epdc.service.ScheduleJobUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
 /**
@@ -10,7 +11,7 @@ import org.springframework.stereotype.Service;
  *  @Date: 2020/3/25 10:15
  *  @Description: 用户数据数据分析
  */
-@Service
+@Component
 public class ScheduleJobUserServiceImpl implements ScheduleJobUserService {
     @Autowired
     private UserFeignClint userFeignClint;
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTask.java
index 69d67479e..d02458b5d 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTask.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTask.java
@@ -14,5 +14,5 @@ public interface UserAnalysisTask {
      * @author qushutong
      * @date 2020/3/25 10:11
      */
-    void run();
+    void run(String params);
 }
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTaskImpl.java
index d3ef918dc..2430504cc 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTaskImpl.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/analysis/UserAnalysisTaskImpl.java
@@ -15,7 +15,7 @@ public class UserAnalysisTaskImpl implements UserAnalysisTask {
     private ScheduleJobUserService scheduleJobUserService;
 
     @Override
-    public void run() {
+    public void run(String params) {
         scheduleJobUserService.createUserAnalysisData();
     }
 }

From da4751c6bd5fec4e481a40bd2d385c1ec2268b38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Sat, 28 Mar 2020 13:29:22 +0800
Subject: [PATCH 32/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/excel/MetaUserGridOpiningExcel.java  | 18 +--------------
 .../user/excel/MetaUserPartyRankExcel.java    | 22 +------------------
 .../user/excel/MetaUserRegisterRankExcel.java | 22 +------------------
 3 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java
index d5eb48161..104301f23 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserGridOpiningExcel.java
@@ -73,23 +73,7 @@ public class MetaUserGridOpiningExcel {
     @Excel(name = "好评数")
     private int itemPraiseCount;
 
-
-    @Excel(name = "删除标记")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "注册时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
+    @Excel(name = "更新时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
 
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserPartyRankExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserPartyRankExcel.java
index c312a5f13..7700c7b3a 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserPartyRankExcel.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserPartyRankExcel.java
@@ -32,11 +32,6 @@ import java.util.Date;
 @Data
 public class MetaUserPartyRankExcel {
 
-    @Excel(name = "主键")
-    private String id;
-
-    @Excel(name = "街道id")
-    private String streetId;
 
     @Excel(name = "街道名称")
     private String streetName;
@@ -68,22 +63,7 @@ public class MetaUserPartyRankExcel {
     @Excel(name = "党员认证失败数")
     private Integer partyAuthFailureCount;
 
-    @Excel(name = "删除标记")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "注册时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
+    @Excel(name = "更新时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
 
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserRegisterRankExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserRegisterRankExcel.java
index fba1d7a65..7fd0c6793 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserRegisterRankExcel.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/excel/MetaUserRegisterRankExcel.java
@@ -32,11 +32,6 @@ import java.util.Date;
 @Data
 public class MetaUserRegisterRankExcel {
 
-    @Excel(name = "主键")
-    private String id;
-
-    @Excel(name = "街道id")
-    private String streetId;
 
     @Excel(name = "街道名称")
     private String streetName;
@@ -74,22 +69,7 @@ public class MetaUserRegisterRankExcel {
     @Excel(name = "未知性别")
     private Integer unknownSexCount;
 
-    @Excel(name = "删除标记")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "注册时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
+    @Excel(name = "更新时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
 

From fa96d9ea1bd7e3ab6178d40dda729cd3aa1e494c Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Sat, 28 Mar 2020 15:07:27 +0800
Subject: [PATCH 33/38] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-prod.yml                   | 4 ++++
 .../src/main/resources/application-test.yml                   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml
index f57e18dc1..516bc46e8 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml
@@ -46,6 +46,10 @@ spring:
         url: jdbc:mysql://172.16.0.52:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
         username: epdc
         password: Elink@833066
+      twelve:  #数据源12
+        url: jdbc:mysql://172.16.0.52:3306/esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdc
+        password: Elink@833066
       initial-size: 10
       max-active: 100
       min-idle: 10
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml
index 5a5ab6e28..8c0fcdf01 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml
@@ -47,6 +47,10 @@ spring:
         url: jdbc:mysql://47.104.224.45:3308/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
         username: epdc
         password: elink833066
+      twelve:  #数据源12
+        url: jdbc:mysql://47.104.224.45:3308/esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdc
+        password: elink833066
       initial-size: 10
       max-active: 100
       min-idle: 10

From 4fb27d89427d88741287919bb0326ce6180378d3 Mon Sep 17 00:00:00 2001
From: rongchao <rongchao@elink-cn.com>
Date: Sat, 28 Mar 2020 15:59:27 +0800
Subject: [PATCH 34/38] =?UTF-8?q?api-client=E7=9A=84pom=E4=B8=AD=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8D=E7=94=A8=E7=9A=84=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/epdc-module/epdc-api/epdc-api-client/pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-client/pom.xml
index fb4e2c8d7..2e5262f42 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/pom.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/pom.xml
@@ -28,11 +28,6 @@
             <artifactId>epdc-heart-client</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.esua.epdc</groupId>
-            <artifactId>epdc-neighbor-client</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-news-client</artifactId>
@@ -43,11 +38,6 @@
             <artifactId>epdc-events-client</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.esua.epdc</groupId>
-            <artifactId>epdc-services-client</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-user-client</artifactId>

From 81f4d81420fa11856899cdd473504905e6ad64da Mon Sep 17 00:00:00 2001
From: rongchao <rongchao@elink-cn.com>
Date: Mon, 30 Mar 2020 11:23:15 +0800
Subject: [PATCH 35/38] =?UTF-8?q?=E5=A2=9E=E5=8A=A0dockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/dockerfile/Dockerfile | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100755 esua-epdc/dockerfile/Dockerfile

diff --git a/esua-epdc/dockerfile/Dockerfile b/esua-epdc/dockerfile/Dockerfile
new file mode 100755
index 000000000..9e1c30f4f
--- /dev/null
+++ b/esua-epdc/dockerfile/Dockerfile
@@ -0,0 +1,20 @@
+# 基础镜像
+FROM openjdk:8u242-jdk-buster
+# 作者
+MAINTAINER rongchao@elink-cn.com
+# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值
+ARG JAR_FILE
+# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值
+ARG JAR_NAME
+# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值
+ARG SERVER_PORT
+# 复制打包完成后的jar文件到/opt目录下
+ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar
+ADD ${JAR_FILE} $JAR_PATH
+# /data设为环境变量
+ENV DATAPATH /data
+# 挂载/data目录到主机
+VOLUME $DATAPATH
+# 启动容器时执行
+ENTRYPOINT java -jar -Xmx1024m $JAR_PATH
+EXPOSE ${SERVER_PORT}

From 274f670964f6a0ab120e5fa94da9f8827273b6e2 Mon Sep 17 00:00:00 2001
From: rongchao <rongchao@elink-cn.com>
Date: Mon, 30 Mar 2020 13:02:28 +0800
Subject: [PATCH 36/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml
index dd49e5c39..93e785b3c 100644
--- a/esua-epdc/pom.xml
+++ b/esua-epdc/pom.xml
@@ -36,7 +36,7 @@
         <docker.repostory>47.104.85.99:9002</docker.repostory>
         <dockerfile-maven-plugin.version>1.4.13</dockerfile-maven-plugin.version>
         <docker.tag>prod</docker.tag>
-        <docker.repository.prefix>registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/</docker.repository.prefix>
+        <docker.repository.prefix>registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/</docker.repository.prefix>
         <server.port>9508</server.port>
     </properties>
 

From fcf5bc35f568e0e609e5876a9966527d30ce324a Mon Sep 17 00:00:00 2001
From: rongchao <rongchao@elink-cn.com>
Date: Tue, 31 Mar 2020 11:05:41 +0800
Subject: [PATCH 37/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E8=BF=9C=E7=A8=8Btag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/epdc-admin/epdc-admin-server/pom.xml | 1 +
 esua-epdc/epdc-auth/pom.xml                    | 1 +
 esua-epdc/pom.xml                              | 6 ------
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
index cac6d48fb..25640901b 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
@@ -137,6 +137,7 @@
             <properties>
                 <server.port>9092</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
+                <docker.tag>dev</docker.tag>
 
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>
diff --git a/esua-epdc/epdc-auth/pom.xml b/esua-epdc/epdc-auth/pom.xml
index abf19149b..d5a7a67d3 100644
--- a/esua-epdc/epdc-auth/pom.xml
+++ b/esua-epdc/epdc-auth/pom.xml
@@ -106,6 +106,7 @@
             <properties>
                 <server.port>9091</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
+                <docker.tag>dev</docker.tag>
 
                 <!-- redis配置 -->
                 <spring.redis.index>2</spring.redis.index>
diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml
index 93e785b3c..a1db4d450 100644
--- a/esua-epdc/pom.xml
+++ b/esua-epdc/pom.xml
@@ -77,12 +77,6 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>com.spotify</groupId>
-                    <artifactId>dockerfile-maven-plugin</artifactId>
-                    <version>${dockerfile-maven-plugin.version}</version>
-                </plugin>
-
                 <plugin>
                     <groupId>com.spotify</groupId>
                     <artifactId>dockerfile-maven-plugin</artifactId>

From 727ea2a3e64dea03da117d75022fab670642f2e9 Mon Sep 17 00:00:00 2001
From: rongchao <rongchao@elink-cn.com>
Date: Tue, 31 Mar 2020 14:50:32 +0800
Subject: [PATCH 38/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/docker-compose/test/app/admin/docker-compose.yml      | 2 +-
 esua-epdc/docker-compose/test/app/analysis/docker-compose.yml   | 2 +-
 esua-epdc/docker-compose/test/app/api/docker-compose.yml        | 2 +-
 esua-epdc/docker-compose/test/app/auth/docker-compose.yml       | 2 +-
 esua-epdc/docker-compose/test/app/custom/docker-compose.yml     | 2 +-
 esua-epdc/docker-compose/test/app/events/docker-compose.yml     | 2 +-
 esua-epdc/docker-compose/test/app/gateway/docker-compose.yml    | 2 +-
 esua-epdc/docker-compose/test/app/group/docker-compose.yml      | 2 +-
 esua-epdc/docker-compose/test/app/heart/docker-compose.yml      | 2 +-
 esua-epdc/docker-compose/test/app/kpi/docker-compose.yml        | 2 +-
 esua-epdc/docker-compose/test/app/message/docker-compose.yml    | 2 +-
 esua-epdc/docker-compose/test/app/news/docker-compose.yml       | 2 +-
 esua-epdc/docker-compose/test/app/oss/docker-compose.yml        | 2 +-
 esua-epdc/docker-compose/test/app/user/docker-compose.yml       | 2 +-
 esua-epdc/docker-compose/test/app/webservice/docker-compose.yml | 2 +-
 esua-epdc/docker-compose/test/app/websocket/docker-compose.yml  | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/esua-epdc/docker-compose/test/app/admin/docker-compose.yml b/esua-epdc/docker-compose/test/app/admin/docker-compose.yml
index 0f2d27f7f..497085e29 100644
--- a/esua-epdc/docker-compose/test/app/admin/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/admin/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-admin-server:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-admin-server:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-admin-server:test
     container_name: epdc-admin-server-01
     ports:
       - 10001:10001
diff --git a/esua-epdc/docker-compose/test/app/analysis/docker-compose.yml b/esua-epdc/docker-compose/test/app/analysis/docker-compose.yml
index cc004bc44..0c008bf44 100644
--- a/esua-epdc/docker-compose/test/app/analysis/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/analysis/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-analysis-server:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-analysis-server:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-analysis-server:test
     container_name: epdc-analysis-server-01
     ports:
       - 10003:10003
diff --git a/esua-epdc/docker-compose/test/app/api/docker-compose.yml b/esua-epdc/docker-compose/test/app/api/docker-compose.yml
index 0d509209e..44278b637 100644
--- a/esua-epdc/docker-compose/test/app/api/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/api/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-api-server:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-api-server:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-api-server:test
     container_name: epdc-api-server-01
     ports:
       - 10004:10004
diff --git a/esua-epdc/docker-compose/test/app/auth/docker-compose.yml b/esua-epdc/docker-compose/test/app/auth/docker-compose.yml
index aac8787fa..e6da970e7 100644
--- a/esua-epdc/docker-compose/test/app/auth/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/auth/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-auth:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-auth:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-auth:test
     container_name: epdc-auth-server-01
     ports:
       - 10002:10002
diff --git a/esua-epdc/docker-compose/test/app/custom/docker-compose.yml b/esua-epdc/docker-compose/test/app/custom/docker-compose.yml
index 48ae797e1..48bbb8568 100644
--- a/esua-epdc/docker-compose/test/app/custom/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/custom/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-custom-server-01:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-custom-server:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-custom-server:test
     container_name: epdc-custom-server-01
     ports:
       - 10005:10005
diff --git a/esua-epdc/docker-compose/test/app/events/docker-compose.yml b/esua-epdc/docker-compose/test/app/events/docker-compose.yml
index b12646d79..4cb66504b 100644
--- a/esua-epdc/docker-compose/test/app/events/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/events/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-events-server:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-events-server:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-events-server:test
     container_name: epdc-events-server-01
     ports:
       - 10006:10006
diff --git a/esua-epdc/docker-compose/test/app/gateway/docker-compose.yml b/esua-epdc/docker-compose/test/app/gateway/docker-compose.yml
index ecae7f10c..79f0ef09b 100644
--- a/esua-epdc/docker-compose/test/app/gateway/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/gateway/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-gateway:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-gateway:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-gateway:test
     container_name: epdc-gateway-server-01
     ports:
       - 10000:10000
diff --git a/esua-epdc/docker-compose/test/app/group/docker-compose.yml b/esua-epdc/docker-compose/test/app/group/docker-compose.yml
index 348885883..6ada55ddd 100644
--- a/esua-epdc/docker-compose/test/app/group/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/group/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-group-server:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-group-server:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-group-server:test
     container_name: epdc-group-server-01
     ports:
       - 10007:10007
diff --git a/esua-epdc/docker-compose/test/app/heart/docker-compose.yml b/esua-epdc/docker-compose/test/app/heart/docker-compose.yml
index 8c73b0efc..0cbb13580 100644
--- a/esua-epdc/docker-compose/test/app/heart/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/heart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-heart-server:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-heart-server:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-heart-server:test
     container_name: epdc-heart-server-01
     ports:
       - 10008:10008
diff --git a/esua-epdc/docker-compose/test/app/kpi/docker-compose.yml b/esua-epdc/docker-compose/test/app/kpi/docker-compose.yml
index 0eb745bf3..7b623b685 100644
--- a/esua-epdc/docker-compose/test/app/kpi/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/kpi/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-kpi-server:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-kpi-server:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-kpi-server:test
     container_name: epdc-kpi-server-01
     ports:
       - 10009:10009
diff --git a/esua-epdc/docker-compose/test/app/message/docker-compose.yml b/esua-epdc/docker-compose/test/app/message/docker-compose.yml
index 7bf8759d0..cfaace090 100644
--- a/esua-epdc/docker-compose/test/app/message/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/message/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-message-server:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-message-server:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-message-server:test
     container_name: epdc-message-server-01
     ports:
       - 10010:10010
diff --git a/esua-epdc/docker-compose/test/app/news/docker-compose.yml b/esua-epdc/docker-compose/test/app/news/docker-compose.yml
index cf120910a..405f47ef4 100644
--- a/esua-epdc/docker-compose/test/app/news/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/news/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-news-server:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-news-server:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-news-server:test
     container_name: epdc-news-server-01
     ports:
       - 10011:10011
diff --git a/esua-epdc/docker-compose/test/app/oss/docker-compose.yml b/esua-epdc/docker-compose/test/app/oss/docker-compose.yml
index d677638c4..3940cbce8 100644
--- a/esua-epdc/docker-compose/test/app/oss/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/oss/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-oss-server:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-oss-server:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-oss-server:test
     container_name: epdc-oss-server-01
     ports:
       - 10012:10012
diff --git a/esua-epdc/docker-compose/test/app/user/docker-compose.yml b/esua-epdc/docker-compose/test/app/user/docker-compose.yml
index 8ad2e482b..f3209f6a6 100644
--- a/esua-epdc/docker-compose/test/app/user/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/user/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-user-server:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-user-server:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-user-server:test
     container_name: epdc-user-server-01
     ports:
       - 10014:10014
diff --git a/esua-epdc/docker-compose/test/app/webservice/docker-compose.yml b/esua-epdc/docker-compose/test/app/webservice/docker-compose.yml
index 77397cdea..6eb85b0ac 100644
--- a/esua-epdc/docker-compose/test/app/webservice/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/webservice/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-websocket-server:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-webservice:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-webservice:test
     container_name: epdc-webservice-01
     ports:
       - 10015:10015
diff --git a/esua-epdc/docker-compose/test/app/websocket/docker-compose.yml b/esua-epdc/docker-compose/test/app/websocket/docker-compose.yml
index b78cd6043..3fb41729c 100644
--- a/esua-epdc/docker-compose/test/app/websocket/docker-compose.yml
+++ b/esua-epdc/docker-compose/test/app/websocket/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   epdc-websocket-server:
-    image: registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-websocket-server:test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/epdc-websocket-server:test
     container_name: epdc-websocket-server-01
     ports:
       - 10016:10016