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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/distributedlock/DistributedLock.java

@@ -1,7 +1,6 @@
 package com.epmet.commons.tools.distributedlock;
 
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.redis.RedisKeys;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -9,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @Author zxc
@@ -23,6 +21,7 @@ public class DistributedLock {
 
     /**
      * @Description  抢锁🔒 每个锁持有十分钟
+     *  watchDog模式，每隔10s，自动更改持锁时间,假设宕机，持锁时间达到时，会自动释放锁
      * @Param name
      * @author zxc
      * @date 2020/10/28 2:52 下午

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AnScreenRankFormDTO.java

@@ -25,4 +25,8 @@ public class AnScreenRankFormDTO implements Serializable {
 	private String agencyId;
 	@NotNull(message = "top值不能为空", groups = AnScreenRankFormDTO.AnScreenRankGroup.class)
 	private Integer topNum;
+	/**
+	 * 月份ID，默认上一个月
+	 */
+	private String monthId;
 }

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

@@ -19,7 +19,7 @@ public class AblityListResultDTO implements Serializable {
      */
     private String name;
     /**
-     * 指标对应值（数值或百分比）
+     * 指标对应值（数值或百分比）原始值
      */
     private String value = "0";
     /**
@@ -36,4 +36,6 @@ public class AblityListResultDTO implements Serializable {
      */
     private BigDecimal weight;
 
+    private Double score;
+
 }

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

