Merge branch 'dev_mq_init_customer' into dev_temp

# Conflicts:
#	epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java
#	epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java
#	epmet-module/epmet-message/epmet-message-server/pom.xml

epmet-commons/epmet-commons-rocketmq/pom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epmet-commons</artifactId>
+        <groupId>com.epmet</groupId>
+        <version>2.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epmet-commons-rocketmq</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-spring-boot-starter</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+    </dependencies>
+</project>

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java

@@ -0,0 +1,21 @@
+package com.epmet.commons.rocketmq.constants;
+
+/**
+ * 消费者组常量
+ */
+public interface ConsomerGroupConstants {
+
+    /**
+     * 初始化客户角色消费者组
+     */
+    String INIT_CUSTOMER_ROLES_GROUP = "init_customer_roles_group";
+    /**
+     * 初始化客户自定义消费者组
+     */
+    String INIT_CUSTOMER_CUSTOMIZE_GROUP = "init_customer_customize_group";
+    /**
+     * 初始化客户组织机构信息分组
+     */
+    String INIT_CUSTOMER_ORG_GROUP = "init_customer_org_group";
+
+}

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java

@@ -0,0 +1,5 @@
+package com.epmet.commons.rocketmq.constants;
+
+public interface TopicConstants {
+    String INIT_CUSTOMER = "init_customer_topic";
+}

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/InitCustomerMQMsg.java

