فهرست منبع

修复一些零散的bug

ximinghao 5 ماه پیش
والد
کامیت
b04962d035
2فایلهای تغییر یافته به همراه5 افزوده شده و 6 حذف شده
  1. 4 5
      src/main/java/com/skyversation/xjcy/service/DataCountService.java
  2. 1 1
      src/main/resources/application.yml

+ 4 - 5
src/main/java/com/skyversation/xjcy/service/DataCountService.java

@@ -246,10 +246,6 @@ public class DataCountService {
         for (IndustrialPark industrialPark : allPark) {
             String parkCode = industrialPark.getCParkCode();
 
-            for (EnterpriseLevel value : EnterpriseLevel.values()) {
-                enterPriceLevelCountByPark.get(value).put(industrialPark.getCResourceName(), 0);
-            }
-
             List<IndustrialPark> allBuild;
             List<IndustrialPark> allRoom = new ArrayList<>();
 
@@ -340,13 +336,16 @@ public class DataCountService {
                 tempCacheBuildData.put(buildCode, buildData);
             }
 
+            for (EnterpriseLevel value : EnterpriseLevel.values()) {
+                enterPriceLevelCountByPark.get(value).put(industrialPark.getCResourceName(), 0);
+            }
             for (String enterpriseCode : inParkEnterpriseCode) {
                 if (aliveEnterpriseMap.containsKey(enterpriseCode)) {
                     Enterprise enterprise = aliveEnterpriseMap.get(enterpriseCode);
 
                     EnterpriseLevel.ofJsonValue(enterprise.getCompanyLevel()).ifPresent(level -> {
                         Map<String, Integer> map = enterPriceLevelCountByPark.get(level);
-                        map.put(enterpriseCode, map.get(enterprise.getCEnterpriseName()) + 1);
+                        map.put(industrialPark.getCResourceName(), map.get(industrialPark.getCResourceName()) + 1);
                     });
 
                     EnterpriseEconomicCount ytdThisYear = economicCountByYtdThisYear.get(enterpriseCode);

+ 1 - 1
src/main/resources/application.yml

@@ -19,7 +19,7 @@ logging:
           web:
             servlet: DEBUG
 app:
-  count-cache-length: ${COUNT_CACHE_LENGTH:5*1000}
+  count-cache-length: ${COUNT_CACHE_LENGTH:5000}
   dms:
     path: ${DMS_PATH:http://121.43.55.7:10081/dms}
   oauth: