社区相关

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

@@ -136,12 +136,6 @@ public class DemoController {
         return new Result();
     }
 
-    @PostMapping("zxcAll")
-    public Result getZxcAll(){
-        indexCalculateCommunityService.communityRelate("b09527201c4409e19d1dbc5e3c3429a1","202008");
-        return new Result();
-    }
-
     @PostMapping("testcalculategridcorrelation")
     public Result testcalculateGridCorreLation(){
         CalculateCommonFormDTO formDTO=new CalculateCommonFormDTO("b09527201c4409e19d1dbc5e3c3429a1","202008");

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/IndexCalculateCommunityService.java

@@ -38,5 +38,12 @@ public interface IndexCalculateCommunityService {
      */
     void communityServiceAbilityCalculate(String customerId, String monthId);
 
+    /**
+     * @Description  计算社区相关
+     * @param customerId
+     * @param monthId
+     * @author zxc
+     * @date 2020/9/1 4:12 下午
+     */
     void calAll(String customerId, String monthId);
 }

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

@@ -153,14 +153,6 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         factIndexCommunityScoreDao.insertCommunityPartyRecord(subAllGridList);
     }
 
-    public HashMap<String, BigDecimal> getCalResult(MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal,List<SampleValue> ll, IndexGroupDetailEntity indexGroup){
-        BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.POSITIVE);
-        IndexInputVO index1VO = new IndexInputVO(indexGroup.getIndexId(), ll,indexGroup.getThreshold(), indexGroup.getWeight(), sc);
-        List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO);
-        BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
-        return batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
-    }
-
     /**
      * @Description  社区治理能力
      * @param customerId
@@ -418,4 +410,12 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         result.setMin(min);
         return result;
     }
+
+    public HashMap<String, BigDecimal> getCalResult(MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal,List<SampleValue> ll, IndexGroupDetailEntity indexGroup){
+        BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.POSITIVE);
+        IndexInputVO index1VO = new IndexInputVO(indexGroup.getIndexId(), ll,indexGroup.getThreshold(), indexGroup.getWeight(), sc);
+        List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO);
+        BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
+        return batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
+    }
 }

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

@@ -7,7 +7,7 @@ import java.math.BigDecimal;
  */
 public class ScoreConstants {
 
-    public static final BigDecimal MIN_SCORE = new BigDecimal(1);
+    public static final BigDecimal MIN_SCORE = new BigDecimal(0);
     public static final BigDecimal MAX_SCORE = new BigDecimal(100);
 
 }