优化

benyun-core/src/main/java/com/ruoyi/benyun/config/QuartzConfig.java

@@ -32,7 +32,7 @@ public class QuartzConfig {
     @Bean
     public Trigger AnalyseTrigger() {
         //定义Cron表达式
-        CronScheduleBuilder cron = CronScheduleBuilder.cronSchedule("0 0 0 18 10 ? ");
+        CronScheduleBuilder cron = CronScheduleBuilder.cronSchedule("0 0 0 1/15 * ? ");
         cron.inTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
 
         return TriggerBuilder
@@ -55,18 +55,18 @@ public class QuartzConfig {
 
 
 
-//    @Bean
-//    public Trigger WriteRedisTrigger(){
-//        //定义Cron表达式
-//        CronScheduleBuilder cron  = CronScheduleBuilder.cronSchedule("0 0 0 18 10 ? ");
-//        cron.inTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-//
-//        return TriggerBuilder
-//            .newTrigger()
-//            .forJob(WriteRedisJobDetail()) //绑定要运行的JobDetail对象,这是得到的是Spring容器里的JobDetail
-//            .withIdentity("writeRedisTrigger") //给当前Trigger对象起名字，名字任意
-//            .withSchedule(cron) //绑定cron表达式
-//            .build();
-//    }
+    @Bean
+    public Trigger WriteRedisTrigger(){
+        //定义Cron表达式
+        CronScheduleBuilder cron  = CronScheduleBuilder.cronSchedule("0 0 0 * * ? *");
+        cron.inTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+
+        return TriggerBuilder
+            .newTrigger()
+            .forJob(WriteRedisJobDetail()) //绑定要运行的JobDetail对象,这是得到的是Spring容器里的JobDetail
+            .withIdentity("writeRedisTrigger") //给当前Trigger对象起名字，名字任意
+            .withSchedule(cron) //绑定cron表达式
+            .build();
+    }
 
 }

benyun-core/src/main/java/com/ruoyi/benyun/utils/WdRedisStoreage.java

@@ -19,6 +19,8 @@ import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.FutureTask;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 @Component
@@ -139,6 +141,7 @@ public class WdRedisStoreage {
             hashMap1.put("total",1);
             CompletableFuture<Void> future = null;
             for (String s : hashMap.keySet()) {
+                FutureTask
                 future = CompletableFuture.runAsync(()->{
                     synchronized (this){
                         if(hashMap1.get("total")%1000 == 0){

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/ChannelAnalyseServiceImpl.java

@@ -383,39 +383,33 @@ public class ChannelAnalyseServiceImpl implements ChannelAnalyseService {
         });
 
         List<StoreWd> storeWds = storeWdDao.perCapitaConsumpAnalyse(queryWrapper);
-        HashMap<String, Integer> hashMap = new HashMap<>();
-        hashMap.put("0~20",0);
-        hashMap.put("20~50",0);
-        hashMap.put("50~100",0);
-        hashMap.put("100~200",0);
-        hashMap.put("200以上",0);
+        LinkedHashMap<String, Integer> linkedHashMap = new LinkedHashMap<>();
+        linkedHashMap.put("0~20",0);
+        linkedHashMap.put("20~50",0);
+        linkedHashMap.put("50~100",0);
+        linkedHashMap.put("100~200",0);
+        linkedHashMap.put("200以上",0);
         for (StoreWd storeWd : storeWds) {
             if (storeWd.getPerCapitaConsumption() != null){
                 if (storeWd.getPerCapitaConsumption() >= 0 && storeWd.getPerCapitaConsumption()<20){
-                    hashMap.put("0~20",hashMap.get("0~20")+1);
+                    linkedHashMap.put("0~20",linkedHashMap.get("0~20")+1);
                 }else if(storeWd.getPerCapitaConsumption() >= 20 && storeWd.getPerCapitaConsumption()<50){
-                    hashMap.put("20~50",hashMap.get("20~50")+1);
+                    linkedHashMap.put("20~50",linkedHashMap.get("20~50")+1);
                 }else if(storeWd.getPerCapitaConsumption() >= 50 && storeWd.getPerCapitaConsumption()< 100){
-                    hashMap.put("50~100",hashMap.get("50~100")+1);
+                    linkedHashMap.put("50~100",linkedHashMap.get("50~100")+1);
                 }else if(storeWd.getPerCapitaConsumption() >= 100 && storeWd.getPerCapitaConsumption()< 200){
-                    hashMap.put("100~200",hashMap.get("100~200")+1);
+                    linkedHashMap.put("100~200",linkedHashMap.get("100~200")+1);
                 }else {
-                    hashMap.put("200以上",hashMap.get("200以上")+1);
+                    linkedHashMap.put("200以上",linkedHashMap.get("200以上")+1);
                 }
             }
         }
 
         ArrayList<Histogram> list = new ArrayList<>();
-        Histogram histogram1 = new Histogram("0~20",hashMap.get("0~20"));
-        Histogram histogram2 = new Histogram("20~50",hashMap.get("20~50"));
-        Histogram histogram3 = new Histogram("50~100",hashMap.get("50~100"));
-        Histogram histogram4 = new Histogram("100~200",hashMap.get("100~200"));
-        Histogram histogram5 = new Histogram("200以上",hashMap.get("200以上"));
-        list.add(histogram1);
-        list.add(histogram2);
-        list.add(histogram3);
-        list.add(histogram4);
-        list.add(histogram5);
+        for (String s : linkedHashMap.keySet()) {
+            Histogram histogram1 = new Histogram(s,linkedHashMap.get(s));
+            list.add(histogram1);
+        }
         return list;
     }
 

ruoyi-ui/vue.config.js

@@ -35,17 +35,17 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API + "/bailianAi"]:{
-        target: `http://127.0.0.1:8080`,
+        target: `http://192.168.2.207:8080`,
         changeOrigin: true,
         pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API + '/bailianAi']: '',
+          ['^' + process.env.VUE_APP_BASE_API + '/bailianAi']: '/jzyx',
         }
       },
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://127.0.0.1:8080`,
+        target: `http://192.168.2.207:8080`,
         changeOrigin: true,
         pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
+          ['^' + process.env.VUE_APP_BASE_API]: '/jzyx'
         }
       }
     },