feat: 修改配置文件

guzijian
1 parent c9e95116
Showing 4 changed files with 56 additions and 27 deletions
Bsth-admin/src/main/java/com/ruoyi/common/SchedulerProperty.java
Bsth-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/common/cache/TempCache.java
Bsth-admin/src/main/java/com/ruoyi/config/SchedulerConfig.java
+package com.ruoyi.common;
+
+import lombok.Data;
+
+@Data
+public class SchedulerProperty {
+    private String getSchedulingInfoUrl;
+    private String nonce;
+    private String password;
+}
 package com.ruoyi.common.cache;
  
+import com.ruoyi.common.SchedulerProperty;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.utils.ConstDateUtil;
 import org.slf4j.Logger;
@@ -24,49 +25,42 @@ import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE
 @Component
 public class SchedulingCache {
  
-    Logger log = LoggerFactory.getLogger(SchedulingCache.class);
+    private static final Logger log = LoggerFactory.getLogger(SchedulingCache.class);
  
  
-    //    @Value("${api.url.getSchedulingInfoNew}")
-    private static final String getSchedulingInfoUrl = "http://192.168.50.120:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s";
-    //    @Value("${api.config.nonce}")
-    private static final String NONCE = "adfsad";
-    //    @Value("${api.config.password}")
-    private static final String PASSWORD = "c4dd3d8cb9a82f6d6a625818618b28ca7bebb464";
-
     /**
      * 实时更新排班
      */
-    private static ConcurrentHashMap<String, Map<String, List<ResponseSchedulingDto>>> cacheScheduling = new ConcurrentHashMap<>();
+    private static final ConcurrentHashMap<String, Map<String, List<ResponseSchedulingDto>>> CONCURRENT_HASH_MAP = new ConcurrentHashMap<>();
  
  
-    public SchedulingCache() {
+    public SchedulingCache(SchedulerProperty property) {
         log.info("项目启动加载中获取实时班次并存入缓存-----");
-        schedulingInit();
+        schedulingInit(property);
     }
  
  
     /**
      * 初始化排班数据 并存入缓存
      */
-    private void schedulingInit() {
+    private void schedulingInit(SchedulerProperty property) {
         String formatNowDate = ConstDateUtil.formatDate(new Date());
-        String url = getUrl(formatNowDate);
+        String url = getUrl(formatNowDate, property);
         log.info("初始化排班数据:{}", formatNowDate);
         saveSchedulingToCache(url, formatNowDate);
         String formatYesterdayDate = ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1));
         log.info("初始化排班数据:{}", formatYesterdayDate);
-        url = getUrl(formatYesterdayDate);
+        url = getUrl(formatYesterdayDate, property);
         saveSchedulingToCache(url, formatYesterdayDate);
     }
  
-    private String getUrl(String formatNowDate) {
+    private String getUrl(String formatNowDate, SchedulerProperty property) {
         String url = null;
         long timestamp = System.currentTimeMillis();
 //        String formatDate = ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1));
         // 获取排班请求
         try {
-            url = String.format(getSchedulingInfoUrl, "99", formatNowDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
+            url = String.format(property.getGetSchedulingInfoUrl(), "99", formatNowDate, timestamp, property.getNonce(), property.getPassword(), getSHA1(getStringStringMap(String.valueOf(timestamp), property)));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -164,32 +158,32 @@ public class SchedulingCache {
             }
     }
  
-    private Map<String, String> getStringStringMap(String timestamp) {
+    private Map<String, String> getStringStringMap(String timestamp, SchedulerProperty property) {
         Map<String, String> configMap = new HashMap<>(5);
         configMap.put("timestamp", String.valueOf(timestamp));
-        configMap.put("nonce", NONCE);
-        configMap.put("password", PASSWORD);
+        configMap.put("nonce", property.getNonce());
+        configMap.put("password", property.getPassword());
         return configMap;
     }
  
     public void setCacheScheduling(String key, Map<String, List<ResponseSchedulingDto>> mapValue) {
-        cacheScheduling.put(key, mapValue);
+        CONCURRENT_HASH_MAP.put(key, mapValue);
     }
  
     public void removeCacheSchedulingByKey(String key) {
-        cacheScheduling.remove(key);
+        CONCURRENT_HASH_MAP.remove(key);
     }
  
     public List<String> getKeys() {
-        return new ArrayList<>(cacheScheduling.keySet());
+        return new ArrayList<>(CONCURRENT_HASH_MAP.keySet());
     }
  
     public Integer size() {
-        return cacheScheduling.size();
+        return CONCURRENT_HASH_MAP.size();
     }
  
     public List<ResponseSchedulingDto> getCacheSchedulingMapValueByHKey(String key, String HKey) {
-        Map<String, List<ResponseSchedulingDto>> map = cacheScheduling.get(key);
+        Map<String, List<ResponseSchedulingDto>> map = CONCURRENT_HASH_MAP.get(key);
         if (Objects.isNull(map)) {
             return null;
         }
@@ -199,7 +193,7 @@ public class SchedulingCache {
     }
  
     public List<String> getHKeysByKey(String key) {
-        return new ArrayList<>(cacheScheduling.get(key).keySet());
+        return new ArrayList<>(CONCURRENT_HASH_MAP.get(key).keySet());
     }
  
 }
@@ -11,7 +11,7 @@ public class TempCache {
         map = new ConcurrentHashMap<>();
 //        map.put("620001", true);
 //        map.put("620002", true);
-        map.put("700001", true);
+//        map.put("700001", true);
         map.put("722717", true);
     }
  
@@ -42,7 +42,7 @@ public class TempCache {
     public static void resetMapStatus() {
         map.put("620001", true);
         map.put("620002", true);
-        map.put("700001", true);
+//        map.put("700001", true);
         map.put("722717", true);
     }
 }
+package com.ruoyi.config;
+
+import com.ruoyi.common.SchedulerProperty;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class SchedulerConfig {
+    @Value("${api.url.getSchedulingInfoNew}")
+    private String getSchedulingInfoUrl;
+    @Value("${api.config.nonce}")
+    private String nonce;
+    @Value("${api.config.password}")
+    private String password;
+
+    @Bean
+    public SchedulerProperty getSchedulerProperty(){
+        SchedulerProperty property = new SchedulerProperty();
+        property.setPassword(password);
+        property.setNonce(nonce);
+        property.setGetSchedulingInfoUrl(getSchedulingInfoUrl);
+        return property;
+    }
+}