调整日志级别

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

@@ -140,7 +140,7 @@ public class IndexCalculateController {
                 long start = System.currentTimeMillis();
                 Boolean aBoolean = indexCalculateService.indexCalculate(formDTO);
                 if (aBoolean) {
-                    log.error("客户Id：{},全部指标计算完成，总耗时：{}秒", formDTO.getCustomerId(), (System.currentTimeMillis() - start) / 1000);
+                    log.error("客户Id：{},全部指标计算完成，结果:{},总耗时：{}秒", formDTO.getCustomerId(), aBoolean, (System.currentTimeMillis() - start) / 1000);
                 }
 
                 redisUtils.delete(RedisKeys.getCustomerStatsCalFlag(formDTO.getCustomerId()));

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

@@ -203,13 +203,13 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
         //计算最大最小值
         Map<String, Object> minAndMaxMap = factIndexPartyAblityCpcMonthlyDao.getExtremeValue(formDTO.getCustomerId(), formDTO.getMonthId());
         if (CollectionUtils.isEmpty(minAndMaxMap)) {
-            log.error("cpcIndexCalculate getExtremeValue customerId:{} have not any fact record", formDTO.getCustomerId());
-            throw new RenException("指标原始数据记录不存在");
+            log.warn("cpcIndexCalculate getExtremeValue customerId:{} have not any fact record", formDTO.getCustomerId());
+            return;
         }
         //指标集合
         Map<String, List<IndexGroupDetailEntity>> groupIndexDetailsMap = getIndexDetailMap(formDTO);
         if (groupIndexDetailsMap == null) {
-            log.error("calculatePartScore");
+            log.error("calculatePartScore groupIndexDetailsMap is empty");
             return;
         }
 

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

@@ -91,7 +91,7 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
     private Boolean calulateCustomerIndexScore(CalculateCommonFormDTO formDTO) {
         try {
             String customerId = formDTO.getCustomerId();
-            Boolean flag;
+            Boolean flag = false;
             long start = System.currentTimeMillis();
             try {
                 //校验是否含有组织数据
@@ -107,7 +107,6 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
                     log.info("客户Id：{}【党员相关】计算完毕，总耗时：{}秒,result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                 } catch (Exception e) {
                     log.error("indexCalculate cpcIndexCalculate exception", e);
-                    throw new RenException("indexCalculate cpcIndexCalculate exception", e);
                 }
                 //测试用
 
@@ -118,7 +117,6 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
                     log.info("客户Id：{}【网格相关】计算完毕，总耗时：{}秒,result:{},result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                 } catch (Exception e) {
                     log.error("indexCalculate calculateGridCorreLation exception", e);
-                    throw new RenException("indexCalculate calculateGridCorreLation exception", e);
                 }
                 //计算社区
                 start = System.currentTimeMillis();
@@ -127,7 +125,6 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
                     log.info("客户Id：{}【社区相关】计算完毕，总耗时：{}秒,result:{},result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                 } catch (Exception e) {
                     log.error("indexCalculate calCommunityAll exception", e);
-                    throw new RenException("indexCalculate calAll exception", e);
                 }
 
                 //计算街道
@@ -137,7 +134,6 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
                     log.info("客户Id：{}【街道相关】计算完毕，总耗时：{}秒,result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                 } catch (Exception e) {
                     log.error("indexCalculate calStreetAll exception", e);
-                    throw new RenException("indexCalculate calStreetAll exception", e);
                 }
 
                 //计算区直属
@@ -147,7 +143,6 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
                     log.info("客户Id：{}【区直部门】计算完毕，总耗时：{}秒,result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                 } catch (Exception e) {
                     log.error("indexCalculate calculateDeptCorreLation exception", e);
-                    throw new RenException("indexCalculate calculateDeptCorreLation exception", e);
                 }
 
                 //计算全区
@@ -157,7 +152,6 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
                     log.info("客户Id：{}【全区相关】计算完毕，总耗时：{}秒,result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                 } catch (Exception e) {
                     log.error("indexCalculate calDistrictAll exception", e);
-                    throw new RenException("indexCalculate calDistrictAll exception", e);
                 }
             } catch (RenException e) {
                 flag = false;