Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp

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

@@ -115,6 +115,7 @@ public class IndexCalculateController {
 
     /**
      * 指标计算
+     *
      * @param formDTO
      */
     private void indexCalculate(CalculateCommonFormDTO formDTO) {
@@ -137,11 +138,13 @@ public class IndexCalculateController {
 
     /**
      * 提交异步计算
+     *
      * @param formDTO
      * @return
      */
     private void submitCalculate(CalculateCommonFormDTO formDTO) {
         Future<?> future = singleThreadPool.submit(() -> {
+            try {
                 long start = System.currentTimeMillis();
                 Boolean aBoolean = indexCalculateService.indexCalculate(formDTO);
                 if (aBoolean) {
@@ -160,6 +163,9 @@ public class IndexCalculateController {
                 //}
                 //redisUtils.delete(RedisKeys.getCustomerStatsCalFlag(formDTO.getCustomerId()));
                 //futureMap.remove(formDTO.getCustomerId());
+            } catch (Exception e) {
+                log.warn("submitCalculate exception", e);
+            }
         });
 
         futureMap.put(formDTO.getCustomerId(), future);
@@ -172,6 +178,7 @@ public class IndexCalculateController {
 
     /**
      * 终止计算
+     *
      * @param form
      * @return
      */
@@ -194,11 +201,15 @@ public class IndexCalculateController {
     @PostMapping("reAll")
     public Result<Boolean> calculateAll(@RequestBody CalculateCommonFormDTO formDTO) {
         long start = System.currentTimeMillis();
+        try {
             Boolean aBoolean = indexCalculateService.indexCalculate(formDTO);
             HttpClientManager.getInstance().sendAlarmMsg(EnvEnum.getCurrentEnv().getName() + "客户Id：" + formDTO.getCustomerId() + ",calculateAll全部指标计算完成,是否成功：" + aBoolean + "，总耗时：" + (System.currentTimeMillis() - start) / 1000 + "秒");
             if (aBoolean) {
                 return new Result<Boolean>().ok(true);
             }
+        } catch (Exception e) {
+            return new Result<Boolean>().error(e.getMessage());
+        }
         return new Result<Boolean>().error("指标计算失败");
     }
 

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

@@ -57,6 +57,7 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
 
     /**
      * 返回当前客户下，未匹配到的 【社区级】 组织信息
+     *
      * @param customerId 客户id
      * @param agencyIds  组织id集合
      * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity>
@@ -76,8 +77,8 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
     List<ScreenCustomerAgencyEntity> selectListAgencyInfo(@Param("customerId") String customerId);
 
     /**
-     * @Description  根据agencyId查询上级组织Id
      * @param agencyId
+     * @Description 根据agencyId查询上级组织Id
      * @author zxc
      * @date 2020/9/8 3:36 下午
      */
@@ -85,6 +86,7 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
 
     /**
      * 返回当前客户下，未匹配到的 【乡（镇、街道）级、区县级】 组织信息
+     *
      * @param customerId 客户id
      * @param agencyIds  组织id集合
      * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity>
@@ -93,4 +95,11 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
      **/
     List<ScreenCustomerAgencyEntity> selectListMismatcStreetAndDistrictAgencyInfo(@Param("customerId") String customerId, @Param("agencyIds") String[] agencyIds);
 
+    /**
+     * desc:获取客户的组织条数
+     *
+     * @param customerId
+     * @return
+     */
+    int selectCountByCustomerId(@Param("customerId") String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java

@@ -75,8 +75,8 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
         //获取指标权重
         List<IndexGroupDetailEntity> parentIndexDetails = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(), IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode());
         if (CollectionUtils.isEmpty(parentIndexDetails)) {
-            log.warn("cpcIndexCalculate customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
+            log.error("cpcIndexCalculate customerId:{} have not init index", formDTO.getCustomerId());
-            throw new RenException("客户【党员相关】指标权重信息不存在");
+            throw new RenException("客户Id:" + formDTO.getCustomerId() + "【党员相关】指标权重信息不存在");
         }
         Map<String, IndexGroupDetailEntity> indexWeightMap = parentIndexDetails.stream().collect(Collectors.toMap(IndexGroupDetailEntity::getIndexCode, o -> o));
         int pageNo = NumConstant.ONE;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.redis.IndexCalRedis;
@@ -47,6 +48,8 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
     private DeptScoreService deptScoreService;
     @Autowired
     private FactIndexCollectService factIndexCollectService;
+    @Autowired
+    private ScreenCustomerAgencyDao screenCustomerAgencyDao;
 
 
     @Override
@@ -91,6 +94,12 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
             Boolean flag;
             long start = System.currentTimeMillis();
             try {
+                //校验是否含有组织数据
+                int agencyCount = screenCustomerAgencyDao.selectCountByCustomerId(formDTO.getCustomerId());
+                if (agencyCount < 1) {
+                    log.info("客户id:{},组织结构数据缺失，请先上传后再计算", formDTO.getCustomerId());
+                    throw new RenException("组织结构数据缺失，请先上传后再计算");
+                }
                 //计算党员相关的
                 try {
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/BatchScoreCalculator.java

@@ -64,6 +64,10 @@ public class BatchScoreCalculator {
                 } else {
                     normalizeValue = scoreCalculator.normalize(getFinalSampleValue(vo.getSampleValue(), threshold));
                 }
+                //反正切函数 [-pi/2,pi/2]
+                if (idx.getScoreCalculator().getMaxValue().compareTo(idx.getScoreCalculator().getMinValue()) == 0) {
+                    normalizeValue = new BigDecimal(Math.atan(new Double(vo.getSampleValue().toString())) / Math.PI * 100).setScale(6, RoundingMode.HALF_UP);
+                }
                 BigDecimal score = normalizeValue.multiply(weight).setScale(6, RoundingMode.HALF_UP);
                 CalculateResult result = scoreCountOfSamples.get(sampleId);
 

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

@@ -128,4 +128,9 @@
             </foreach>
         </if>
     </select>
+
+    <select id="selectCountByCustomerId" resultType="int">
+        select count(*) from screen_customer_agency
+        where  DEL_FLAG = '0' and CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/normalizing/DemoScoreCal.java

@@ -257,5 +257,33 @@ public class DemoScoreCal {
         System.err.println("-----------------2222222222---------------");
     }
 
+    @Test
+    public void testMath() {
+        // 每个指标需要单独的分支计算器，因为每个指标的最大最小值是不同的
+        ScoreCalculator<Integer> sc1 = new BigDecimalScoreCalculator(new BigDecimal(8), new BigDecimal(8), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.POSITIVE);
+        ScoreCalculator<Integer> sc2 = new BigDecimalScoreCalculator(new BigDecimal(10), new BigDecimal(10), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.POSITIVE);
+
+        List<SampleValue<Integer>> index1SampleValues = Arrays.asList(new SampleValue<>("id1", 4), new SampleValue<>("id2", 1), new SampleValue<>("id3", 8));
+        List<SampleValue<Integer>> index2SampleValues = Arrays.asList(new SampleValue<>("id1", 1), new SampleValue<>("id2", 8), new SampleValue<>("id3", 3));
+
+        // 每个指标的信息，包括样本列表，权重，指标标记
+        IndexInputVO<Integer> index1VO = new IndexInputVO<>("aaa", "a:bbb2", index1SampleValues, new BigDecimal(10), new BigDecimal(1), false, sc1);
+        IndexInputVO<Integer> index2VO = new IndexInputVO<>("bbb", "a:bbb2", index2SampleValues, new BigDecimal(10), new BigDecimal(1), false, sc2);
+
+        List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO);
+
+        BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
+        HashMap<String, CalculateResult> result = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
+
+        System.err.println("--------------------------------");
+        result.forEach((key, value) -> {
+            System.out.println(key.concat("的总得分为:") + value.getTotalScore());
+            //System.out.println(JSON.toJSONString(indexInputVOS));
+            value.getDetails().forEach(o -> System.out.println(JSON.toJSONString(o)));
+        });
+
+        System.err.println("--------------------------------");
+    }
+
 
 }

epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/normalizing/MathUtilTest.java

@@ -0,0 +1,17 @@
+package com.epmet.stats.test.normalizing;
+
+public class MathUtilTest {
+    public static void main(String[] args) {
+        double tan = Math.atan(4);
+        double tan2 = Math.atan(1);
+        double tan3 = Math.atan(8);
+        double tan4 = Math.atan(3);
+
+
+        System.out.println((tan / Math.PI));
+        System.out.println((tan2 / Math.PI));
+        System.out.println((tan3 / Math.PI));
+        System.out.println((tan4 / Math.PI * 200));
+    }
+
+}