Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -313,7 +313,7 @@ public class RedisKeys {
 	 * @return
 	 */
 	public static String getIndexCodeWeightKey(String customerId) {
-		return rootPrefix.concat("stats:indexcal:indexcode:weight").concat(customerId);
+		return rootPrefix.concat("stats:indexcal:indexcode:weight").concat(StrConstant.COLON).concat(customerId);
 	}
 
 	/**

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

@@ -165,6 +165,7 @@ public class IndexCalculateController {
         CalculateFlagModel flag = new CalculateFlagModel();
         flag.setStatus(CalculateStatus.CALCULATING);
         flag.setForm(formDTO);
+        flag.setStartTime(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN));
         redisUtils.set(RedisKeys.getCustomerStatsCalFlag(formDTO.getCustomerId()), flag);
     }
 

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

@@ -117,7 +117,7 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
 	List<ProjectParticipatedAgencyResultDTO> selectProjectParticipatedAgency(@Param("agencies") List<String> agencies, @Param("customerId") String customerId,@Param("dimId") String dimId);
 
 	/***
-	 * @Description 评价周期内被吹哨次数
+	 * @Description 评价周期内被吹哨项目数
 	 * @param agencies
 	 * @param customerId
 	 * @param dimId

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/CalculateFlagModel.java

@@ -17,4 +17,11 @@ public class CalculateFlagModel {
      */
     private String status;
 
+    /**
+     * 开始时间
+     * CalculateStatus.java
+     */
+    private String startTime;
+
+
 }

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

@@ -138,24 +138,15 @@ public class IndexCollCommunityServiceImpl implements IndexCollCommunityService
 		List<String> agencies = agencyList.stream().map(DimAgencyDTO :: getId).distinct().collect(Collectors.toList());
 		//办结数
 		Map<String, Integer> agencyHandleCount = factOriginProjectLogDailyService.getProjectHandledAgency(agencies,customerId,dimId.getMonthId(),"month");