@@ -30,6 +30,14 @@ public class MonthScoreListResultDTO implements Serializable {
          * 能力总分
          */
         private Double indexTotal;
+        /**
+         * 能力总分在上级的权重
+         */
+        private Double indexTotalSupWeight;
+        /**
+         * 能力总分原始值
+         */
+        private Double indexTotalOriginScore;
         /**
          * 本级能力分
          */

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

@@ -47,4 +47,8 @@ public class PmRankResultDTO implements Serializable {
 	 * 议题数
 	 */
 	private Integer issueTotal;
+	/**
+	 * 月份Id
+	 */
+	private String monthId;
 }

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

@@ -21,13 +21,29 @@ public class ScoreListResultDTO implements Serializable {
      * 总分(保留一位小数)
      */
     private Double indexTotal;
+    /**
+     * 能力总分在上级的权重
+     */
+    private Double indexTotalSupWeight;
+    /**
+     * 能力总分原始值
+     */
+    private Double indexTotalOriginScore;
     /**
      * 本级分数(保留一位小数)
      */
     private Double agencyScore;
+
+    private Double selfOriginScore;
+
+    private Double agencyWeight;
     /**
      * 下级分数(保留一位小数)
      */
     private Double subAgencyScore;
 
+    private Double subAgencyWeight;
+
+    private Double subOriginScore;
+
 }

epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.44
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.45
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-report/data-report-server/pom.xml

@@ -3,7 +3,7 @@
          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">
 
-    <version>0.3.44</version>
+    <version>0.3.45</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenan/ScreenAnGrassRootsPmRankDao.java

@@ -35,11 +35,12 @@ public interface ScreenAnGrassRootsPmRankDao {
 	 * 基层党员-党员排行榜单
 	 *
 	 * @param agencyId
+	 * @param monthId
 	 * @param topNum
 	 * @return java.util.List<com.epmet.evaluationindex.screen.dto.result.PmRankResultDTO>
 	 * @author zhaoqifeng
 	 * @date 2020/10/9 15:43
 	 */
-	List<PmRankResultDTO> selectPmRank(@Param("agencyId") String agencyId, @Param("topNum") Integer topNum);
+	List<PmRankResultDTO> selectPmRank(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("topNum") Integer topNum);
 
 }

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

@@ -10,6 +10,7 @@ import com.epmet.evaluationindex.screen.dto.form.AnScreenFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.AnScreenRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.AnScreenTrendFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -47,6 +48,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 13:55
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public PmTotalResultDTO pmTotal(AnScreenFormDTO formDTO) {
 		return screenAnGrassRootsPmTotalMonthlyDao.selectPmTotal(formDTO.getAgencyId(), formDTO.getMonthId());
 	}
@@ -60,6 +62,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 13:57
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public PmTotalTrendResultDTO pmTotalTrend(AnScreenTrendFormDTO formDTO) {
 		PmTotalTrendResultDTO resultDTO = new PmTotalTrendResultDTO();
 		String yearId = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYY);
@@ -86,8 +89,13 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 13:59
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public List<PmRankResultDTO> pmRank(AnScreenRankFormDTO formDTO) {
-		return screenAnGrassRootsPmRankDao.selectPmRank(formDTO.getAgencyId(), formDTO.getTopNum());
+		String monthId = formDTO.getMonthId();
+		if (StringUtils.isBlank(monthId)){
+			monthId = DateUtils.getBeforeNMonth(1);
+		}
+		return screenAnGrassRootsPmRankDao.selectPmRank(formDTO.getAgencyId(), monthId,formDTO.getTopNum());
 	}
 
 	/**
@@ -99,6 +107,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:01
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public GrassRootsOrgResultDTO grassRootsOrg(AnScreenFormDTO formDTO) {
 		return screenAnGrassRootsOrgMonthlyDao.selectGrassRootsOrg(formDTO.getAgencyId(), formDTO.getMonthId());
 	}
@@ -112,6 +121,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:03
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public GrassRootsOrgTrendResultDTO grassRootsOrgTrend(AnScreenTrendFormDTO formDTO) {
 		GrassRootsOrgTrendResultDTO resultDTO = new GrassRootsOrgTrendResultDTO();
 		String yearId = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYY);
@@ -136,6 +146,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:06
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public List<GrassRootsOrgRankResultDTO> grassRootsOrgRank(AnScreenFormDTO formDTO) {
 		return screenAnGrassRootsOrgMonthlyDao.selectGrassRootsOrgRank(formDTO.getAgencyId(), formDTO.getMonthId());
 	}
@@ -149,6 +160,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:10
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public GrassRootsGovernResultDTO grassRootsGovern(AnScreenFormDTO formDTO) {
 		return screenAnGrassRootsGovernMonthlyDao.selectGrassRootsGovern(formDTO.getAgencyId(), formDTO.getMonthId());
 	}
@@ -162,6 +174,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:11
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public GrassRootsGovernTrendResultDTO grassRootsGovernTrend(AnScreenTrendFormDTO formDTO) {
 		GrassRootsGovernTrendResultDTO resultDTO = new GrassRootsGovernTrendResultDTO();
 		String yearId = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYY);
@@ -190,6 +203,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:13
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public List<GrassRootsGovernRankResultDTO> grassRootsGovernRank(AnScreenFormDTO formDTO) {
 		return screenAnGrassRootsGovernMonthlyDao.selectGrassRootsGovernRank(formDTO.getAgencyId(), formDTO.getMonthId());
 	}
@@ -203,6 +217,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:16
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public List<ProjectProfileResultDTO> projectProfile(String customerId) {
 		return screenAnCommunityProjectProfileDao.selectProjectProfile(customerId);
 	}

epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml

@@ -142,14 +142,7 @@
     <springProfile name="dev,test,local">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.group" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.issue" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.project" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.publicity" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.topic" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.user" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.voice" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.evaluationindex.screen" level="DEBUG"/>
+        <logger name="com.epmet.datareport.dao" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
@@ -162,13 +155,7 @@
     <springProfile name="prod">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.group" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.issue" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.project" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.publicity" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.topic" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.user" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.voice" level="INFO"/>
+        <logger name="com.epmet.datareport.dao" level="INFO"/>
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml

@@ -25,8 +25,14 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
+            fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore"
+            self.self_score AS selfOriginScore,
+            self.SELF_WEIGHT AS agencyWeight,
+            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
+            self.sub_score AS subOriginScore,
+            self.SUB_WEIGHT AS subAgencyWeight
         FROM
             fact_index_agency_score fact
         INNER JOIN fact_index_agency_self_sub_score self ON fact.agency_id = self.agency_id
@@ -45,6 +51,8 @@
         SELECT
             fact.month_id AS "monthId",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
+            fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
             fact.index_code AS "indexCode"

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml

@@ -7,6 +7,7 @@
         SELECT
             fact.index_code AS "key",
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
+            fact.score AS score,
             dict.index_name AS "name",
             round(fact.WEIGHT,2) AS weight
         FROM

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml

@@ -25,8 +25,14 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
+            fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore"
+            self.self_score AS selfOriginScore,
+            self.SELF_WEIGHT AS agencyWeight,
+            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
+            self.sub_score AS subOriginScore,
+            self.SUB_WEIGHT AS subAgencyWeight
         FROM
             fact_index_community_score fact
         INNER JOIN fact_index_community_self_sub_score self ON fact.agency_id = self.agency_id
@@ -45,6 +51,8 @@
         SELECT
             fact.month_id AS "monthId",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
+            fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
             fact.index_code AS "indexCode"

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml

@@ -8,6 +8,7 @@
             fact.index_code AS "key",
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
             dict.index_name AS "name",
+            fact.score AS score,
             round(fact.WEIGHT,2) AS weight
         FROM
             fact_index_community_sub_score fact

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml

@@ -25,8 +25,14 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
+            fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore"
+            self.self_score AS selfOriginScore,
+            self.SELF_WEIGHT AS agencyWeight,
+            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
+            self.sub_score AS subOriginScore,
+            self.SUB_WEIGHT AS subAgencyWeight
         FROM
             fact_index_grid_score fact
         INNER JOIN fact_index_grid_self_sub_score self ON fact.grid_id = self.grid_id
@@ -46,6 +52,8 @@
         SELECT
             fact.month_id AS "monthId",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
+            fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
             fact.index_code AS "indexCode"

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml

@@ -8,6 +8,7 @@
             fact.index_code AS "key",
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
             dict.index_name AS "name",
+            fact.score AS score,
             round(fact.WEIGHT,2) AS weight
         FROM
             fact_index_grid_sub_score fact

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmRankDao.xml

@@ -4,16 +4,19 @@
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenan.ScreenAnGrassRootsPmRankDao">
     <!--基层党员-党员排行榜单-->
     <select id="selectPmRank" resultType="com.epmet.evaluationindex.screen.dto.result.PmRankResultDTO">
-        SELECT USER_ID,
+        SELECT
+               USER_ID,
                USER_NAME,
                BRANCH_NAME,
                COMMUNITY_NAME,
                GROUP_MEMBER_TOTAL,
                TOPIC_TOTAL,
                PARTI_USER_TOTAL,
-               ISSUE_TOTAL
+               ISSUE_TOTAL,
+               MONTH_ID
         FROM screen_an_grass_roots_pm_rank
         WHERE DEL_FLAG = 0
+            AND MONTH_ID = #{monthId,jdbcType=VARCHAR}
             AND ALL_PARENT_IDS LIKE concat('%', trim(#{agencyId}), '%')
         ORDER BY GROUP_MEMBER_TOTAL DESC
         LIMIT #{topNum}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/AnGrassRootsPmRankFormDTO.java

@@ -14,6 +14,11 @@ import java.io.Serializable;
 public class AnGrassRootsPmRankFormDTO implements Serializable {
     private static final long serialVersionUID = 3642729389245262928L;
 
+    /**
+     *  月份Id
+     */
+    private String monthId;
+
     /**
      * 用户id
      */

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.62
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.69
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -2,7 +2,7 @@
 <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">
-    <version>0.3.62</version>
+    <version>0.3.69</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>

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

@@ -47,7 +47,9 @@ public class AnScreenCollController {
      */
     @PostMapping("pmrank")
     public Result pmRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<AnGrassRootsPmRankFormDTO> formDTO){
-        if(StringUtils.isBlank(customerId)) throw new ValidateException("客户Id不能为空");
+        if (StringUtils.isBlank(formDTO.getMonthId())){
+            throw new ValidateException("月份Id不能为空");
+        }
         screenCollService.pmRank(formDTO,customerId);
         return new Result();
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenAnGrassRootsPmRankDao.java

@@ -37,20 +37,21 @@ public interface ScreenAnGrassRootsPmRankDao extends BaseDao<ScreenAnGrassRootsP
     /***
      * @Description 批量删除
      * @param customerId
+     * @param monthId
      * @return int
      * @author wangc
      * @date 2020.10.09 16:07
-    */
-    int deleteBatch(@Param("customerId") String customerId);
-    
+     */
+    int deleteBatch(@Param("customerId") String customerId, @Param("monthId") String monthId);
+
     /**
-     * @Description 批量新增
      * @param list
      * @param customerId
      * @return int
+     * @Description 批量新增
      * @author wangc
      * @date 2020.10.09 16:10
-    */
-    int insertBatch(@Param("list") List<AnGrassRootsPmRankFormDTO> list,@Param("customerId") String customerId);
+     */
+    int insertBatch(@Param("list") List<AnGrassRootsPmRankFormDTO> list, @Param("customerId") String customerId);
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsPmRankEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 安宁-基层党员-排行榜单
  *
@@ -43,6 +40,11 @@ public class ScreenAnGrassRootsPmRankEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
+	/**
+	 *  月份Id
+	 */
+	private String monthId;
+
     /**
      * 用户id
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

@@ -1,10 +1,12 @@
 package com.epmet.service.evaluationindex.indexcoll.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.distributedlock.LockConstants;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.OrgTypeConstant;
@@ -29,6 +31,7 @@ import com.epmet.service.evaluationindex.indexcoll.FactIndexCollectService;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.ListUtils;
 import org.redisson.api.RLock;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -200,7 +203,17 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            factIndexGovrnAblityDeptMonthlyDao.batchInsertFactIndexGovrnAblityDeptMonthly(formDTO.getDataList(), customerId);
+            List<DeptGovrnAbilityFormDTO> dataList = formDTO.getDataList();
+            // 有 deptId字段为空时，报错提示
+            List<DeptGovrnAbilityFormDTO> deptIsNull = dataList.stream().filter(d -> null == d.getDeptId() || d.getDeptId().equals("")).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(deptIsNull)){
+                throw new RenException("治理能力-部门相关指标计算【deptId为空】的客户ID为："+customerId+"，具体信息信息为："+ JSON.toJSONString(deptIsNull));
+            }
+            // 改成分批插入
+            List<List<DeptGovrnAbilityFormDTO>> partition = ListUtils.partition(dataList, NumConstant.ONE_HUNDRED);
+            partition.forEach(p -> {
+                factIndexGovrnAblityDeptMonthlyDao.batchInsertFactIndexGovrnAblityDeptMonthly(p, customerId);
+            });
         }
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/AnScreenCollServiceImpl.java

@@ -85,9 +85,9 @@ public class AnScreenCollServiceImpl implements AnScreenCollService {
         List<AnGrassRootsPmRankFormDTO> dataList = formDTO.getDataList();
         if(CollectionUtils.isEmpty(dataList)) return ;
         if(formDTO.getIsFirst()){
-            int affectRows = pmRankDao.deleteBatch(customerId);
+            int affectRows = pmRankDao.deleteBatch(customerId,formDTO.getMonthId());
             while(affectRows >= NumConstant.ONE){
-                affectRows = pmRankDao.deleteBatch(customerId);
+                affectRows = pmRankDao.deleteBatch(customerId,formDTO.getMonthId());
             }
         }
         Lists.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED).forEach(list -> {

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenAnGrassRootsPmRankDao.xml

@@ -9,6 +9,7 @@
         screen_an_grass_roots_pm_rank
         WHERE
         CUSTOMER_ID = #{customerId}
+        and MONTH_ID = #{monthId,jdbcType=VARCHAR}
         LIMIT 1000
     </delete>
 
@@ -17,6 +18,7 @@
         (
                 id,
                 customer_id,
+                month_id,
                 user_id,
                 user_name,
                 branch_id,
@@ -37,6 +39,7 @@
         (
                 (SELECT REPLACE(UUID(), '-', '') AS id),
                 #{customerId},
+                #{item.monthId},
                 #{item.userId},
                 #{item.userName},
                 #{item.branchId},

epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-message-server:
     container_name: epmet-message-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.28
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.29
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.28</version>
+    <version>0.3.29</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-message</artifactId>

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

@@ -22,6 +22,10 @@ public class CustomerTemplateListFormDTO implements Serializable {
      */
     @NotBlank(message="公共模板Id不能为空", groups = {AddUserInternalGroup.class})
     private String publicId;
+    /**
+     * 模板关键词Id
+     */
+    private String keyIds;
     public interface AddUserInternalGroup {}
 }
 

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

@@ -26,6 +26,10 @@ public class GetTemplateListFormDTO implements Serializable {
      * 模板类型(站内信提醒)
      */
     private String templateType;
+    /**
+     * 模板关键词Id
+     */
+    private String keyIds;
     public interface AddUserInternalGroup {}
 }
 

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.147
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.149
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.147</version>
+    <version>0.0.149</version>
 
     <parent>
         <groupId>com.epmet</groupId>

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

@@ -94,4 +94,15 @@ public interface PersonalTemplateDao extends BaseDao<PersonalTemplateEntity> {
 	 * @author sun
 	 */
     List<CustomerTemplateListResultDTO> selectCustomerTemplateList(CustomerTemplateListFormDTO formDTO);
+
+    /**
+     * 根据tid和keyIds查询是否已存在该模板类型数据
+     * @author zhaoqifeng
+     * @date 2020/11/2 10:31
+	 * @param appId
+     * @param tid
+     * @param keyIds
+     * @return java.util.List<com.epmet.dto.PersonalTemplateDTO>
+     */
+	List<PersonalTemplateDTO> selectListByKey(@Param("appId") String appId, @Param("tid") String tid, @Param("keyIds") String keyIds);
 }

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

@@ -141,4 +141,15 @@ public interface PersonalTemplateService extends BaseService<PersonalTemplateEnt
 	 * @author sun
 	 */
     List<CustomerTemplateListResultDTO> customerTemplateList(CustomerTemplateListFormDTO formDTO);
+
+    /**
+     * 根据tid和keyIds查询是否已存在该模板类型数据
+     * @author zhaoqifeng
+     * @date 2020/11/2 10:29
+	 * @param appId
+     * @param tid
+     * @param keyIds
+     * @return java.util.List<com.epmet.dto.PersonalTemplateDTO>
+     */
+	List<PersonalTemplateDTO> getListByKey(String appId, String tid, String keyIds);
 }

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