@@ -0,0 +1,148 @@
+package com.epmet.commons.rocketmq.messages;
+
+public class InitCustomerMQMsg {
+
+    private String customerId;
+
+    private InitCustomerAgency agency;
+
+    private InitCustomerStaff staff;
+
+    public static class InitCustomerStaff {
+        private String agencyId;
+        private Integer gender;
+        private String mobile;
+        private String name;
+        private String workType;
+
+        public String getAgencyId() {
+            return agencyId;
+        }
+
+        public void setAgencyId(String agencyId) {
+            this.agencyId = agencyId;
+        }
+
+        public Integer getGender() {
+            return gender;
+        }
+
+        public void setGender(Integer gender) {
+            this.gender = gender;
+        }
+
+        public String getMobile() {
+            return mobile;
+        }
+
+        public void setMobile(String mobile) {
+            this.mobile = mobile;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getWorkType() {
+            return workType;
+        }
+
+        public void setWorkType(String workType) {
+            this.workType = workType;
+        }
+    }
+
+    public static class InitCustomerAgency {
+        private String agencyId;
+        private String organizationName;
+        private String level;
+        private String areaCode;
+        private String province;
+        private String city;
+        private String district;
+
+        public String getAgencyId() {
+            return agencyId;
+        }
+
+        public void setAgencyId(String agencyId) {
+            this.agencyId = agencyId;
+        }
+
+        public String getOrganizationName() {
+            return organizationName;
+        }
+
+        public void setOrganizationName(String organizationName) {
+            this.organizationName = organizationName;
+        }
+
+        public String getLevel() {
+            return level;
+        }
+
+        public void setLevel(String level) {
+            this.level = level;
+        }
+
+        public String getAreaCode() {
+            return areaCode;
+        }
+
+        public void setAreaCode(String areaCode) {
+            this.areaCode = areaCode;
+        }
+
+        public String getProvince() {
+            return province;
+        }
+
+        public void setProvince(String province) {
+            this.province = province;
+        }
+
+        public String getCity() {
+            return city;
+        }
+
+        public void setCity(String city) {
+            this.city = city;
+        }
+
+        public String getDistrict() {
+            return district;
+        }
+
+        public void setDistrict(String district) {
+            this.district = district;
+        }
+    }
+
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+
+    public InitCustomerAgency getAgency() {
+        return agency;
+    }
+
+    public void setAgency(InitCustomerAgency agency) {
+        this.agency = agency;
+    }
+
+    public InitCustomerStaff getStaff() {
+        return staff;
+    }
+
+    public void setStaff(InitCustomerStaff staff) {
+        this.staff = staff;
+    }
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -20,6 +20,7 @@ public enum EpmetErrorCode {
 	ERR10006(10006, "登录超时，请重新登录"),
 	ERR10007(10007, "当前帐号已在别处登录"),
 	ERR10019(10019, "验证码不正确"),
+	SYSTEM_MQ_MSG_SEND_FAIL(10020, "MQ消息发送失败"),
 	ERR401(401, "未授权"),
 	INTERNAL_VALIDATE_ERROR(7000, "内部数据校验异常"),
 	SERVER_ERROR(8000, "服务器开小差了..."),

epmet-commons/pom.xml

@@ -23,6 +23,7 @@
 		<module>epmet-commons-tools-wx-mp</module>
 		<module>epmet-commons-service-call</module>
 		<module>epmet-commons-extapp-auth</module>
+		<module>epmet-commons-rocketmq</module>
 	</modules>
 
 </project>

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AdvanceBranchRankResultDTO.java

@@ -50,4 +50,9 @@ public class AdvanceBranchRankResultDTO implements Serializable {
      * */
     private Integer projectNum;
 
+	/**
+	 * 当前name的上级组织名称 2021-01-11新增
+	 */
+	private String parentAgencyName;
+
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java

@@ -39,4 +39,9 @@ public class GovernCapacityRankResultDTO implements Serializable {
      * 满意率
      * */
     private String satisfactionRatio;
+
+    /**
+     * 当前agencyName的上一级组织名称
+     */
+    private String parentAgencyName;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java

@@ -39,4 +39,9 @@ public class GovernCapacityResultDTO implements Serializable {
      * 满意率
      * */
     private BigDecimal satisfactionRatio;
+
+    /**
+     * 当前agencyName的上一级组织名称
+     */
+    private String parentAgencyName;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java

@@ -51,4 +51,9 @@ public class OrgRankDataResultDTO implements Serializable {
      * */
     private Integer projectNum;
 
+    /**
+     * 当前name的上级组织名称 2021-01-11新增
+     */
+    private String parentAgencyName;
+
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiRankResultDTO.java

@@ -25,4 +25,6 @@ public class PublicPartiRankResultDTO implements Serializable {
     private Integer issueNum;
 
     private Integer projectNum;
+
+    private String parentAgencyName;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java

@@ -181,6 +181,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
             rank.setResolvedRatio(convertPercentStr(o.getResolvedRatio(),NumConstant.ONE));
             rank.setResponseRatio(convertPercentStr(o.getResponseRatio(),NumConstant.ONE));
             rank.setSatisfactionRatio(convertPercentStr(o.getSatisfactionRatio(),NumConstant.ONE));
+            rank.setParentAgencyName(o.getParentAgencyName());
             result.add(rank);
         });
         return result;

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml

@@ -10,7 +10,8 @@
             SUM( AGE_LEVEL_3 ) + SUM( AGE_LEVEL_4 ) AS between31And50Count,
             SUM( AGE_LEVEL_5 ) AS between51And60Count,
             SUM( AGE_LEVEL_6 ) AS above61Count,
-            SUM( PARTY_MEMBER_COUNT) AS partyTotal
+            SUM( PARTY_MEMBER_COUNT) AS partyMemberCount,
+            SUM( AGE_LEVEL_1 ) + SUM( AGE_LEVEL_2 )+SUM( AGE_LEVEL_3 ) + SUM( AGE_LEVEL_4 )+SUM( AGE_LEVEL_5 )+SUM( AGE_LEVEL_6 ) as partyTotal
         FROM
             screen_cpc_base_data
         WHERE

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml

@@ -6,19 +6,23 @@
     <!-- 查询政府治理能力各项指标 -->
     <select id="selectGovernCapacityRatio" resultType="com.epmet.evaluationindex.screen.dto.result.GovernCapacityResultDTO">
        SELECT
-            ORG_NAME AS agencyName,
-            RESPONSE_RATIO,
-            RESOLVED_RATIO,
-            GOVERN_RATIO,
-            SATISFACTION_RATIO
+            rankData.ORG_NAME AS agencyName,
+            rankData.RESPONSE_RATIO,
+            rankData.RESOLVED_RATIO,
+            rankData.GOVERN_RATIO,
+            rankData.SATISFACTION_RATIO,
+            agency.AGENCY_NAME AS parentAgencyName
         FROM
-            screen_govern_rank_data
+            screen_govern_rank_data rankData
+        LEFT JOIN
+            screen_customer_agency agency
+            ON rankData.PARENT_ID = agency.AGENCY_ID AND agency.DEL_FLAG = '0' AND agency.AGENCY_ID = #{agencyId}
         WHERE
-            DEL_FLAG = '0'
-            AND PARENT_ID = #{agencyId}
-            AND MONTH_ID = #{monthId}
+            rankData.DEL_FLAG = '0'
+            AND rankData.PARENT_ID = #{agencyId}
+            AND rankData.MONTH_ID = #{monthId}
         ORDER BY
-            (RESPONSE_RATIO + RESOLVED_RATIO + GOVERN_RATIO + SATISFACTION_RATIO) DESC,RESPONSE_RATIO DESC,RESOLVED_RATIO DESC,GOVERN_RATIO DESC,SATISFACTION_RATIO DESC
+            (rankData.RESPONSE_RATIO + rankData.RESOLVED_RATIO + rankData.GOVERN_RATIO + rankData.SATISFACTION_RATIO) DESC,rankData.RESPONSE_RATIO DESC,rankData.RESOLVED_RATIO DESC,rankData.GOVERN_RATIO DESC,rankData.SATISFACTION_RATIO DESC
     </select>
 
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml

@@ -6,28 +6,31 @@
     <!-- 查询指定机关的直属网格月度数据 -->
     <select id="selectGridDataMonthly" resultType="com.epmet.evaluationindex.screen.dto.result.OrgRankDataResultDTO">
         SELECT
-            ORG_NAME AS NAME,
-            PARTY_TOTAL AS partyMemberNum,
-            GROUP_TOTAL AS branchNum,
-            ISSUE_TOTAL AS issueNum,
-            PROJECT_TOTAL AS projectNum,
-            CLOSE_PROJECT_RATIO AS closedProjectRatio,
-            SATISFACTION_RATIO AS satisfactionRatio
+            rankData.ORG_NAME AS NAME,
+            rankData.PARTY_TOTAL AS partyMemberNum,
+            rankData.GROUP_TOTAL AS branchNum,
+            rankData.ISSUE_TOTAL AS issueNum,
+            rankData.PROJECT_TOTAL AS projectNum,
+            rankData.CLOSE_PROJECT_RATIO AS closedProjectRatio,
+            rankData.SATISFACTION_RATIO AS satisfactionRatio,
+            agency.AGENCY_NAME AS parentAgencyName
         FROM
-            screen_org_rank_data
+            screen_org_rank_data rankData
+        LEFT JOIN screen_customer_agency agency
+        ON rankData.PARENT_ID = agency.AGENCY_ID AND agency.DEL_FLAG = 0
         WHERE
-            DEL_FLAG = '0'
-            AND ORG_TYPE = 'grid'
-            AND ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
-            AND MONTH_ID = #{monthId}
+            rankData.DEL_FLAG = '0'
+            AND rankData.ORG_TYPE = 'grid'
+            AND rankData.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
+            AND rankData.MONTH_ID = #{monthId}
             ORDER BY
-            (PARTY_TOTAL + GROUP_TOTAL + ISSUE_TOTAL + PROJECT_TOTAL + CLOSE_PROJECT_RATIO + SATISFACTION_RATIO) DESC,
-            PARTY_TOTAL DESC,
-            GROUP_TOTAL DESC,
-            ISSUE_TOTAL DESC,
-            PROJECT_TOTAL DESC,
-            CLOSE_PROJECT_RATIO DESC,
-            SATISFACTION_RATIO DESC
+            (rankData.PARTY_TOTAL + rankData.GROUP_TOTAL + rankData.ISSUE_TOTAL + rankData.PROJECT_TOTAL + rankData.CLOSE_PROJECT_RATIO + rankData.SATISFACTION_RATIO) DESC,
+            rankData.PARTY_TOTAL DESC,
+            rankData.GROUP_TOTAL DESC,
+            rankData.ISSUE_TOTAL DESC,
+            rankData.PROJECT_TOTAL DESC,
+            rankData.CLOSE_PROJECT_RATIO DESC,
+            rankData.SATISFACTION_RATIO DESC
 
     </select>
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml

@@ -15,5 +15,8 @@
         WHERE
             md.del_flag = '0'
             AND md.parent_id = #{agencyId}
+
+            AND md.ORG_TYPE =
+            CASE WHEN sca.LEVEL = 'community' THEN 'grid' ELSE 'agency' END
     </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPublicPartiTotalDataDao.xml

@@ -6,24 +6,29 @@
     <!-- 查询公众参与各类总数 -->
     <select id="selectPublicPartiTotal" resultType="com.epmet.evaluationindex.screen.dto.result.PublicPartiRankResultDTO">
         SELECT
-            ORG_NAME AS NAME,
-            REG_USER_TOTAL AS regNum,
-            JOIN_USER_TOTAL AS joinNum,
-            TOPIC_TOTAL AS topicNum,
-            ISSUE_TOTAL AS issueNum,
-            PROJECT_TOTAL AS projectNum
+            totalData.ORG_NAME AS NAME,
+            totalData.REG_USER_TOTAL AS regNum,
+            totalData.JOIN_USER_TOTAL AS joinNum,
+            totalData.TOPIC_TOTAL AS topicNum,
+            totalData.ISSUE_TOTAL AS issueNum,
+            totalData.PROJECT_TOTAL AS projectNum,
+            agency.AGENCY_NAME AS parentAgencyName
         FROM
-                screen_public_parti_total_data
+                screen_public_parti_total_data totalData
+         LEFT JOIN
+                screen_customer_agency agency
+                ON totalData.PARENT_ID = agency.AGENCY_ID
+                AND agency.DEL_FLAG = '0' AND agency.AGENCY_ID = #{agencyId}
         WHERE
-                DEL_FLAG = '0'
-                AND PARENT_ID =  #{agencyId}
+                totalData.DEL_FLAG = '0'
+                AND totalData.PARENT_ID =  #{agencyId}
          ORDER BY
-         (REG_USER_TOTAL + JOIN_USER_TOTAL + TOPIC_TOTAL + ISSUE_TOTAL + PROJECT_TOTAL) DESC,
-                REG_USER_TOTAL desc,
-                JOIN_USER_TOTAL desc,
-                TOPIC_TOTAL desc,
-                ISSUE_TOTAL desc,
-                PROJECT_TOTAL desc
+         (totalData.REG_USER_TOTAL + totalData.JOIN_USER_TOTAL + totalData.TOPIC_TOTAL + totalData.ISSUE_TOTAL + totalData.PROJECT_TOTAL) DESC,
+                totalData.REG_USER_TOTAL desc,
+                totalData.JOIN_USER_TOTAL desc,
+                totalData.TOPIC_TOTAL desc,
+                totalData.ISSUE_TOTAL desc,
+                totalData.PROJECT_TOTAL desc
     </select>
 
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -20,7 +20,6 @@ import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
-import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyEntity;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityGridMonthlyEntity;
@@ -47,7 +46,6 @@ import org.springframework.web.bind.annotation.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -664,12 +662,21 @@ public class DemoController {
     @Autowired
     private PublicPartiTotalDataExtractService publicPartiTotalDataExtractService;
     @PostMapping("insertScreenPioneerData")
-    public Result insertScreenPioneerData(@RequestParam("customerId") String customerId, @RequestParam("dateId") String dateId) {
+    public Result insertScreenPioneerData(@RequestParam("customerId") String customerId, @RequestParam("dateId") String dateId,@RequestParam("type") String type) {
         if (StringUtils.isNotBlank(customerId) && StringUtils.isNotBlank(dateId)) {
+            if ("grid".equals(type)) {
                 pioneerDataExtractService.extractGridPioneerData(customerId, dateId);
+            } else if ("community".equals(type)) {
                 pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId);
+            } else if ("exceptcommunity".equals(type)) {
                 pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId);
             } else {
+                pioneerDataExtractService.extractGridPioneerData(customerId, dateId);
+                pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId);
+                pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId);
+            }
+        }
+        /*else {
             QueryWrapper<DimCustomerEntity> customerEntityQueryWrapper = new QueryWrapper<>();
             List<DimCustomerEntity> customerEntityList = dimCustomerDao.selectList(customerEntityQueryWrapper);
             for (DimCustomerEntity customerEntity : customerEntityList) {
@@ -677,8 +684,8 @@ public class DemoController {
                 pioneerDataExtractService.extractCommunityPioneerData(customerEntity.getId(), "20200926");
                 pioneerDataExtractService.extractExceptCommunityPioneerData(customerEntity.getId(), "20200926");
             }
-        }
-        return new Result();
+        }*/
+        return new Result().ok("调用成功");
     }
 
     @PostMapping("extractPublicPartiTotalData")

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java

@@ -1,5 +1,7 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
@@ -11,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 
 /**
  * 原始数据清洗
@@ -114,7 +118,15 @@ public class FactOriginExtractController {
      **/
     @PostMapping("groupdatacleaning")
     public Result groupDataCleaning(@RequestBody ExtractOriginFormDTO param) {
-        groupExtractService.extractGroupData(param);
+        if(StringUtils.isNotBlank(param.getStartDate()) && StringUtils.isNotBlank(param.getEndDate())){
+            List<String> finalDaysBetween = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate());
+            ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
+            for (int i = 0; i < finalDaysBetween.size(); i++) {
+                String dateDimId = finalDaysBetween.get(i);
+                paramNew.setDateId(dateDimId);
+                groupExtractService.extractGroupData(paramNew);
+            }
+        }else groupExtractService.extractGroupData(param);
         return new Result();
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java

@@ -18,13 +18,11 @@
 package com.epmet.dao.evaluationindex.extract;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.extract.form.ScreenPartyLinkMassesDataFormDTO;
-import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
-import com.epmet.dto.extract.result.PartyCreateGroupCountResultDTO;
 import com.epmet.dto.extract.FactOriginGroupMainDailyDTO;
 import com.epmet.dto.extract.form.GridHeartedFormDTO;
 import com.epmet.dto.extract.form.ScreenPartyLinkMassesDataFormDTO;
 import com.epmet.dto.extract.result.GridGroupUserCountResultDTO;
+import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.extract.result.PartyCreateGroupCountResultDTO;
 import com.epmet.dto.group.result.ExtractGroupMemberActionRecordResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity;
@@ -164,12 +162,11 @@ public interface FactOriginGroupMainDailyDao extends BaseDao<FactOriginGroupMain
 
     /**
      * @param customerId
-     * @param monthId
      * @Description 查询党员建组信息
      * @author zxc
      * @date 2020/9/25 9:46 上午
      */
-    List<ScreenPartyLinkMassesDataFormDTO> selectPartyCreateGroupInfo(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("gridIds") List<String> gridIds);
+    List<ScreenPartyLinkMassesDataFormDTO> selectPartyCreateGroupInfo(@Param("customerId") String customerId, @Param("gridIds") List<String> gridIds);
 
     /**
      * desc: 获取所有网格的组中成员人数 去重

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java

@@ -68,12 +68,11 @@ public interface FactOriginGroupMainDailyService extends BaseService<FactOriginG
 
     /**
      * @param customerId
-     * @param monthId
      * @Description 查询党员建组信息
      * @author zxc
      * @date 2020/9/25 9:46 上午
      */
-    List<ScreenPartyLinkMassesDataFormDTO> selectPartyCreateGroupInfo(String customerId, String monthId, List<String> gridIds);
+    List<ScreenPartyLinkMassesDataFormDTO> selectPartyCreateGroupInfo(String customerId, List<String> gridIds);
 
     /**
      * desc: 获取客户下每个网格小组内的 去重人数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java

@@ -21,8 +21,8 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dao.evaluationindex.extract.FactOriginGroupMainDailyDao;
 import com.epmet.dto.extract.FactOriginGroupMainDailyDTO;
 import com.epmet.dto.extract.form.ScreenPartyLinkMassesDataFormDTO;
-import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.extract.result.GridGroupUserCountResultDTO;
+import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.group.result.ExtractGroupMemberActionRecordResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginGroupMainDailyService;
@@ -85,19 +85,21 @@ public class FactOriginGroupMainDailyServiceImpl extends BaseServiceImpl<FactOri
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean insertExtractedData(boolean isFirst, String customerId, String dateId,List<FactOriginGroupMainDailyDTO> originGroupData, List<ExtractGroupMemberActionRecordResultDTO> memberList,List<String> missing) {
+        if(!CollectionUtils.isEmpty(originGroupData)) {
             if (isFirst) {
                 //isFirst
-            baseDao.deleteBatchMemberByCustomerId(customerId,null,null);
+                baseDao.deleteBatchMemberByCustomerId(customerId, null, null);
             } else {
-            if(StringUtils.isNotBlank(dateId)){
-                baseDao.deleteBatchMemberByCustomerId(customerId,dateId,"date");
+                if (StringUtils.isNotBlank(dateId)) {
+                    baseDao.deleteBatchMemberByCustomerId(customerId, dateId, "date");
                 }
             }
             //删除要插入的组主表数据
-        baseDao.deleteBatchByGroupId(customerId,originGroupData.stream().map(FactOriginGroupMainDailyDTO :: getId).distinct().collect(Collectors.toList()));
+            baseDao.deleteBatchByGroupId(customerId, originGroupData.stream().map(FactOriginGroupMainDailyDTO::getId).distinct().collect(Collectors.toList()));
 
             baseDao.insertBatchMain(originGroupData);
             baseDao.insertBatchMembers(memberList);
+        }
         if(!CollectionUtils.isEmpty(missing)){
             baseDao.deleteBatchByGroupId(customerId,missing);
             baseDao.deleteMemberByGroupList(customerId,missing);
@@ -106,16 +108,15 @@ public class FactOriginGroupMainDailyServiceImpl extends BaseServiceImpl<FactOri
     }
 
     /**
-     * @Description  查询党员建组信息
      * @param customerId
-     * @param monthId
+     * @Description 查询党员建组信息
      * @author zxc
      * @date 2020/9/25 9:46 上午
      */
     @Override
-    public List<ScreenPartyLinkMassesDataFormDTO> selectPartyCreateGroupInfo(String customerId, String monthId, List<String> gridIds) {
+    public List<ScreenPartyLinkMassesDataFormDTO> selectPartyCreateGroupInfo(String customerId, List<String> gridIds) {
         if (!CollectionUtils.isEmpty(gridIds)) {
-            return baseDao.selectPartyCreateGroupInfo(customerId, monthId, gridIds);
+            return baseDao.selectPartyCreateGroupInfo(customerId, gridIds);
         }
         return new ArrayList<>();
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.service.evaluationindex.extract.todata.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -84,10 +85,10 @@ public class GroupExtractServiceImpl implements GroupExtractService {
         List<FactOriginGroupMainDailyDTO> originGroupData = groupDataService.extractGroupData(
                 count <= NumConstant.ZERO,
                 param.getCustomerId(), param.getDateId());
-
+        log.info("extractGroupData extractGroupData:result:{},param:{}", JSON.toJSONString(originGroupData), JSON.toJSONString(param));
         List<ExtractGroupMemberActionRecordResultDTO> memberList = new LinkedList<>();
         if (!CollectionUtils.isEmpty(originGroupData)) {
-        List<GridAttributesResultDTO> gridList = dimGridService.getGridAttributes(param.getCustomerId(),originGroupData.stream().map(FactOriginGroupMainDailyDTO::getGridId).distinct().collect(Collectors.toList()));
+        List<GridAttributesResultDTO> gridList = dimGridService.getGridAttributes(param.getCustomerId(),null);
 
         if (!CollectionUtils.isEmpty(gridList)) {
             Map<String, GridAttributesResultDTO> gridMap =
@@ -160,7 +161,7 @@ public class GroupExtractServiceImpl implements GroupExtractService {
 
 
             factOriginGroupMainDailyService.insertExtractedData(
-                    count <= NumConstant.ZERO ? true : false,
+                    count <= NumConstant.ZERO,
                     param.getCustomerId(),
                     param.getDateId(),
                     originGroupData,

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/IssueExtractServiceImpl.java

@@ -22,6 +22,7 @@ import com.epmet.service.evaluationindex.extract.todata.IssueExtractService;
 import com.epmet.service.topic.TopicService;
 import com.epmet.service.user.UserService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -129,7 +130,11 @@ public class IssueExtractServiceImpl implements IssueExtractService {
             agencyInfoList.forEach(pid -> {
                 if (r.getAgencyId().equals(pid.getAgencyId())){
                     r.setPid(pid.getPid());
+                    if (StringUtils.isNotBlank(pid.getPids())) {
                         r.setPids(pid.getPids().concat(":").concat(r.getAgencyId()));
+                    } else {
+                        r.setPids(r.getAgencyId());
+                    }
                 }
             });
         });
@@ -231,7 +236,11 @@ public class IssueExtractServiceImpl implements IssueExtractService {
             agencyInfoList.forEach(agency -> {
                 if (r.getAgencyId().equals(agency.getAgencyId())){
                     r.setPid(agency.getPid());
+                    if(StringUtils.isNotBlank(agency.getPids())){
                         r.setPids(agency.getPids().concat(":").concat(r.getAgencyId()));
+                    }else{
+                        r.setPids(r.getAgencyId());
+                    }
                 }
             });
         });

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java

@@ -129,7 +129,8 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService {
                     form.setAgeLevel4(party.stream().collect(Collectors.summingInt(PartyBaseInfoFormDTO::getAgeLevel4)));
                     form.setAgeLevel5(party.stream().collect(Collectors.summingInt(PartyBaseInfoFormDTO::getAgeLevel5)));
                     form.setAgeLevel6(party.stream().collect(Collectors.summingInt(PartyBaseInfoFormDTO::getAgeLevel6)));
-                    form.setPartyMemberCount(party.stream().collect(Collectors.summingInt(PartyBaseInfoFormDTO::getPartyMemberCount)));
+//                    form.setPartyMemberCount(party.stream().collect(Collectors.summingInt(PartyBaseInfoFormDTO::getPartyMemberCount)));
+                    form.setPartyMemberCount(calPartyMemberCount(form));
                     form.setResiTotal(party.stream().collect(Collectors.summingInt(PartyBaseInfoFormDTO::getResiTotal)));
                     form.setRegisterUserCount(party.stream().collect(Collectors.summingInt(PartyBaseInfoFormDTO::getRegisterUserCount)));
                     result.add(form);
@@ -175,6 +176,7 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService {
                                 form.setAgeLevel4(disposeAgeArea(partyInfos,NumConstant.FORTY_ONE,NumConstant.FIFTY));
                                 form.setAgeLevel5(disposeAgeArea(partyInfos,NumConstant.FIFTY_ONE,NumConstant.SIXTY));
                                 form.setAgeLevel6(disposeAge(partyInfos,NumConstant.SIXTY,true));
+                                form.setPartyMemberCount(calPartyMemberCount(form));
                                 form.setCustomerId(customerId);
                                 form.setDataEndTime(dateId);
                                 form.setParentId(partyInfos.get(NumConstant.ZERO).getAgencyId());
@@ -183,7 +185,7 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService {
                                         if (gridId.equals(user.getOrgId())){
                                             form.setResiTotal(user.getResiTotal());
                                             form.setRegisterUserCount(user.getRegisterUserCount());
-                                            form.setPartyMemberCount(user.getPartyMemberCount());
+//                                            form.setPartyMemberCount(user.getPartyMemberCount());
                                         }
                                     });
                                 }
@@ -210,7 +212,8 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService {
                         form.setAgeLevel4(partyInfoList.stream().collect(Collectors.summingInt(PartyInfoResultDTO::getAgeLevel4)));
                         form.setAgeLevel5(partyInfoList.stream().collect(Collectors.summingInt(PartyInfoResultDTO::getAgeLevel5)));
                         form.setAgeLevel6(partyInfoList.stream().collect(Collectors.summingInt(PartyInfoResultDTO::getAgeLevel6)));
-                        form.setPartyMemberCount(partyInfoList.stream().collect(Collectors.summingInt(PartyInfoResultDTO::getPartyMemberCount)));
+//                        form.setPartyMemberCount(partyInfoList.stream().collect(Collectors.summingInt(PartyInfoResultDTO::getPartyMemberCount)));
+                        form.setPartyMemberCount(calPartyMemberCount(form));
                         form.setResiTotal(partyInfoList.stream().collect(Collectors.summingInt(PartyInfoResultDTO::getResiTotal)));
                         form.setRegisterUserCount(partyInfoList.stream().collect(Collectors.summingInt(PartyInfoResultDTO::getRegisterUserCount)));
                         result.add(form);
@@ -361,6 +364,7 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService {
                 form.setAgeLevel3(disposeAgeArea(partyInfos,NumConstant.THIRTY_ONE,NumConstant.FORTY));
                 form.setAgeLevel4(disposeAgeArea(partyInfos,NumConstant.FORTY_ONE,NumConstant.FIFTY));
                 form.setAgeLevel5(disposeAgeArea(partyInfos,NumConstant.FIFTY_ONE,NumConstant.SIXTY));
+                form.setPartyMemberCount(calPartyMemberCount(form));
                 form.setAgeLevel6(disposeAge(partyInfos,NumConstant.SIXTY,true));
                 form.setCustomerId(customerId);
                 form.setDataEndTime(dateId);
@@ -370,7 +374,7 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService {
                         if (gridId.equals(user.getOrgId())){
                             form.setResiTotal(user.getResiTotal());
                             form.setRegisterUserCount(user.getRegisterUserCount());
-                            form.setPartyMemberCount(user.getPartyMemberCount());
+//                            form.setPartyMemberCount(user.getPartyMemberCount());
                         }
                     });
                 }
@@ -379,4 +383,9 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService {
         }
         return new GridPartyDTO(orgIds, result);
     }
+
+    public Integer calPartyMemberCount(PartyBaseInfoFormDTO form){
+        Integer result = form.getAgeLevel1() + form.getAgeLevel2() + form.getAgeLevel3() + form.getAgeLevel4() + form.getAgeLevel5() + form.getAgeLevel6();
+        return result;
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyGuideServiceImpl.java

@@ -1,11 +1,9 @@
 package com.epmet.service.evaluationindex.extract.toscreen.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.ScreenConstant;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
-import com.epmet.dto.extract.form.ScreenExtractFormDTO;
 import com.epmet.dto.extract.form.ScreenPartyBranchDataFormDTO;
 import com.epmet.dto.extract.form.ScreenPartyLinkMassesDataFormDTO;
 import com.epmet.dto.extract.result.*;
@@ -185,22 +183,22 @@ public class PartyGuideServiceImpl implements PartyGuideService {
         // 判断当前级别agency是否为空
         if (!CollectionUtils.isEmpty(agencyIdList)){
             // 获取agencyIds
-            List<String> orgIds = agencyIdList.stream().map(m -> m.getAgencyId()).collect(Collectors.toList());
-            if (isGrid == true){
+            List<String> orgIds = agencyIdList.stream().map(CustomerAgencyInfoResultDTO::getAgencyId).collect(Collectors.toList());
+            if (isGrid) {
                 agencyIdList.forEach(agency -> {
                     // 计算社区级别的下级（实际就是网格）
-                    GridPartyGuideDTO gridPartyGuideDTO = communityLevelSubGrid(customerId, monthId, agency);
+                    GridPartyGuideDTO gridPartyGuideDTO = communityLevelSubGrid(customerId, agency);
                     orgIds.addAll(gridPartyGuideDTO.getOrgIds());
                     result.addAll(gridPartyGuideDTO.getResult());
                 });
                 // 根据agencyId分组，计算各个社区的
                 Map<String, List<ScreenPartyLinkMassesDataFormDTO>> groupByAgency = result.stream().collect(Collectors.groupingBy(ScreenPartyLinkMassesDataFormDTO::getParentId));
-                groupByAgency.forEach((agencyId,gridList) -> {
+                groupByAgency.forEach((agencyId, gridList) -> {
                     ScreenPartyLinkMassesDataFormDTO form = new ScreenPartyLinkMassesDataFormDTO();
                     List<OrgNameResultDTO> orgNameAgencyList = agencyService.selectOrgNameAgency(orgIds);
                     if (!CollectionUtils.isEmpty(orgNameAgencyList)){
                         orgNameAgencyList.forEach(name -> {
-                            if (agencyId.equals(name.getAgencyId())){
+                            if (agencyId.equals(name.getAgencyId())) {
                                 form.setOrgName(name.getAgencyName());
                                 form.setParentId(name.getParentId());
                             }
@@ -210,8 +208,8 @@ public class PartyGuideServiceImpl implements PartyGuideService {
                     form.setCustomerId(customerId);
                     form.setDataEndTime(monthId);
                     form.setOrgType(ScreenConstant.AGENCY);
-                    form.setCreateGroupTotal(gridList.stream().collect(Collectors.summingInt(ScreenPartyLinkMassesDataFormDTO::getCreateGroupTotal)));
-                    form.setGroupUserTotal(gridList.stream().collect(Collectors.summingInt(ScreenPartyLinkMassesDataFormDTO::getGroupUserTotal)));
+                    form.setCreateGroupTotal(gridList.stream().mapToInt(ScreenPartyLinkMassesDataFormDTO::getCreateGroupTotal).sum());
+                    form.setGroupUserTotal(gridList.stream().mapToInt(ScreenPartyLinkMassesDataFormDTO::getGroupUserTotal).sum());
                     result.add(form);
                 });
                 delAndInsertLink(result,customerId,monthId,orgIds);
@@ -227,15 +225,15 @@ public class PartyGuideServiceImpl implements PartyGuideService {
                         }
                     });
                     // 不为空 存在直属网格
-                    if (!CollectionUtils.isEmpty(disGridIds)){
+                    if (!CollectionUtils.isEmpty(disGridIds)) {
                         List<ScreenPartyLinkMassesDataFormDTO> gridResult = new ArrayList<>();
                         // 查询党员创建组，组内成员数
-                        List<ScreenPartyLinkMassesDataFormDTO> partyLinkMassesDataList = groupMainService.selectPartyCreateGroupInfo(customerId, monthId, disGridIds);
-                        List<OrgNameResultDTO> orgNameList = agencyService.selectOrgNameGrid(partyLinkMassesDataList.stream().map(m -> m.getOrgId()).collect(Collectors.toList()));
-                        if (!CollectionUtils.isEmpty(partyLinkMassesDataList)){
+                        List<ScreenPartyLinkMassesDataFormDTO> partyLinkMassesDataList = groupMainService.selectPartyCreateGroupInfo(customerId, disGridIds);
+                        List<OrgNameResultDTO> orgNameList = agencyService.selectOrgNameGrid(partyLinkMassesDataList.stream().map(ScreenPartyLinkMassesDataFormDTO::getOrgId).collect(Collectors.toList()));
+                        if (!CollectionUtils.isEmpty(partyLinkMassesDataList)) {
                             partyLinkMassesDataList.forEach(party -> {
                                 orgNameList.forEach(org -> {
-                                    if (party.getOrgId().equals(org.getGridId())){
+                                    if (party.getOrgId().equals(org.getGridId())) {
                                         party.setOrgName(org.getGridName());
                                     }
                                 });
@@ -246,10 +244,10 @@ public class PartyGuideServiceImpl implements PartyGuideService {
                         delAndInsertLink(gridResult,customerId,monthId,disGridIds);
                     }
                     // 查询直属网格的信息 + 下级机关的信息 = agency的机关信息
-                    List<ScreenPartyLinkMassesDataFormDTO> screenPartyLinkMassesDataGrid = groupMainService.selectPartyCreateGroupInfo(customerId, monthId, disGridIds);
+                    List<ScreenPartyLinkMassesDataFormDTO> screenPartyLinkMassesDataGrid = groupMainService.selectPartyCreateGroupInfo(customerId, disGridIds);
                     List<ScreenPartyLinkMassesDataFormDTO> screenPartyLinkMassesDataList = linkMassesDataService.selectPartyLinkMassesInfo(customerId, monthId, agencyId);
                     screenPartyLinkMassesDataList.addAll(screenPartyLinkMassesDataGrid);
-                    if (!CollectionUtils.isEmpty(screenPartyLinkMassesDataList)){
+                    if (!CollectionUtils.isEmpty(screenPartyLinkMassesDataList)) {
                         ScreenPartyLinkMassesDataFormDTO form = new ScreenPartyLinkMassesDataFormDTO();
                         form.setOrgId(agencyId);
                         form.setOrgType(ScreenConstant.AGENCY);
@@ -257,8 +255,8 @@ public class PartyGuideServiceImpl implements PartyGuideService {
                         form.setCustomerId(customerId);
                         form.setDataEndTime(monthId);
                         form.setParentId(screenPartyLinkMassesDataList.get(NumConstant.ZERO).getParentId());
-                        form.setGroupUserTotal(screenPartyLinkMassesDataList.stream().collect(Collectors.summingInt(ScreenPartyLinkMassesDataFormDTO::getGroupUserTotal)));
-                        form.setCreateGroupTotal(screenPartyLinkMassesDataList.stream().collect(Collectors.summingInt(ScreenPartyLinkMassesDataFormDTO::getCreateGroupTotal)));
+                        form.setGroupUserTotal(screenPartyLinkMassesDataList.stream().mapToInt(ScreenPartyLinkMassesDataFormDTO::getGroupUserTotal).sum());
+                        form.setCreateGroupTotal(screenPartyLinkMassesDataList.stream().mapToInt(ScreenPartyLinkMassesDataFormDTO::getCreateGroupTotal).sum());
                         result.add(form);
                     }
                 });
@@ -433,22 +431,21 @@ public class PartyGuideServiceImpl implements PartyGuideService {
     /**
      * @Description 社区级别的处理
      * @Param customerId
-     * @Param monthId
      * @Param agency
      * @author zxc
      * @date 2020/9/25 10:06 上午
      */
-    public GridPartyGuideDTO communityLevelSubGrid(String customerId, String monthId, CustomerAgencyInfoResultDTO agency){
+    public GridPartyGuideDTO communityLevelSubGrid(String customerId, CustomerAgencyInfoResultDTO agency) {
         String agencyId = agency.getAgencyId();
         // 获取下级所有agencyId【根据agencyMap中的level判断下级orgId是否是gridId】(此处直接作为gridId)
         Map<String, Object> agencyMap = agencyService.selectAllSubAgencyId(agencyId, customerId);
         List<String> gridIds = (List<String>) agencyMap.get(agencyId);
-        List<ScreenPartyLinkMassesDataFormDTO> partyLinkMassesDataList = groupMainService.selectPartyCreateGroupInfo(customerId, monthId, gridIds);
+        List<ScreenPartyLinkMassesDataFormDTO> partyLinkMassesDataList = groupMainService.selectPartyCreateGroupInfo(customerId, gridIds);
         List<String> orgIds = partyLinkMassesDataList.stream().map(m -> m.getOrgId()).collect(Collectors.toList());
         List<OrgNameResultDTO> orgNameList = agencyService.selectOrgNameGrid(orgIds);
         partyLinkMassesDataList.forEach(party -> {
             orgNameList.forEach(orgName -> {
-                if (party.getOrgId().equals(orgName.getGridId())){
+                if (party.getOrgId().equals(orgName.getGridId())) {
                     party.setOrgName(orgName.getGridName());
                 }
             });

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PioneerDataExtractServiceImpl.java

@@ -66,56 +66,65 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             //何为参与： 议题的表决行为次数总计
             //1、党员参与议事
             entity.setIssueTotal(calPartyPartiIssueTotal(customerId,gridId,null,null,NumConstant.ONE_STR));
+            log.info("extractGridPioneerData 当前网格id=" + gridId + ";党员参与议事issueTotal="+entity.getIssueTotal());
             if(entity.getIssueTotal()==0){
                 entity.setIssueRatio(BigDecimal.ZERO);
             }else{
                 //2、党员参与议事占比
                 int issueTotal=calPartyPartiIssueTotal(customerId,gridId,null,null,null);
-                BigDecimal issueRatio=new BigDecimal(entity.getIssueTotal()/issueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
+                log.info("extractGridPioneerData 当前网格id=" + gridId + ";参与议事总数issueTotal=" + issueTotal);
+                BigDecimal issueRatio = new BigDecimal((double) entity.getIssueTotal() / issueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
+                log.info("extractGridPioneerData 当前网格id=" + gridId + ";issueRatio=" + issueRatio);
                 entity.setIssueRatio(issueRatio.setScale(NumConstant.SIX,RoundingMode.HALF_UP));
             }
 
             //3、党员发布话题:
             entity.setTopicTotal(getTopicTotal(customerId, gridId, null));
+            log.info("extractGridPioneerData 当前网格id=" + gridId + ";党员发布话题topicTotal"+entity.getTopicTotal());
             //4、党员发布话题占比: 网格内注册党员发布的话题总数占  网格内话题总数的 比率
             if (entity.getTopicTotal() == NumConstant.ZERO) {
                 entity.setTopicRatio(BigDecimal.ZERO);
             } else {
                 //当前网格内所有话题总数
                 int gridTopicTotal = getGridOrCommunityTopicTotal(customerId, gridId, null);
+                log.info("extractGridPioneerData 当前网格id=" + gridId + ";当前网格内所有话题总数gridTopicTotal="+gridTopicTotal);
                 if(gridTopicTotal == NumConstant.ZERO){
                     entity.setTopicRatio(BigDecimal.ZERO);
                 }else{
-                    BigDecimal topicRatio=new BigDecimal(entity.getTopicTotal() / gridTopicTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
+                    BigDecimal topicRatio = new BigDecimal((double) entity.getTopicTotal() / gridTopicTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
+                    log.info("extractGridPioneerData 当前网格id=" + gridId + ";党员发布话题占比topicRatio="+topicRatio);
                     entity.setTopicRatio(topicRatio.setScale(NumConstant.SIX, RoundingMode.HALF_UP));
                 }
             }
 
             //当前网格内所有议题总数
             int gridIssueTotal = getGridOrCommunityIssueTotal(customerId, gridId, null);
+            log.info("extractGridPioneerData 当前网格id=" + gridId + ";当前网格内所有议题总数=" + gridIssueTotal);
             if (gridIssueTotal != NumConstant.ZERO) {
                 //5、党员发布议题
                 entity.setPublishIssueTotal(getParyPublishIssueTotal(customerId, gridId, null));
+                log.info("extractGridPioneerData 当前网格id=" + gridId + ";党员发布议题publishIssueTotal"+entity.getPublishIssueTotal());
                 //6、党员发布议题占比 :  占网格内所有议题的比率
                 if (entity.getPublishIssueTotal() == NumConstant.ZERO) {
                     entity.setPublishIssueRatio(BigDecimal.ZERO);
                 }else{
-                    BigDecimal publishIssueRatio=new BigDecimal(entity.getPublishIssueTotal() / gridIssueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
+                    BigDecimal publishIssueRatio=new BigDecimal((double)entity.getPublishIssueTotal() / gridIssueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
                     entity.setPublishIssueRatio(publishIssueRatio.setScale(NumConstant.SIX, RoundingMode.HALF_UP));
                 }
 
                 //7、议题转项目数
                 entity.setShiftProjectTotal(getGridOrCommunityShiftProjectTotal(customerId, gridId, null));
+                log.info("extractGridPioneerData 当前网格id=" + gridId +";议题转项目数shiftProjectTotal="+entity.getShiftProjectTotal());
                 //8、议题转项目占比 : 占网格内议题总数的比率
                 if(entity.getShiftProjectTotal() == NumConstant.ZERO){
                     entity.setShiftProjectRatio(BigDecimal.ZERO);
                 }else{
-                    BigDecimal shiftProjectRatio=new BigDecimal(entity.getShiftProjectTotal() / gridIssueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
+                    BigDecimal shiftProjectRatio = new BigDecimal((double) entity.getShiftProjectTotal() / gridIssueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
                     entity.setShiftProjectRatio(shiftProjectRatio.setScale(NumConstant.SIX, RoundingMode.HALF_UP));
                 }
 
             }else{
-//                log.info("当前网格内所有议题总数="+gridIssueTotal);
+               log.info("extractGridPioneerData 当前网格id="+gridId+";当前网格内所有议题总数 gridIssueTotal =0 ");
                 entity.setPublishIssueTotal(NumConstant.ZERO);
                 entity.setPublishIssueRatio(BigDecimal.ZERO);
                 entity.setShiftProjectTotal(NumConstant.ZERO);
@@ -125,15 +134,17 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
 
             // 9、已解决项目
             entity.setResolvedProjectTotal(getGridOrCommunityClosedProjectTotal(customerId, gridId, null, DimObjectStatusConstant.RESOLVED));
+            log.info("extractGridPioneerData 当前网格id="+gridId+";已解决项目resolvedProjectTotal="+entity.getResolvedProjectTotal());
             if (entity.getResolvedProjectTotal() == NumConstant.ZERO) {
                 entity.setResolvedProjectRatio(BigDecimal.ZERO);
             } else {
                 // 10、占总结项目
                 int closedProjectTotal = getGridOrCommunityClosedProjectTotal(customerId, gridId, null, null);
+                log.info("extractGridPioneerData 当前网格id="+gridId+";总结项目closedProjectTotal="+closedProjectTotal);
                 if(closedProjectTotal == NumConstant.ZERO){
                     entity.setResolvedProjectRatio(BigDecimal.ZERO);
                 }else {
-                    BigDecimal resolvedProjectRatio=new BigDecimal(entity.getResolvedProjectTotal() / closedProjectTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
+                    BigDecimal resolvedProjectRatio = new BigDecimal((double) entity.getResolvedProjectTotal() / closedProjectTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
                     entity.setResolvedProjectRatio(resolvedProjectRatio.setScale(NumConstant.SIX, RoundingMode.HALF_UP));
                 }
             }
@@ -172,42 +183,49 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             String communityId = entity.getOrgId();
             //1、党员参与议事
             entity.setIssueTotal(calPartyPartiIssueTotal(customerId,null,communityId,null,NumConstant.ONE_STR));
+            log.info("extractCommunityPioneerData 当前communityId="+communityId+";党员参与议事issueTotal="+entity.getIssueTotal());
             if(entity.getIssueTotal()==0){
                 entity.setIssueRatio(BigDecimal.ZERO);
             }else{
                 //2、党员参与议事占比
                 int issueTotal=calPartyPartiIssueTotal(customerId,null,communityId,null,null);
-                entity.setIssueRatio(new BigDecimal(entity.getIssueTotal()/issueTotal).setScale(NumConstant.SIX,RoundingMode.HALF_UP));
+                log.info("extractCommunityPioneerData 当前communityId="+communityId+";参与议事总数issueTotal="+issueTotal);
+                entity.setIssueRatio(new BigDecimal((double)entity.getIssueTotal()/issueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX,RoundingMode.HALF_UP));
             }
 
             //3、党员发布话题:
             entity.setTopicTotal(getTopicTotal(customerId, null, communityId));
+            log.info("extractCommunityPioneerData 当前communityId="+communityId+";党员发布话题topicTotal="+entity.getTopicTotal());
             //4、党员发布话题占比: 社区内注册党员发布的话题总数占  社区内话题总数的 比率
             if (entity.getTopicTotal() == NumConstant.ZERO) {
                 entity.setTopicRatio(BigDecimal.ZERO);
             } else {
                 //当前社区内所有话题总数
                 int communityTopicTotal = getGridOrCommunityTopicTotal(customerId, null, communityId);
-                entity.setTopicRatio(communityTopicTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(entity.getTopicTotal() / communityTopicTotal).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                log.info("extractCommunityPioneerData 当前communityId="+communityId+";当前社区内所有话题总数communityTopicTotal="+communityTopicTotal);
+                entity.setTopicRatio(communityTopicTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getTopicTotal() / communityTopicTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
             }
 
             //当前社区内所有议题总数
             int communityIssueTotal = getGridOrCommunityIssueTotal(customerId, null, communityId);
+            log.info("extractCommunityPioneerData 当前communityId="+communityId+";当前社区内所有议题总数communityIssueTotal="+communityIssueTotal);
             if (communityIssueTotal != NumConstant.ZERO) {
                 //5、党员发布议题
                 entity.setPublishIssueTotal(getParyPublishIssueTotal(customerId, null, communityId));
+                log.info("extractCommunityPioneerData 当前communityId="+communityId+";党员发布议题publishIssueTotal="+entity.getPublishIssueTotal());
                 //6、党员发布议题占比 :  占社区内所有议题的比率
                 if (entity.getPublishIssueTotal() == NumConstant.ZERO) {
                     entity.setPublishIssueRatio(BigDecimal.ZERO);
                 }
-                entity.setPublishIssueRatio(communityIssueTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(entity.getPublishIssueTotal() / communityIssueTotal).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                entity.setPublishIssueRatio(communityIssueTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getPublishIssueTotal() / communityIssueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
 
                 //7、议题转项目数
                 entity.setShiftProjectTotal(getGridOrCommunityShiftProjectTotal(customerId, null, communityId));
+                log.info("extractCommunityPioneerData 当前communityId="+communityId+";议题转项目数shiftProjectTotal="+entity.getShiftProjectTotal());
                 //8、议题转项目占比 : 占社区内议题总数的比率
-                entity.setShiftProjectRatio(entity.getShiftProjectTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(entity.getShiftProjectTotal() / communityIssueTotal).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                entity.setShiftProjectRatio(entity.getShiftProjectTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getShiftProjectTotal() / communityIssueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
             }else{
-//                log.info("当前社区内所有议题总数="+communityIssueTotal);
+                log.info("extractCommunityPioneerData 当前communityId="+communityId+"communityIssueTotal =0");
                 entity.setPublishIssueTotal(NumConstant.ZERO);
                 entity.setPublishIssueRatio(BigDecimal.ZERO);
                 entity.setShiftProjectTotal(NumConstant.ZERO);
@@ -217,12 +235,14 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
 
             // 9、已解决项目
             entity.setResolvedProjectTotal(getGridOrCommunityClosedProjectTotal(customerId, null, communityId, DimObjectStatusConstant.RESOLVED));
+            log.info("extractCommunityPioneerData 当前communityId="+communityId+";已解决项目resolvedProjectTotal="+entity.getResolvedProjectTotal());
             if (entity.getResolvedProjectTotal() == NumConstant.ZERO) {
                 entity.setResolvedProjectRatio(BigDecimal.ZERO);
             } else {
                 // 10、占总结项目
                 int closedProjectTotal = getGridOrCommunityClosedProjectTotal(customerId, null, communityId, null);
-                entity.setResolvedProjectRatio(closedProjectTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(entity.getResolvedProjectTotal() / closedProjectTotal).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                log.info("extractCommunityPioneerData 当前communityId="+communityId+";总结项目closedProjectTotal="+closedProjectTotal);
+                entity.setResolvedProjectRatio(closedProjectTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getResolvedProjectTotal() / closedProjectTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
             }
         });
         screenPioneerDataService.delAndSavePioneerData(customerId, OrgTypeConstant.AGENCY, IndexCalConstant.DELETE_SIZE, communityList);
@@ -243,44 +263,52 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             } else {
                 entity.setAgencyPath(entity.getAgencyPids().concat(StrConstant.COLON).concat(entity.getOrgId()));
             }
+            log.info("extractExceptCommunityPioneerData 当前orgId="+entity.getOrgId()+";agencyPath="+entity.getAgencyPath());
             //1、党员参与议事
             entity.setIssueTotal(calPartyPartiIssueTotal(customerId,null,null,entity.getAgencyPath(),NumConstant.ONE_STR));
+            log.info("extractExceptCommunityPioneerData 党员参与议事issueTotal="+entity.getIssueTotal());
             if(entity.getIssueTotal()==0){
                 entity.setIssueRatio(BigDecimal.ZERO);
             }else{
                 //2、党员参与议事占比
                 int issueTotal=calPartyPartiIssueTotal(customerId,null,null,entity.getAgencyPath(),null);
-                entity.setIssueRatio(new BigDecimal(entity.getIssueTotal()/issueTotal).setScale(NumConstant.SIX,RoundingMode.HALF_UP));
+                log.info("extractExceptCommunityPioneerData 平台参与议事issueTotal="+issueTotal);
+                entity.setIssueRatio(new BigDecimal((double)entity.getIssueTotal()/issueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX,RoundingMode.HALF_UP));
             }
 
             //3、党员发布话题:
             entity.setTopicTotal(getAgencyTopicTotal(customerId, entity.getAgencyPath(),NumConstant.ONE_STR));
+            log.info("extractExceptCommunityPioneerData 党员发布话题topicTotal="+entity.getTopicTotal());
             //4、党员发布话题占比: 组织内注册党员发布的话题总数占  组织内话题总数的 比率
             if (entity.getTopicTotal() == NumConstant.ZERO) {
                 entity.setTopicRatio(BigDecimal.ZERO);
             } else {
                 //当前组织内所有话题总数
                 int agencyTopicTotal = getAgencyTopicTotal(customerId, entity.getAgencyPath(),null);
-                entity.setTopicRatio(agencyTopicTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(entity.getTopicTotal() / agencyTopicTotal).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                log.info("extractExceptCommunityPioneerData 当前组织内所有话题总数agencyTopicTotal="+agencyTopicTotal);
+                entity.setTopicRatio(agencyTopicTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getTopicTotal() / agencyTopicTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
             }
 
             //当前组织内所有议题总数
             int agencyIssueTotal = getAgencyIssueTotal(customerId, entity.getAgencyPath());
+            log.info("extractExceptCommunityPioneerData 当前组织内所有议题总数agencyIssueTotal="+agencyIssueTotal);
             if (agencyIssueTotal != NumConstant.ZERO) {
                 //5、党员发布议题
                 entity.setPublishIssueTotal(getAgencyParyPublishIssueTotal(customerId, entity.getAgencyPath()));
+                log.info("extractExceptCommunityPioneerData 党员发布议题publishIssueTotal="+entity.getPublishIssueTotal());
                 //6、党员发布议题占比 :  占社区内所有议题的比率
                 if (entity.getPublishIssueTotal() == NumConstant.ZERO) {
                     entity.setPublishIssueRatio(BigDecimal.ZERO);
                 }
-                entity.setPublishIssueRatio(agencyIssueTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(entity.getPublishIssueTotal() / agencyIssueTotal).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                entity.setPublishIssueRatio(agencyIssueTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getPublishIssueTotal() / agencyIssueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
 
                 //7、议题转项目数
                 entity.setShiftProjectTotal(getAgencyShiftProjectTotal(customerId, entity.getAgencyPath()));
+                log.info("extractExceptCommunityPioneerData 议题转项目数shiftProjectTotal="+entity.getShiftProjectTotal());
                 //8、议题转项目占比 : 占网格内议题总数的比率
-                entity.setShiftProjectRatio(entity.getShiftProjectTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(entity.getShiftProjectTotal() / agencyIssueTotal).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                entity.setShiftProjectRatio(entity.getShiftProjectTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getShiftProjectTotal() / agencyIssueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
             }else{
-//                log.info("当前组织内所有议题总数="+agencyIssueTotal);
+                log.info("extractExceptCommunityPioneerData 当前组织内所有议题总数agencyIssueTotal=0");
                 entity.setPublishIssueTotal(NumConstant.ZERO);
                 entity.setPublishIssueRatio(BigDecimal.ZERO);
                 entity.setShiftProjectTotal(NumConstant.ZERO);
@@ -290,12 +318,14 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
 
             // 9、已解决项目
             entity.setResolvedProjectTotal(getAgencyClosedProjectTotal(customerId, entity.getAgencyPath(), DimObjectStatusConstant.RESOLVED));
+            log.info("extractExceptCommunityPioneerData 已解决项目resolvedProjectTotal="+entity.getResolvedProjectTotal());
             if (entity.getResolvedProjectTotal() == NumConstant.ZERO) {
                 entity.setResolvedProjectRatio(BigDecimal.ZERO);
             } else {
                 // 10、占总结项目
                 int closedProjectTotal = getAgencyClosedProjectTotal(customerId, entity.getAgencyPath(), null);
-                entity.setResolvedProjectRatio(closedProjectTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(entity.getResolvedProjectTotal() / closedProjectTotal).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                log.info("extractExceptCommunityPioneerData 总结项目closedProjectTotal="+closedProjectTotal);
+                entity.setResolvedProjectRatio(closedProjectTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal((double)entity.getResolvedProjectTotal() / closedProjectTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
             }
         });
         screenPioneerDataService.delAndSavePioneerData(customerId, OrgTypeConstant.AGENCY, IndexCalConstant.DELETE_SIZE, agencyList);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java

@@ -186,7 +186,7 @@ public class DimGridServiceImpl extends BaseServiceImpl<DimGridDao, DimGridEntit
      **/
     @Override
     public List<GridAttributesResultDTO> getGridAttributes(String customerId,List<String> gridIds) {
-       if(CollectionUtils.isEmpty(gridIds)) return Collections.EMPTY_LIST;
+
        return baseDao.selectGridAttributes(customerId,gridIds);
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml

@@ -287,8 +287,8 @@
         WHERE
             DEL_FLAG = '0'
             AND CUSTOMER_ID = #{customerId}
-            AND MONTH_ID = #{monthId}
             AND GROUP_STATE = 'approved'
+            AND IS_OWNER_PARTY = 1
             AND
             (
                 <foreach collection="gridIds" item="gridId" separator=" OR ">

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml

@@ -186,7 +186,7 @@
         oper.UPDATED_TIME AS joinDate,
         IF(groupp.CREATED_BY = oper.CUSTOMER_USER_ID,'leader','member') AS leaderFlag,
         groupp.CREATED_BY AS groupOwnerId,
-        'join' AS actionCode
+        IF(groupp.CREATED_BY = oper.CUSTOMER_USER_ID,'join','create') AS actionCode
 
         FROM
         RESI_GROUP groupp

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimGridDao.xml

@@ -104,11 +104,14 @@
         dg.DEL_FLAG = '0'
         AND da.DEL_FLAG = '0'
         AND da.CUSTOMER_ID = #{customerId}
+        <if test="null != gridIds and gridIds.size() > 0">
             AND
             (
             <foreach collection="gridIds" item="gridId" separator=" OR ">
                 dg.id = #{gridId}
             </foreach>
             )
+        </if>
+
     </select>
 </mapper>

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageSendApproach.java

@@ -0,0 +1,7 @@
+package com.epmet.constant;
+
+public interface SystemMessageSendApproach {
+
+    String MQ = "mq";
+
+}

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java

@@ -0,0 +1,13 @@
+package com.epmet.constant;
+
+/**
+ * 系统消息类型
+ */
+public interface SystemMessageType {
+
+    /**
+     * 初始化客户
+     */
+    String INIT_CUSTOMER = "init_customer";
+
+}

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SystemMsgFormDTO.java

@@ -0,0 +1,15 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class SystemMsgFormDTO {
+
+    @NotNull(message = "消息类型不能为空")
+    private String messageType;
+
+    @NotNull(message = "消息内容不能为空")
+    private Object content;
+}

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.SysSmsDTO;
 import com.epmet.dto.form.ProjectSendMsgFormDTO;
 import com.epmet.dto.form.SendVerificationCodeFormDTO;
+import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.WxSubscribeMessageFormDTO;
 import com.epmet.dto.form.WxSubscribeUpdateFormDTO;
@@ -96,4 +97,13 @@ public interface EpmetMessageOpenFeignClient {
      **/
     @PostMapping(value = "message/wxmpmessage/sendwxsubscribeupdate", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result sendWxSubscribeUpdate(List<WxSubscribeUpdateFormDTO> msgList);
+
+    /**
+     * @Description 通过mq发送系统消息
+     * @return
+     * @author wxz
+     * @date 2021.01.06 15:16
+    */
+    @PostMapping("/message/system/send-by-mq")
+    Result sendSystemMsgByMQ(@RequestBody SystemMsgFormDTO form);
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.SysSmsDTO;
 import com.epmet.dto.form.ProjectSendMsgFormDTO;
 import com.epmet.dto.form.SendVerificationCodeFormDTO;
+import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.WxSubscribeMessageFormDTO;
 import com.epmet.dto.form.WxSubscribeUpdateFormDTO;
@@ -63,4 +64,9 @@ public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeig
     public Result sendWxSubscribeUpdate(List<WxSubscribeUpdateFormDTO> msgList) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "sendWxSubscribeUpdate", msgList);
     }
+
+    @Override
+    public Result sendSystemMsgByMQ(SystemMsgFormDTO form) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "sendSystemMsgByMQ", form);
+    }
 }

epmet-module/epmet-message/epmet-message-server/pom.xml

@@ -118,6 +118,13 @@
             <artifactId>oper-crm-client</artifactId>
             <version>2.0.0</version>
         </dependency>
+
+        <!--rocketmq-->
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-rocketmq</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -184,6 +191,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>
@@ -228,6 +239,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>
@@ -272,6 +287,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>
@@ -313,6 +332,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SystemMessageController.java

@@ -0,0 +1,27 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.SystemMsgFormDTO;
+import com.epmet.service.SystemMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("system")
+public class SystemMessageController {
+
+    @Autowired
+    private SystemMessageService systemMessageService;
+
+    @PostMapping("send-by-mq")
+    public Result sendSystemMsgByMQ(@RequestBody SystemMsgFormDTO form) {
+        ValidatorUtils.validateEntity(form);
+        systemMessageService.sendMQMessage(form.getMessageType(), form.getContent());
+        return new Result();
+    }
+
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/SystemMessageDao.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.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.SystemMessageEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 系统消息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-06
+ */
+@Mapper
+public interface SystemMessageDao extends BaseDao<SystemMessageEntity> {
+	
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/SystemMessageEntity.java

@@ -0,0 +1,57 @@
+/**
+ * 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.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.omg.CORBA.StringHolder;
+
+import java.util.Date;
+
+/**
+ * 系统消息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("system_message")
+public class SystemMessageEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 消息类型
+	 */
+	private String msgType;
+
+	/**
+	 * 发送途径
+	 */
+	private String sendApproach;
+
+    /**
+     * 消息内容
+     */
+	private String content;
+
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SystemMessageService.java

@@ -0,0 +1,7 @@
+package com.epmet.service;
+
+public interface SystemMessageService {
+
+    void sendMQMessage(String messageType, Object content);
+
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java

@@ -0,0 +1,70 @@
+package com.epmet.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.TopicConstants;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.SystemMessageSendApproach;
+import com.epmet.constant.SystemMessageType;
+import com.epmet.dao.SystemMessageDao;
+import com.epmet.entity.SystemMessageEntity;
+import com.epmet.service.SystemMessageService;
+import org.apache.rocketmq.common.message.Message;
+import org.apache.rocketmq.remoting.common.RemotingHelper;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class SystemMessageServiceImpl implements SystemMessageService {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private SystemMessageDao systemMessageDao;
+
+    @Autowired
+    private RocketMQTemplate rocketMQTemplate;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void sendMQMessage(String messageType, Object content) {
+        String contentStr = JSON.toJSONString(content);
+        //存储消息到表
+        SystemMessageEntity systemMessageEntity = new SystemMessageEntity();
+        systemMessageEntity.setMsgType(messageType);
+        systemMessageEntity.setSendApproach(SystemMessageSendApproach.MQ);
+        systemMessageEntity.setContent(contentStr);
+        systemMessageDao.insert(systemMessageEntity);
+
+        //发送mq消息
+        try {
+            Message meMessage = new Message(getTopicByMsgType(messageType), contentStr.getBytes(RemotingHelper.DEFAULT_CHARSET));
+            rocketMQTemplate.getProducer().send(meMessage);
+        } catch (Exception e) {
+            String errorStackTrace = ExceptionUtils.getErrorStackTrace(e);
+            logger.error("发送系统消息失败，堆栈信息:{}", errorStackTrace);
+            throw new RenException(EpmetErrorCode.SYSTEM_MQ_MSG_SEND_FAIL.getCode());
+        }
+    }
+
+    /**
+     * @Description 根据消息类型获取topic
+     * @return
+     * @author wxz
+     * @date 2021.01.06 13:42
+    */
+    private String getTopicByMsgType(String msgType) {
+        String topic = null;
+        switch (msgType) {
+            case SystemMessageType.INIT_CUSTOMER:
+                topic = TopicConstants.INIT_CUSTOMER;
+            break;
+        }
+        return topic;
+    }
+}

epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml

@@ -138,3 +138,8 @@ shutdown:
   graceful:
     enable: true #是否开启优雅停机
     waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警
+
+rocketmq:
+  name-server: @rocketmq.nameserver@
+  producer:
+    group: @rocketmq.producer.group@

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/SystemMessageDao.xml

@@ -0,0 +1,18 @@
+<?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.epmet.dao.SystemMessageDao">
+
+    <resultMap type="com.epmet.entity.SystemMessageEntity" id="systemMessageMap">
+        <result property="id" column="ID"/>
+        <result property="content" column="CONTENT"/>
+        <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>

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/AddTemplateFormDTO.java

@@ -48,4 +48,9 @@ public class AddTemplateFormDTO implements Serializable {
 	 * 关键字名称
 	 */
 	private List<String> nameList;
+
+	/**
+	 * 是否同步到所有客户
+	 */
+	private Boolean isSync = true;
 }

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/DelPersonalTempFormDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/1/11 14:53
+ */
+@NoArgsConstructor
+@Data
+public class DelPersonalTempFormDTO implements Serializable {
+
+	private static final long serialVersionUID = -1445036628319660147L;
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+	/**
+	 * 所属端 居民端resi 工作端work
+	 */
+	private String clientType;
+	/**
+	 * 模板id
+	 */
+	private List<String> tempIdList;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/InitAllFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/1/11 14:47
+ */
+@NoArgsConstructor
+@Data
+public class InitAllFormDTO implements Serializable {
+
+	private static final long serialVersionUID = 5198153778356904936L;
+	/**
+	 * 测试号APPID
+	 */
+	private String appId;
+	/**
+	 * 模板ID
+	 */
+	private String tempId;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/InitFormDTO.java

@@ -36,4 +36,9 @@ public class InitFormDTO implements Serializable {
 	 * 工作端需要同步的模板id数组
 	 */
 	private List<String> workTempIdList;
+
+	/**
+	 * 1 已同步，0 未同步
+	 */
+	private String sync;
 }

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/TemplateDTO.java

@@ -17,9 +17,14 @@ public class TemplateDTO implements Serializable {
 	 */
 	private String id;
 	/**
-	 * 模板ID
+	 * 公共模板ID
 	 */
 	private String tmplId;
+	private String personalId;
+	/**
+	 * 客户模板ID
+	 */
+	private String personalTempId;
 	/**
 	 * 标题
 	 */

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/SubscribeController.java

@@ -146,4 +146,30 @@ public class SubscribeController {
 		CustomerTempResultDTO result = subscribeService.getCustomerTemplate(formDTO);
 		return new Result<CustomerTempResultDTO>().ok(result);
 	}
+
+	/**
+	 * 同步单一模板到所有客户
+	 * @author zhaoqifeng
+	 * @date 2021/1/11 14:49
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("initall")
+	public Result initAll(@RequestBody InitAllFormDTO formDTO) {
+		subscribeService.initAll(formDTO);
+		return new Result();
+	}
+
+	/**
+	 * 删除客户模板
+	 * @author zhaoqifeng
+	 * @date 2021/1/11 14:54
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("delpersonaltemp")
+	public Result delPersonalTemp(@RequestBody DelPersonalTempFormDTO formDTO) {
+		subscribeService.delPersonalTemp(formDTO);
+		return new Result();
+	}
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PersonalTemplateDao.java

@@ -105,4 +105,6 @@ public interface PersonalTemplateDao extends BaseDao<PersonalTemplateEntity> {
 	List<PersonalTemplateDTO> selectListByKey(@Param("appId") String appId, @Param("tid") String tid, @Param("keyIds") String keyIds);
 
 	List<TemplateListV2ResultDTO> selectTemplateListV2(TemplateListV2FormDTO formDTO);
+
+	PersonalTemplateDTO getTempByPid();
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PersonalTemplateService.java

@@ -156,4 +156,14 @@ public interface PersonalTemplateService extends BaseService<PersonalTemplateEnt
 	List<PersonalTemplateDTO> getListByKey(String appId, String tid, String keyIds);
 
 	List<TemplateListV2ResultDTO> templateListV2(TemplateListV2FormDTO formDTO);
+
+	/**
+	 * 获取个人模板
+	 * @author zhaoqifeng
+	 * @date 2021/1/11 15:32
+	 * @param customerId
+	 * @param pid
+	 * @return com.epmet.dto.PersonalTemplateDTO
+	 */
+	PersonalTemplateDTO getTempByPid(String customerId, String pid);
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/SubscribeService.java

@@ -102,4 +102,22 @@ public interface SubscribeService {
 	 */
 	CustomerTempResultDTO getCustomerTemplate(InitFormDTO formDTO);
 
+	/**
+	 * 同步单一模板到所有客户
+	 * @author zhaoqifeng
+	 * @date 2021/1/11 14:49 
+	 * @param formDTO
+	 * @return void
+	 */
+	void initAll(InitAllFormDTO formDTO);
+
+	/**
+	 * 删除客户模板
+	 * @author zhaoqifeng
+	 * @date 2021/1/11 14:54 
+	 * @param formDTO
+	 * @return void
+	 */
+	void delPersonalTemp(DelPersonalTempFormDTO formDTO);
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PersonalTemplateServiceImpl.java

@@ -165,4 +165,18 @@ public class PersonalTemplateServiceImpl extends BaseServiceImpl<PersonalTemplat
     public List<TemplateListV2ResultDTO> templateListV2(TemplateListV2FormDTO formDTO) {
         return baseDao.selectTemplateListV2(formDTO);
     }
+
+    /**
+     * 获取个人模板
+     *
+     * @param customerId
+     * @param pid
+     * @return com.epmet.dto.PersonalTemplateDTO
+     * @author zhaoqifeng
+     * @date 2021/1/11 15:32
+     */
+    @Override
+    public PersonalTemplateDTO getTempByPid(String customerId, String pid) {
+        return baseDao.selectSetTemp(customerId, pid);
+    }
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SubscribeServiceImpl.java

@@ -199,6 +199,7 @@ public class SubscribeServiceImpl implements SubscribeService {
 		personalTemplateDTO.setKeyWords(keywords);
 		personalTemplateDTO.setType(formDTO.getType());
 		personalTemplateService.save(personalTemplateDTO);
+		if (formDTO.getIsSync()) {
 			//获取客户列表
 			List<PaCustomerDTO> customerList = paCustomerService.getCustomerListByTestId(authInfo.getCustomerId());
 			List<String> customerNames = new ArrayList<>();
@@ -238,6 +239,7 @@ public class SubscribeServiceImpl implements SubscribeService {
 				String names = String.join(",", customerNames);
 				throw new RenException("客户[" + names + "]添加模板失败");
 			}
+		}
 
 	}
 
@@ -348,7 +350,6 @@ public class SubscribeServiceImpl implements SubscribeService {
 				log.error("居民端同步失败:" + wxResult.getErrorCode() + wxResult.getErrorMsg());
 			}
 		});
-		resultDTO.setResiList(resiList);
 
 		AuthorizationInfoDTO workAuthDTO = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), "work");
 		if (null == workAuthDTO) {
@@ -371,10 +372,100 @@ public class SubscribeServiceImpl implements SubscribeService {
 				log.error("工作端同步失败:" + wxResult.getErrorCode() + wxResult.getErrorMsg());
 			}
 		});
+
+//		resultDTO.setResiList(resiList.stream().filter(item -> formDTO.getSync().equals(item.getState())).collect(Collectors.toList()));
+//		resultDTO.setWorkList(workList.stream().filter(item -> formDTO.getSync().equals(item.getState())).collect(Collectors.toList()));
+		resultDTO.setResiList(resiList);
 		resultDTO.setWorkList(workList);
 		return resultDTO;
 	}
 
+	/**
+	 * 同步单一模板到所有客户
+	 *
+	 * @param formDTO
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2021/1/11 14:49
+	 */
+	@Override
+	public void initAll(InitAllFormDTO formDTO) {
+		AuthorizationInfoDTO authInfo = authorizationInfoDao.selectInfoByAppId(formDTO.getAppId());
+		PersonalTemplateDTO publicDTO = personalTemplateService.getTempByPid(authInfo.getCustomerId(), formDTO.getTempId());
+
+		//获取客户列表
+		List<PaCustomerDTO> customerList = paCustomerService.getCustomerListByTestId(authInfo.getCustomerId());
+		List<String> customerNames = new ArrayList<>();
+		if (null != customerList && customerList.size() > NumConstant.ZERO) {
+			for (PaCustomerDTO paCustomerDTO : customerList) {
+				PersonalTemplateDTO personalTemplateDTO = personalTemplateService.getTempByPid(paCustomerDTO.getId(), publicDTO.getPriTmplId());
+				if (null == personalTemplateDTO) {
+					//获取小程序调用令牌
+					AuthorizationInfoDTO authDTO = authorizationInfoDao.getAuthInfoByCustomer(paCustomerDTO.getId(), authInfo.getClientType());
+
+					List<String> keyIds = Arrays.asList(publicDTO.getKeyIds().split(","));
+					List<Integer> keyIdList = keyIds.stream().map(Integer::parseInt).collect(Collectors.toList());
+					WxAddTemplateReq request = new WxAddTemplateReq();
+					request.setTid(publicDTO.getTid());
+					request.setKidList(keyIdList);
+					request.setSceneDesc(publicDTO.getSceneDesc());
+					WxResult<String> wxResult =  wxMaSubscribeService.addTemplate(authInfo.getAuthorizerAccessToken(), request);
+					if (null == authDTO) {
+						log.error("客户[" + paCustomerDTO.getCustomerName() + "]未授权");
+						customerNames.add(paCustomerDTO.getCustomerName());
+						continue;
+					}
+
+					String tmplId = wxResult.getData();
+					PersonalTemplateDTO templateDTO = new PersonalTemplateDTO();
+					templateDTO.setCustomerId(paCustomerDTO.getId());
+					templateDTO.setClientType(authInfo.getClientType());
+					templateDTO.setAppId(authDTO.getAuthorizerAppid());
+					templateDTO.setPid(publicDTO.getPriTmplId());
+					templateDTO.setPriTmplId(tmplId);
+					templateDTO.setTid(publicDTO.getTid());
+					templateDTO.setKeyIds(publicDTO.getKeyIds());
+					templateDTO.setTitle(publicDTO.getTitle());
+					templateDTO.setSceneDesc(publicDTO.getSceneDesc());
+					templateDTO.setKeyWords(publicDTO.getKeyWords());
+					templateDTO.setType(publicDTO.getType());
+					personalTemplateService.save(templateDTO);
+				}
+			}
+		}
+
+		if (customerNames.size() > NumConstant.ZERO) {
+			String names = String.join(",", customerNames);
+			log.error("客户[" + names + "]添加模板失败");
+		}
+	}
+
+	/**
+	 * 删除客户模板
+	 *
+	 * @param formDTO
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2021/1/11 14:54
+	 */
+	@Override
+	public void delPersonalTemp(DelPersonalTempFormDTO formDTO) {
+		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
+		if (null == authInfo) {
+			throw new RenException("未授权或token已过期");
+		}
+		formDTO.getTempIdList().forEach(tempId -> {
+			PersonalTemplateDTO dto = personalTemplateService.get(tempId);
+			WxDelTemplateReq request = new WxDelTemplateReq();
+			request.setPriTmplId(dto.getPriTmplId());
+			WxResult wxResult =  wxMaSubscribeService.delTemplate(authInfo.getAuthorizerAccessToken(), request);
+			if (!wxResult.success()) {
+				throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+			}
+			personalTemplateService.deleteById(dto.getId());
+		});
+	}
+
 	private WxGetCategoryResult getCategoryResult(String accessToken) {
 		WxResult<WxGetCategoryResult> wxResult =  wxMaSubscribeService.getCategory(accessToken);
 

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PersonalTemplateDao.xml

@@ -39,7 +39,17 @@
     </select>
     <select id="selectSetTemp" resultType="com.epmet.dto.PersonalTemplateDTO">
         SELECT ID,
-               TITLE
+            CUSTOMER_ID,
+            CLIENT_TYPE,
+            APP_ID,
+            PID,
+            PRI_TMPL_ID,
+            TYPE,
+            TID,
+            TITLE,
+            KEY_IDS,
+            KEY_WORDS,
+            SCENE_DESC
         FROM personal_template
         WHERE DEL_FLAG = '0'
           AND CUSTOMER_ID = #{customerId}
@@ -49,13 +59,16 @@
         SELECT
             t1.ID AS id,
             t1.PRI_TMPL_ID AS tmplId,
+            IFNULL(t2.ID, '') AS personalId,
+            IFNULL(t2.PRI_TMPL_ID, '') AS personalTempId,
             t1.TITLE AS title,
             IF(ISNULL(t2.ID),'0','1') AS state
         FROM
             (SELECT
                  ID,
                  TITLE,
-                 PRI_TMPL_ID
+                 PRI_TMPL_ID,
+                 CREATED_TIME
              FROM
                  personal_template
              WHERE
@@ -74,6 +87,7 @@
                AND CUSTOMER_ID = #{customerId}
                AND CLIENT_TYPE = #{clientType}) t2
             ON t1.PRI_TMPL_ID = t2.PID
+        ORDER BY t1.CREATED_TIME DESC
     </select>
 
     <select id="selectTemplateList" resultType="com.epmet.dto.result.GetTemplateListResultDTO">

epmet-module/gov-org/gov-org-server/pom.xml

@@ -95,6 +95,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <!--rocketmq-->
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-rocketmq</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -156,6 +162,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>
@@ -194,6 +204,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>
@@ -233,6 +247,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>
@@ -269,6 +287,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
     </profiles>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/InitCustomerOrgListener.java

@@ -0,0 +1,87 @@
+package com.epmet.mq.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
+import com.epmet.commons.rocketmq.constants.TopicConstants;
+import com.epmet.commons.rocketmq.messages.InitCustomerMQMsg;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.UserWorkType;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.form.AddAgencyAndStaffFormDTO;
+import com.epmet.dto.form.AdminStaffFromDTO;
+import com.epmet.service.AgencyService;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.apache.rocketmq.spring.annotation.MessageModel;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 监听初始化客户动作，为客户初始化角色列表
+ */
+@RocketMQMessageListener(topic = TopicConstants.INIT_CUSTOMER,
+        consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_ORG_GROUP,
+        messageModel = MessageModel.CLUSTERING,
+        selectorExpression = "*")
+@Component
+public class InitCustomerOrgListener implements RocketMQListener<MessageExt> {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private AgencyService agencyService;
+
+    @Override
+    public void onMessage(MessageExt messageExt) {
+        String msg = new String(messageExt.getBody());
+        logger.info("初始化客户-初始化组织信息-收到消息内容:{}", msg);
+        InitCustomerMQMsg msgObj = JSON.parseObject(msg, InitCustomerMQMsg.class);
+        try {
+            agencyService.saveRootAgency(constructRootAndAgencyDTO(msgObj));
+        } catch (RenException e) {
+            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
+            logger.error("【RocketMQ】初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+        } catch (Exception e) {
+            // 不是我们自己抛出的异常，可以让MQ重试
+            logger.error("【RocketMQ】初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+            throw e;
+        }
+    }
+
+    /**
+     * @Description 构造dto
+     * @return
+     * @author wxz
+     * @date 2021.01.06 15:03
+    */
+    private AddAgencyAndStaffFormDTO constructRootAndAgencyDTO(InitCustomerMQMsg msgObj) {
+        AddAgencyAndStaffFormDTO agencyAndStaff = new AddAgencyAndStaffFormDTO();
+        //客户组织信息
+        CustomerAgencyDTO agencyDTO = new CustomerAgencyDTO();
+        agencyDTO.setId(msgObj.getAgency().getAgencyId());
+        agencyDTO.setCustomerId(msgObj.getCustomerId());
+        agencyDTO.setOrganizationName(msgObj.getAgency().getOrganizationName());
+        agencyDTO.setLevel(msgObj.getAgency().getLevel());
+        agencyDTO.setAreaCode(msgObj.getAgency().getAreaCode());
+        agencyDTO.setProvince(msgObj.getAgency().getProvince());
+        agencyDTO.setCity(msgObj.getAgency().getCity());
+        agencyDTO.setDistrict(msgObj.getAgency().getDistrict());
+        agencyAndStaff.setAgencyDTO(agencyDTO);
+
+        //客户管理员信息
+        AdminStaffFromDTO staffSubmitFrom = new AdminStaffFromDTO();
+        staffSubmitFrom.setCustomerId(msgObj.getCustomerId());
+        staffSubmitFrom.setAgencyId(msgObj.getStaff().getAgencyId());
+        staffSubmitFrom.setGender(msgObj.getStaff().getGender());
+        staffSubmitFrom.setMobile(msgObj.getStaff().getMobile());
+        staffSubmitFrom.setName(msgObj.getStaff().getName());
+        staffSubmitFrom.setWorkType(UserWorkType.FULL_TIME);
+        agencyAndStaff.setStaffDTO(staffSubmitFrom);
+
+        return agencyAndStaff;
+    }
+}

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

@@ -351,7 +351,13 @@ public class AgencyServiceImpl implements AgencyService {
             throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ROOT_AGENCY_ERROR.getCode());
         }
 
-        //3.查询客户具有指定RoleKey的角色信息
+        //3.调用epmet-user服务，初始化客户对应的角色;其内部会调用access服务给角色分配权限信息
+        Result initResult = epmetUserOpenFeignClient.initGovStaffRolesForCustomer(agencyDTO.getCustomerId());
+        if (!initResult.success()) {
+            throw new RenException("客户新增:调用user服务为客户初始化角色数据失败:".concat(initResult.toString()));
+        }
+
+        //4.查询客户具有指定RoleKey的角色信息
         CustomerRoleFormDTO customerRoleForm = new CustomerRoleFormDTO();
         customerRoleForm.setCustomerId(agencyDTO.getCustomerId());
         customerRoleForm.setRoleKey(RoleKeyConstants.ROLE_KEY_ROOT_MANAGER);
@@ -361,7 +367,7 @@ public class AgencyServiceImpl implements AgencyService {
             throw new RenException("查询客户具有指定RoleKey的角色信息失败:".concat(getRoleResult.toString()));
         }
 
-        //4.新增客户管理员信息
+        //5.新增客户管理员信息
         StaffSubmitFromDTO staffSubmitFrom = ConvertUtils.sourceToTarget(staffDTO, StaffSubmitFromDTO.class);
         staffSubmitFrom.setRoles(Arrays.asList(getRoleResult.getData().getId()));
         staffSubmitFrom.setApp("gov");

epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml

@@ -142,3 +142,6 @@ shutdown:
   graceful:
     enable: true #是否开启优雅停机
     waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警
+
+rocketmq:
+  name-server: @rocketmq.nameserver@

epmet-module/oper-crm/oper-crm-server/pom.xml

@@ -87,6 +87,18 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-message-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <!--rocketmq-->
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-rocketmq</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@@ -22,6 +22,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.rocketmq.messages.InitCustomerMQMsg;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -32,6 +33,7 @@ import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ModuleConstant;
 import com.epmet.constant.RoleKeyConstants;
+import com.epmet.constant.SystemMessageType;
 import com.epmet.constant.UserWorkType;
 import com.epmet.dao.CustomerDao;
 import com.epmet.dto.*;
@@ -80,6 +82,8 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
     private CustomerDao customerDao;
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     @Override
     public PageData<CustomerDTO> page(Map<String, Object> params) {
@@ -468,48 +472,62 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
             throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ERROR.getCode());
         }
 
-        //3.调用epmet-user服务，初始化客户对应的角色;调用access服务给角色分配权限信息
-        Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(formDTO.getCustomerId());
-        if (!initResult.success()) {
-            throw new RenException("客户新增:调用user服务为客户初始化角色数据失败:".concat(initResult.toString()));
-        }
-
-        //4.调用oper-customize服务，初始化客户定制化首页模板数据
-        CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
-        initHomeForm.setCustomerId(formDTO.getCustomerId());
-        Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
-        if (!initHomeResult.success()) {
-            throw new RenException("初始化客户首页数据失败:".concat(initHomeResult.getInternalMsg()));
-        }
-
-        //5.调用gov-org服务，初始化客户根级组织信息、客户管理员信息
-        AddAgencyAndStaffFormDTO agencyAndStaff = new AddAgencyAndStaffFormDTO();
-        //客户组织信息
-        CustomerAgencyDTO agencyDTO = new CustomerAgencyDTO();
-        agencyDTO.setId(paAgency.getId());
-        agencyDTO.setCustomerId(formDTO.getCustomerId());
-        agencyDTO.setOrganizationName(paAgency.getAgencyName());
-        agencyDTO.setLevel(paAgency.getLevel());
-        agencyDTO.setAreaCode(paAgency.getAreaCode());
-        agencyDTO.setProvince(paAgency.getProvince());
-        agencyDTO.setCity(paAgency.getCity());
-        agencyDTO.setDistrict(paAgency.getDistrict());
-        agencyAndStaff.setAgencyDTO(agencyDTO);
-
-        //客户管理员信息
-        AdminStaffFromDTO staffSubmitFrom = new AdminStaffFromDTO();
-        staffSubmitFrom.setCustomerId(formDTO.getCustomerId());
-        staffSubmitFrom.setAgencyId(paAgency.getId());
-        staffSubmitFrom.setGender(Integer.parseInt(paUser.getGender()));
-        staffSubmitFrom.setMobile(paUser.getPhone());
-        staffSubmitFrom.setName(paUser.getRealName());
-        staffSubmitFrom.setWorkType(UserWorkType.FULL_TIME);
-        agencyAndStaff.setStaffDTO(staffSubmitFrom);
-
-        Result agencyResult = govOrgOpenFeignClient.saveRootAgency(agencyAndStaff);
-        if (!agencyResult.success()) {
-            throw new RenException(agencyResult.getCode(), agencyResult.getInternalMsg());
-        }
+        // *.发送初始化客户信息到mq，让监听者完成初始化操作
+        InitCustomerMQMsg msgContent = new InitCustomerMQMsg();
+        msgContent.setCustomerId(formDTO.getCustomerId());
+        msgContent.setAgency(constructAgencyInfo4CustomerInit(paAgency));
+        msgContent.setStaff(constructStaffInfo4CustomerInit(paAgency.getId(), paUser));
+
+        SystemMsgFormDTO systemMsgFormDTO = new SystemMsgFormDTO();
+        systemMsgFormDTO.setMessageType(SystemMessageType.INIT_CUSTOMER);
+        systemMsgFormDTO.setContent(msgContent);
+        Result sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(systemMsgFormDTO);
+        if (! sendMsgResult.success()) {
+            throw new RenException("发送(初始化客户信息)系统消息到message服务失败:{}", sendMsgResult.getInternalMsg());
+        }
+
+        ////3.调用epmet-user服务，初始化客户对应的角色;调用access服务给角色分配权限信息
+        //Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(formDTO.getCustomerId());
+        //if (!initResult.success()) {
+        //    throw new RenException("客户新增:调用user服务为客户初始化角色数据失败:".concat(initResult.toString()));
+        //}
+        //
+        ////4.调用oper-customize服务，初始化客户定制化首页模板数据
+        //CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
+        //initHomeForm.setCustomerId(formDTO.getCustomerId());
+        //Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
+        //if (!initHomeResult.success()) {
+        //    throw new RenException("初始化客户首页数据失败:".concat(initHomeResult.getInternalMsg()));
+        //}
+        //
+        ////5.调用gov-org服务，初始化客户根级组织信息、客户管理员信息
+        //AddAgencyAndStaffFormDTO agencyAndStaff = new AddAgencyAndStaffFormDTO();
+        ////客户组织信息
+        //CustomerAgencyDTO agencyDTO = new CustomerAgencyDTO();
+        //agencyDTO.setId(paAgency.getId());
+        //agencyDTO.setCustomerId(formDTO.getCustomerId());
+        //agencyDTO.setOrganizationName(paAgency.getAgencyName());
+        //agencyDTO.setLevel(paAgency.getLevel());
+        //agencyDTO.setAreaCode(paAgency.getAreaCode());
+        //agencyDTO.setProvince(paAgency.getProvince());
+        //agencyDTO.setCity(paAgency.getCity());
+        //agencyDTO.setDistrict(paAgency.getDistrict());
+        //agencyAndStaff.setAgencyDTO(agencyDTO);
+        //
+        ////客户管理员信息
+        //AdminStaffFromDTO staffSubmitFrom = new AdminStaffFromDTO();
+        //staffSubmitFrom.setCustomerId(formDTO.getCustomerId());
+        //staffSubmitFrom.setAgencyId(paAgency.getId());
+        //staffSubmitFrom.setGender(Integer.parseInt(paUser.getGender()));
+        //staffSubmitFrom.setMobile(paUser.getPhone());
+        //staffSubmitFrom.setName(paUser.getRealName());
+        //staffSubmitFrom.setWorkType(UserWorkType.FULL_TIME);
+        //agencyAndStaff.setStaffDTO(staffSubmitFrom);
+        //
+        //Result agencyResult = govOrgOpenFeignClient.saveRootAgency(agencyAndStaff);
+        //if (!agencyResult.success()) {
+        //    throw new RenException(agencyResult.getCode(), agencyResult.getInternalMsg());
+        //}
 
         //6.更新第三方数据库中客户数据状态为已初始化
         String customerUrl = "https://epmet-cloud.elinkservice.cn/api/third/pacustomer/updatecustomer/" + formDTO.getCustomerId();
@@ -531,6 +549,28 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
 
     }
 
+    private InitCustomerMQMsg.InitCustomerStaff constructStaffInfo4CustomerInit(String agencyId, PaUserDTO paUser) {
+        InitCustomerMQMsg.InitCustomerStaff staff = new InitCustomerMQMsg.InitCustomerStaff();
+        staff.setAgencyId(agencyId);
+        staff.setGender(Integer.parseInt(paUser.getGender()));
+        staff.setMobile(paUser.getPhone());
+        staff.setName(paUser.getRealName());
+        staff.setWorkType(UserWorkType.FULL_TIME);
+        return staff;
+    }
+
+    private InitCustomerMQMsg.InitCustomerAgency constructAgencyInfo4CustomerInit(PaCustomerAgencyDTO paAgency) {
+        InitCustomerMQMsg.InitCustomerAgency initCustomerAgency = new InitCustomerMQMsg.InitCustomerAgency();
+        initCustomerAgency.setAgencyId(paAgency.getId());
+        initCustomerAgency.setOrganizationName(paAgency.getAgencyName());
+        initCustomerAgency.setLevel(paAgency.getLevel());
+        initCustomerAgency.setAreaCode(paAgency.getAreaCode());
+        initCustomerAgency.setProvince(paAgency.getProvince());
+        initCustomerAgency.setCity(paAgency.getCity());
+        initCustomerAgency.setDistrict(paAgency.getDistrict());
+        return initCustomerAgency;
+    }
+
     @Override
     public List<CustomerDTO> getAllList() {
         List<CustomerEntity> list = baseDao.getAllList();

epmet-module/oper-customize/oper-customize-server/pom.xml

@@ -70,6 +70,13 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+
+        <!--rocketmq-->
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-rocketmq</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -129,6 +136,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>
@@ -167,6 +178,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>
@@ -205,6 +220,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>
@@ -241,6 +260,10 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
     </profiles>

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDao.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.HomeDesignFormDTO;
 import com.epmet.entity.CustomerHomeEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -43,4 +44,6 @@ public interface CustomerHomeDao extends BaseDao<CustomerHomeEntity> {
 	 * @date 2020/3/16 14:02
 	 **/
 	List<CustomerHomeEntity> selectCustomerHomeList(HomeDesignFormDTO formDTO);
+
+    int countByCustomerId(@Param("customerId") String customerId);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/mq/listener/InitCustomerCustomizeListener.java

@@ -0,0 +1,54 @@
+package com.epmet.mq.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
+import com.epmet.commons.rocketmq.constants.TopicConstants;
+import com.epmet.commons.rocketmq.messages.InitCustomerMQMsg;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.dto.CustomerHomeDTO;
+import com.epmet.service.CustomerHomeService;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.apache.rocketmq.spring.annotation.MessageModel;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 监听初始化客户动作，为客户初始化角色列表
+ */
+@RocketMQMessageListener(topic = TopicConstants.INIT_CUSTOMER,
+        consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_CUSTOMIZE_GROUP,
+        messageModel = MessageModel.CLUSTERING,
+        selectorExpression = "*")
+@Component
+public class InitCustomerCustomizeListener implements RocketMQListener<MessageExt> {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private CustomerHomeService customerHomeService;
+
+    @Override
+    public void onMessage(MessageExt messageExt) {
+        String msg = new String(messageExt.getBody());
+        logger.info("初始化客户-初始化客户自定义信息-收到消息内容:{}", msg);
+        InitCustomerMQMsg msgObj = JSON.parseObject(msg, InitCustomerMQMsg.class);
+
+        CustomerHomeDTO customerHomeDTO = new CustomerHomeDTO();
+        customerHomeDTO.setCustomerId(msgObj.getCustomerId());
+        try {
+            customerHomeService.init(customerHomeDTO);
+        } catch (RenException e) {
+            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
+            logger.error("【RocketMQ】初始化客户组件失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+        } catch (Exception e) {
+            // 不是我们自己抛出的异常，可以让MQ重试
+            logger.error("【RocketMQ】初始化客户组件失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+            throw e;
+        }
+    }
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeServiceImpl.java

@@ -20,6 +20,8 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -119,6 +121,11 @@ public class CustomerHomeServiceImpl extends BaseServiceImpl<CustomerHomeDao, Cu
 	@Transactional(rollbackFor = Exception.class)
 	public void init(CustomerHomeDTO dto) {
 
+		int homeCount = baseDao.countByCustomerId(dto.getCustomerId());
+		if (homeCount > 0) {
+			throw new RenException("用户Home组件已存在，请勿重复初始化");
+		}
+
 		//居民端模板
 		List<CustomerHomeTemplateDTO> resiTempList = customerHomeTemplateService.getTemplateByClient(OperCustomizeConstant.RESIDENT);
 		//居民端草稿

epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml

@@ -124,6 +124,9 @@ dingTalk:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
 
+rocketmq:
+  name-server: @rocketmq.nameserver@
+
 # 停机选项
 shutdown:
   graceful:

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDao.xml

@@ -29,5 +29,11 @@
             AND DEL_FLAG = '0'
     </select>
 
+    <select id="countByCustomerId" resultType="java.lang.Integer">
+        select count(1)
+        from customer_home
+        where CUSTOMER_ID = #{customerId}
+    </select>
+
 
 </mapper>

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -469,4 +469,12 @@ public interface EpmetUserOpenFeignClient {
 
     @PostMapping(value = "epmetuser/staffrole/specificrolesstaffs", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<String>> specificRolesStaffs(RolesUsersListFormDTO rolesUsersListFormDTO);
+
+    /**
+     * 为客户初始化政府端工作人员角色
+     * @param customerId
+     * @return
+     */
+    @PostMapping("/epmetuser/staffrole/initrolesforcustomer/{customerId}")
+    Result initGovStaffRolesForCustomer(@PathVariable String customerId);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -331,4 +331,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<String>> specificRolesStaffs(RolesUsersListFormDTO rolesUsersListFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "specificRolesStaffs", rolesUsersListFormDTO);
     }
+
+    @Override
+    public Result initGovStaffRolesForCustomer(String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "initGovStaffRolesForCustomer", customerId);
+    }
 }

epmet-user/epmet-user-server/pom.xml

@@ -112,6 +112,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <!--rocketmq-->
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-rocketmq</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java

@@ -77,4 +77,6 @@ public interface GovStaffRoleDao extends BaseDao<GovStaffRoleEntity> {
     int updateSortById(@Param("roleId") String roleId, @Param("sort") int sort);
 
     List<GovStaffRoleResultDTO> listRolesByRoleKey(@Param("roleKey") String roleKey);
+
+    Integer countRolesByCustomerId(@Param("customerId") String customerId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/InitCustomerRolesListener.java

@@ -0,0 +1,39 @@
+//package com.epmet.mq.listener;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
+//import com.epmet.commons.rocketmq.constants.TopicConstants;
+//import com.epmet.commons.rocketmq.messages.InitCustomerMQMsg;
+//import com.epmet.service.GovStaffRoleService;
+//import org.apache.rocketmq.common.message.MessageExt;
+//import org.apache.rocketmq.spring.annotation.MessageModel;
+//import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+//import org.apache.rocketmq.spring.core.RocketMQListener;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 监听初始化客户动作，为客户初始化角色列表
+// */
+//@RocketMQMessageListener(topic = TopicConstants.INIT_CUSTOMER,
+//        consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_ROLES_GROUP,
+//        messageModel = MessageModel.CLUSTERING,
+//        selectorExpression = "*")
+//@Component
+//public class InitCustomerRolesListener implements RocketMQListener<MessageExt> {
+//
+//    private Logger logger = LoggerFactory.getLogger(getClass());
+//
+//    @Autowired
+//    private GovStaffRoleService govStaffRoleService;
+//
+//    @Override
+//    public void onMessage(MessageExt messageExt) {
+//        String msg = new String(messageExt.getBody());
+//        logger.info("初始化客户-初始化角色列表-收到消息内容:{}", msg);
+//        InitCustomerMQMsg msgObj = JSON.parseObject(msg, InitCustomerMQMsg.class);
+//        govStaffRoleService.initGovStaffRolesForCustomer(msgObj.getCustomerId());
+//    }
+//}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java

@@ -39,6 +39,8 @@ import com.epmet.feign.GovAccessFeignClient;
 import com.epmet.redis.GovStaffRoleRedis;
 import com.epmet.service.GovStaffRoleService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,6 +59,8 @@ import java.util.Map;
 @Service
 public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, GovStaffRoleEntity> implements GovStaffRoleService {
 
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
     @Autowired
     private GovStaffRoleRedis govStaffRoleRedis;
 
@@ -140,8 +144,13 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, Go
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void initGovStaffRolesForCustomer(String customerId) {
+        Integer rolesCount = baseDao.countRolesByCustomerId(customerId);
+        if (rolesCount > 0) {
+            logger.info("为客户初始化角色列表-该客户【客户ID:%s】已存在角色信息，无需再次初始化。", customerId);
+            return;
+        }
         // 增加角色列表
         List<GovStaffRoleTemplateDTO> validRoles = govStaffRoleTemplateDao.listValidateRoles();
 

epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

@@ -146,6 +146,9 @@ dingTalk:
     webHook: @dingTalk.robot.webHook@
     secret: @dingTalk.robot.secret@
 
+rocketmq:
+  name-server: 192.168.1.130:9876;192.168.1.132:9876
+
 # 停机选项
 shutdown:
   graceful:

epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml

@@ -111,4 +111,10 @@
         where gsr.ROLE_KEY = #{roleKey}
             and gsr.DEL_FLAG=0
     </select>
+
+    <select id="countRolesByCustomerId" resultType="java.lang.Integer">
+        select count(0)
+        from gov_staff_role
+        where CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>