-		////评价周期内被吹哨且被办结(无论是哪一级办结)的项目数
-		Map<String, Integer> whistledAgencyClosedProject = factOriginProjectLogDailyService.getWhistledAgencyClosedProjectCount(agencies,customerId,dimId.getMonthId(),"month");
+		//办结率
+		Map<String, BigDecimal> handlingRatioMap = factOriginProjectLogDailyService.getHandlingRatio(agencies,customerId,dimId.getMonthId(),"month");
 		//处理效率
 		Map<String,BigDecimal> efficiencyMap = factOriginProjectLogDailyService.getAgencyWorkPieceRatio(customerId,dimId.getMonthId(),"month");
 		list.forEach(entity ->{
-			entity.setClosedProjectCount(agencyHandleCount.get(entity.getAgencyId()) == null? NumConstant.ZERO : agencyHandleCount.get(entity.getAgencyId()));
-			BigDecimal element = new BigDecimal(Optional.ofNullable(whistledAgencyClosedProject.get(entity.getAgencyId())).orElse(NumConstant.ZERO));
-			//分母，即机关参与过的项目数（去重）
-			//“评价周期内被吹哨且办结的项目数”/“评价周期内被吹哨的所有项目数”
-			Integer denominator = entity.getTransferedCount();
-			if (null != denominator && denominator != NumConstant.ZERO) {
+			//办结数
+			entity.setClosedProjectCount(Optional.ofNullable(agencyHandleCount.get(entity.getAgencyId())).orElse(NumConstant.ZERO));
 			//办结率
-				entity.setClosedProjectRatio(
-						element.divide(new BigDecimal(denominator), NumConstant.SIX, RoundingMode.HALF_UP)
-				);
-			}else{
-				entity.setClosedProjectRatio(BigDecimal.ZERO);
-			}
+			entity.setClosedProjectRatio(Optional.ofNullable(handlingRatioMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
 			//办结效率
 			entity.setHandleProjectRatio(Optional.ofNullable(efficiencyMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
 

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

@@ -131,24 +131,15 @@ public class IndexCollDistrictServiceImpl implements IndexCollDistrictService {
 		List<String> agencies = agencyList.stream().map(DimAgencyDTO :: getId).distinct().collect(Collectors.toList());
 		//办结数
 		Map<String, Integer> agencyHandleCount = factOriginProjectLogDailyService.getProjectHandledAgency(agencies,customerId,dimId.getMonthId(),"month");
-		//评价周期内被吹哨且被办结(无论是哪一级办结)的项目数
-		Map<String, Integer> whistledAgencyClosedProject = factOriginProjectLogDailyService.getWhistledAgencyClosedProjectCount(agencies,customerId,dimId.getMonthId(),"month");
+		//办结率
+		Map<String, BigDecimal> handlingRatioMap = factOriginProjectLogDailyService.getHandlingRatio(agencies,customerId,dimId.getMonthId(),"month");
 		//处理效率
 		Map<String,BigDecimal> efficiencyMap = factOriginProjectLogDailyService.getAgencyWorkPieceRatio(customerId,dimId.getMonthId(),"month");
 		list.forEach(entity ->{
+			//办结数
 			entity.setClosedProjectCount(agencyHandleCount.get(entity.getAgencyId()) == null? NumConstant.ZERO : agencyHandleCount.get(entity.getAgencyId()));
-			BigDecimal element = new BigDecimal(Optional.ofNullable(whistledAgencyClosedProject.get(entity.getAgencyId())).orElse(NumConstant.ZERO));
-			//分母，即机关参与过的项目数（去重）
-			//“评价周期内被吹哨且办结的项目数”/“评价周期内被吹哨的所有项目数”
-			Integer denominator = entity.getTransferedCount();
-			if (null != denominator && denominator != NumConstant.ZERO) {
 			//办结率
-				entity.setClosedProjectRatio(
-						element.divide(new BigDecimal(denominator), NumConstant.SIX, RoundingMode.HALF_UP)
-				);
-			}else{
-				entity.setClosedProjectRatio(BigDecimal.ZERO);
-			}
+			entity.setClosedProjectRatio(Optional.ofNullable(handlingRatioMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
 			//办结效率
 			entity.setHandleProjectRatio(Optional.ofNullable(efficiencyMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
 		});

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

@@ -129,24 +129,15 @@ public class IndexCollStreetServiceImpl implements IndexCollStreetService {
 		List<String> agencies = agencyList.stream().map(DimAgencyDTO :: getId).distinct().collect(Collectors.toList());
 		//办结数
 		Map<String, Integer> agencyHandleCount = factOriginProjectLogDailyService.getProjectHandledAgency(agencies,customerId,dimId.getMonthId(),"month");
-		////评价周期内被吹哨且被办结(无论是哪一级办结)的项目数
-		Map<String, Integer> whistledAgencyClosedProject = factOriginProjectLogDailyService.getWhistledAgencyClosedProjectCount(agencies,customerId,dimId.getMonthId(),"month");
+		//办结率
+		Map<String, BigDecimal> handlingRatioMap = factOriginProjectLogDailyService.getHandlingRatio(agencies,customerId,dimId.getMonthId(),"month");
 		//处理效率
 		Map<String,BigDecimal> efficiencyMap = factOriginProjectLogDailyService.getAgencyWorkPieceRatio(customerId,dimId.getMonthId(),"month");
 		list.forEach(entity ->{
+			//办结数
 			entity.setClosedProjectCount(agencyHandleCount.get(entity.getAgencyId()) == null? NumConstant.ZERO : agencyHandleCount.get(entity.getAgencyId()));
-			BigDecimal element = new BigDecimal(Optional.ofNullable(whistledAgencyClosedProject.get(entity.getAgencyId())).orElse(NumConstant.ZERO));
-			//分母，吹哨次数
-			Integer denominator = entity.getTransferedCount();
-			if (null != denominator && denominator != NumConstant.ZERO) {
 			//办结率
-				//“评价周期内被吹哨且办结的项目数”/“评价周期内被吹哨的所有项目数”
-				entity.setClosedProjectRatio(
-						element.divide(new BigDecimal(denominator), NumConstant.SIX, RoundingMode.HALF_UP)
-				);
-			}else{
-				entity.setClosedProjectRatio(BigDecimal.ZERO);
-			}
+			entity.setClosedProjectRatio(Optional.ofNullable(handlingRatioMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
 			//办结效率
 			entity.setHandleProjectRatio(Optional.ofNullable(efficiencyMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
 		});

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

@@ -178,7 +178,7 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
     Map<String,Integer> getProjectHandledAgency(List<String> agencies, String customerId, String dimId,String dateType);
     
     /**
-     * @Description 评价周期内被吹哨且被办结(无论是哪一级办结)的项目数
+     * @Description 办结率
      * @param agencies
      * @param dimId
      * @param dateType - 日期维度类型  month  date  week  quarter year
@@ -186,7 +186,7 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
      * @author wangc
      * @date 2020.09.23 10:06
     **/
-    Map<String,Integer> getWhistledAgencyClosedProjectCount(List<String> agencies, String customerId,String dimId,String dateType);
+    Map<String,BigDecimal> getHandlingRatio(List<String> agencies, String customerId,String dimId,String dateType);
 
     /**
      * @Description 计算机关办结项目效率

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

@@ -151,7 +151,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
                     log.error("抽取【话题数据】发生异常,参数:" + JSON.toJSONString(paramNew), e);
                 }
             }
-            log.info("extractAll end param:{}", JSON.toJSONString(paramNew));
+            log.debug("extractAll end param:{}", JSON.toJSONString(paramNew));
         });
         threadPool.submit(() -> {
             ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);

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

@@ -184,7 +184,7 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
 
 
     /**
-     * @Description 评价周期内被吹哨且被办结(无论是哪一级办结)的项目数
+     * @Description 办结率
      * @param agencies
      * @param dimId
      * @param dateType - 日期维度类型  month  date  week  quarter year
@@ -193,12 +193,26 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
      * @date 2020.09.23 10:06
      **/
     @Override
-    public Map<String, Integer> getWhistledAgencyClosedProjectCount(List<String> agencies, String customerId,String dimId, String dateType) {
-        Map<String,Integer> result = new HashMap<>();
+    public Map<String, BigDecimal> getHandlingRatio(List<String> agencies, String customerId,String dimId, String dateType) {
+        //计算方式：“评价周期内被吹哨且办结(无论是哪一级办结)的项目数”/“评价周期内被吹哨的所有项目数”
+
+        Map<String,BigDecimal> result = new HashMap<>();
         List<ProjectParticipatedAgencyResultDTO> projectAgencyCount = baseDao.selectWhistledAgencyClosedProjectCount(agencies,customerId,dimId);
         if(!CollectionUtils.isEmpty(projectAgencyCount)){
-           result = projectAgencyCount.stream().collect(Collectors.toMap(ProjectParticipatedAgencyResultDTO::getAgencyId,ProjectParticipatedAgencyResultDTO::getCount));
+            Map<String,Integer> whistledAndHandledProjectTotalMap = projectAgencyCount.stream().collect(Collectors.toMap(ProjectParticipatedAgencyResultDTO::getAgencyId,ProjectParticipatedAgencyResultDTO::getCount));
+            List<ProjectParticipatedAgencyResultDTO> whistledProjectTotal = baseDao.selectAgencyWhistledCount(agencies,customerId,dimId);
+            Map<String,Integer> whistledProjectTotalMap = whistledProjectTotal.stream().collect(Collectors.toMap(ProjectParticipatedAgencyResultDTO::getAgencyId,ProjectParticipatedAgencyResultDTO::getCount));
+            whistledAndHandledProjectTotalMap.forEach((agencyId,count) -> {
+                //分母 被吹哨项目数
+                Integer denominator = whistledProjectTotalMap.get(agencyId);
+                if(null == denominator || NumConstant.ZERO == denominator){
+                    result.put(agencyId,BigDecimal.ZERO);
+                }else{
+                    result.put(agencyId,new BigDecimal(count).divide(new BigDecimal(denominator), NumConstant.SIX, RoundingMode.HALF_UP));
                 }
+            });
+        }
+
         return result;
     }
 

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

@@ -2,7 +2,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.enums.EnvEnum;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
@@ -167,6 +169,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         }catch (Exception e){
             log.error("基层治理-难点赌点抽取到大屏失败，customerId为："+customerId+"dateId为："+dateId, e);
         }
+        log.info("===== extractDaily method end ======");
     }
 
     /**
@@ -245,14 +248,17 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         //此方法保持在最后即可   计算指标分数 todo 优化 手动创建线程池 控制任务数量
         ExecutorService pool = Executors.newSingleThreadExecutor();
         pool.submit(() -> {
+            long start = System.currentTimeMillis();
             CalculateCommonFormDTO formDTO1 = new CalculateCommonFormDTO();
             try {
                 formDTO1.setMonthId(monthId);
                 formDTO1.setCustomerId(customerId);
-                indexCalculateService.indexCalculate(formDTO1);
+                Boolean aBoolean = indexCalculateService.indexCalculate(formDTO1);
+                HttpClientManager.getInstance().sendAlarmMsg(EnvEnum.getCurrentEnv().getName() + "客户Id：" + formDTO.getCustomerId() + ",calculateAll全部指标计算完成,是否成功：" + aBoolean + "，总耗时：" + (System.currentTimeMillis() - start) / 1000 + "秒");
             } catch (Exception e) {
                 log.error("extractMonthly 计算分数异常，参数:{}", JSON.toJSONString(formDTO1));
             }
         });
+        log.info("===== extractMonthly method end ======");
     }
 }

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

@@ -23,7 +23,7 @@
                 AND da.`LEVEL` = #{level}
         WHERE
             fopld.IS_ACTIVE = 0
-          AND fopld.ACTION_CODE = 'transfer'
+          AND (fopld.ACTION_CODE = 'transfer' OR fopld.ACTION_CODE = 'created')
           AND fopld.MONTH_ID = #{monthId}
           AND fopld.CUSTOMER_ID = #{customerId}
         GROUP BY
@@ -160,11 +160,11 @@
         GROUP BY AGENCY_ID
     </select>
 
-    <!-- 评价周期内被吹哨次数 -->
+    <!-- 评价周期内被吹哨项目数-->
     <select id="selectAgencyWhistledCount" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">
         SELECT
             AGENCY_ID,
-            COUNT(ID) AS count
+            COUNT(DISTINCT PROJECT_ID) AS count
         FROM
         fact_origin_project_log_daily
         WHERE DEL_FLAG = '0'
@@ -172,6 +172,18 @@
         AND IS_ACTIVE = '0'
         <if test='null != dimId and "" != dimId.trim()'>
            AND MONTH_ID = #{dimId}
+           AND NOT EXISTS(
+                SELECT ID
+                FROM fact_origin_project_log_daily
+                WHERE DEL_FLAG = '0'
+                AND MONTH_ID <![CDATA[ < ]]> #{dimId}
+                AND IS_ACTIVE = '0'
+        <if test="agencies != null and agencies.size() > 0">
+                <foreach collection="agencies" item="agencyId" open="AND (" close=" )" separator=" OR ">
+                    AGENCY_ID = #{agencyId}
+                </foreach>
+        </if>
+            )
         </if>
         <if test="agencies != null and agencies.size() > 0">
             <foreach collection="agencies" item="agencyId" open="AND (" close=" )" separator=" OR ">
@@ -278,7 +290,6 @@
             AND log1.IS_ACTIVE = '1'
             AND log1.ACTION_CODE = 'close'
     </select>
-
     <select id="selectGridResponse" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT a.ORG_ID,
                a.count AS "sum",