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

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/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/ScoreListResultDTO.java

@@ -25,9 +25,17 @@ public class ScoreListResultDTO implements Serializable {
      * 本级分数(保留一位小数)
      */
     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/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml

@@ -26,7 +26,11 @@
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
             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

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

@@ -26,7 +26,11 @@
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
             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

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

@@ -26,7 +26,11 @@
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
             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

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-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/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-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