@@ -127,6 +127,7 @@ public class PersonalTemplateServiceImpl extends BaseServiceImpl<PersonalTemplat
      */
     @Override
     public List<GetTemplateListResultDTO> templateList(GetTemplateListFormDTO formDTO) {
+        formDTO.setKeyIds("5,4,2");
         //根据客户Id、appId、模板类型查询小程序订阅消息模板列表
         return baseDao.selectTemplateList(formDTO);
     }
@@ -138,7 +139,23 @@ public class PersonalTemplateServiceImpl extends BaseServiceImpl<PersonalTemplat
      */
     @Override
     public List<CustomerTemplateListResultDTO> customerTemplateList(CustomerTemplateListFormDTO formDTO) {
+        formDTO.setKeyIds("5,4,2");
         return baseDao.selectCustomerTemplateList(formDTO);
     }
 
+    /**
+     * 根据tid和keyIds查询是否已存在该模板类型数据
+     *
+     * @param appId
+     * @param tid
+     * @param keyIds
+     * @return java.util.List<com.epmet.dto.PersonalTemplateDTO>
+     * @author zhaoqifeng
+     * @date 2020/11/2 10:29
+     */
+    @Override
+    public List<PersonalTemplateDTO> getListByKey(String appId, String tid, String keyIds) {
+        return baseDao.selectListByKey(appId, tid, keyIds);
+    }
+
 }

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

@@ -180,6 +180,11 @@ public class SubscribeServiceImpl implements SubscribeService {
 		String keywords = String.join(",", formDTO.getNameList());
 		List<String> keyIdList = formDTO.getKidList().stream().map(Object::toString).collect(Collectors.toList());
 		String keyIds = String.join(",", keyIdList);
+		//根据tid和keyIds查询是否已存在该模板类型数据
+		List<PersonalTemplateDTO> list = personalTemplateService.getListByKey(formDTO.getAppId(), formDTO.getTid(), keyIds);
+		if (null != list && list.size() > NumConstant.ZERO) {
+			throw new RenException(formDTO.getTitle() + "已存在所选关键词[" + keywords + "]的模板");
+		}
 		//将公共模板存入数据库
 		PersonalTemplateDTO personalTemplateDTO = new PersonalTemplateDTO();
 		personalTemplateDTO.setCustomerId(authInfo.getCustomerId());

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

@@ -86,7 +86,8 @@
         AND customer_id = #{customerId}
         AND app_id = #{appId}
         AND title = #{templateType}
-        ORDER BY CREATED_TIME DESC
+        AND key_ids = '5,4,2'<!-- 消息更新,详情内容,时间 -->
+        ORDER BY created_time ASC
     </select>
 
     <select id="selectCustomerTemplateList" resultType="com.epmet.dto.result.CustomerTemplateListResultDTO">
@@ -102,6 +103,16 @@
         AND cm.del_flag = '0'
         AND pt.customer_id = #{customerId}
         AND pt.tid = #{publicId}
+        AND key_ids = #{keyIds}<!-- 消息更新,详情内容,时间 -->
+        ORDER BY pt.created_time ASC
+    </select>
+    <select id="selectListByKey" resultType="com.epmet.dto.PersonalTemplateDTO">
+        SELECT ID
+        FROM personal_template
+        WHERE DEL_FLAG = '0'
+          AND APP_ID=#{appId}
+          AND TID = #{tid}
+          AND KEY_IDS = #{keyIds}
     </select>
 
 </mapper>

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

@@ -79,6 +79,11 @@ public class ExtStaffInfoResultDTO implements Serializable {
      * */
     private String adminFlag;
 
+    /**
+     * 手机号
+     * */
+    private String mobile;
+
     /**
      * 用户角色列表
      * */

epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.91
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.92
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.91</version>
+    <version>0.3.92</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.45
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.46
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@
 <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">
-    <version>0.3.45</version>
+    <version>0.3.46</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-guide-server:
     container_name: resi-guide-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.20
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.21
     ports:
       - "8091:8091"
     network_mode: host # 使用现有网络

epmet-module/resi-guide/resi-guide-server/pom.xml

@@ -2,7 +2,7 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.20</version>
+    <version>0.3.21</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-guide</artifactId>

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

@@ -244,6 +244,7 @@
         <result property="profile" column="profile"/>
         <result property="realName" column="realName"/>
         <result property="gridId" column="GRID_ID"/>
+        <result property="mobile" column="MOBILE"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <collection property="roleList" ofType="com.epmet.dto.result.ExtRoleMapResultDTO">
             <result property="roleKey" column="ROLE_KEY" />
@@ -257,6 +258,7 @@
             staff.REAL_NAME AS nickname,
             '' AS PROFILE,
             staff.REAL_NAME AS realName,
+            staff.MOBILE,
             role.ROLE_KEY,
             role.ROLE_NAME,
             vis.GRID_ID