Преглед на файлове

环境变量化最小再统计间隔

ximinghao преди 7 месеца
родител
ревизия
3e68f3d693

+ 3 - 1
src/main/java/com/skyversation/xjcy/service/DataCountService.java

@@ -7,6 +7,7 @@ import com.skyversation.xjcy.enums.EnterpriseLevel;
 import com.skyversation.xjcy.util.SpecialisationStringCollector;
 import com.skyversation.xjcy.util.TimeUtil;
 import lombok.NoArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -46,7 +47,8 @@ public class DataCountService {
     List<IndustrialPark> allPark = new ArrayList<>();
 
     //简单限制统计频率
-    private static final long INTERVAL_MILLIS = 250;
+    @Value("${app.count-cache-length}")
+    private long INTERVAL_MILLIS ;
 
     private final AtomicLong lastStartTime = new AtomicLong(0);
 

+ 3 - 3
src/main/java/com/skyversation/xjcy/service/SerialNumberGenerator.java

@@ -22,7 +22,7 @@ public class SerialNumberGenerator {
     @Getter
     public enum Prefix {
         XS("XS", "1576", "c_clue_code"),
-        //PT("PT","" ,"" ) ,
+        PT("PT", "1616", "c_task_code"),
         ED("ED", "1587", "c_work_order_code"),
         EP("EP", "1592", "c_product_code"),
         PR("PR", "1591", "c_requirement_code");
@@ -67,9 +67,9 @@ public class SerialNumberGenerator {
             try {
                 String today = currentDate();
                 int max = dmsService.getLargestCode(token, prefix.getColumId(), prefix.getCodeColumn(), today);
-                initPrefix(prefix, max+1 , today);
+                initPrefix(prefix, max + 1, today);
             } catch (Exception e) {
-                System.out.println(prefix+"流水号初始化失败");
+                System.out.println(prefix + "流水号初始化失败");
                 e.printStackTrace();
             }
         }

+ 7 - 0
src/main/java/com/skyversation/xjcy/util/TimeUtil.java

@@ -12,6 +12,13 @@ public class TimeUtil {
 
     private TimeUtil() {}
 
+    public static String lastMonth(LocalDate now){
+        return YearMonth.from(now).minusMonths(1).format(MM_FMT);
+    }
+    public static String last2Month(LocalDate now){
+        return YearMonth.from(now).minusMonths(2).format(MM_FMT);
+    }
+
     public static <T extends DateInterval> Map<String, List<T>> split(List<T> src, LocalDate now) {
         YearMonth firstMonth = YearMonth.from(now.minusMonths(12));
         YearMonth lastMonth  = YearMonth.from(now.minusMonths(1));

+ 3 - 2
src/main/resources/application.yml

@@ -19,11 +19,12 @@ logging:
           web:
             servlet: DEBUG
 app:
+  count-cache-length: ${COUNT_CACHE_LENGTH:5*1000}
   dms:
     path: ${DMS_PATH:http://121.43.55.7:10081/dms}
   oauth:
-    login-name: ${DMS_LOGIN_NAME:user002}
-    password: ${DMS_PASSWORD:1234567890}
+    login-name: ${DMS_LOGIN_NAME:user_hj}
+    password: ${DMS_PASSWORD:Hj@123456}
     path: ${OAUTH_LOGIN_PATH:http://121.43.55.7:10086/oauth/api/user/login}
   ows:
     path: ${OWS_PATH:http://121.43.55.7:8889/geoserver/xjxm/ows}