Browse Source

feat(admin): 添加高可用配置和静态资源

- 新增 application-ha.yml 配置文件,用于高可用环境配置
- 新增 application-druid3.yml 配置文件,用于 Druid 数据源配置- 添加静态资源文件,包括 HTML、CSS 和 JavaScript 文件
-配置 Redis、数据库连接池等信息
- 设置项目基本信息和日志级别
fx239 2 months ago
parent
commit
86f3f75793
100 changed files with 621 additions and 44 deletions
  1. 5 0
      pom.xml
  2. 1 1
      ruoyi-admin/pom.xml
  3. 223 43
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/JavaFunctionJobHandler.java
  4. 113 0
      ruoyi-admin/src/main/resources/application-druid3.yml
  5. 157 0
      ruoyi-admin/src/main/resources/application-ha.yml
  6. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/401-5k9hMs-t.css
  7. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/401-BxhekOaj.gif
  8. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/401-Rv3bF16v.js
  9. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/404-4V1kCEd5.js
  10. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/404-DeGkZHVm.png
  11. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/404-LmQjkdmX.css
  12. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/404-f6vEaPme.js
  13. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/404_cloud-j3sY7Q4w.png
  14. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/authRole-QjdLHUTF.js
  15. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/authUser-M1RJTGQ4.js
  16. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/basicInfoForm-Jkog39Sq.js
  17. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/bug-kJfN4VKp.js
  18. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/build-xowWPBRN.js
  19. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/button-IPY02b_z.js
  20. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/cache-uH-4DeCX.js
  21. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/cascader-rUF0-qoi.js
  22. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/chart-mwRDWaLS.js
  23. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/checkbox-pW6SnlCo.js
  24. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/clipboard-uDi-xsp1.js
  25. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/code-lTmbP-Iu.js
  26. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/color-mUI1IBjq.js
  27. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/component-HDT98Liy.js
  28. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/dashboard-7m1noK0J.js
  29. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/data-MHdMVyAS.js
  30. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/date-kn4bT7bz.js
  31. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/date-range-3-o8sJYA.js
  32. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/dict-rr-JjxkQ.js
  33. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/documentation-j05amGUz.js
  34. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/download-4wGLbm9W.js
  35. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/drag-HKPB1cGZ.js
  36. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/druid-VeHbVG7P.js
  37. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/edit-4YKK6zr_.js
  38. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/editTable-nQxUXf6t.js
  39. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/education-azEbe3wk.js
  40. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/email-e8PG-JSk.js
  41. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/example-83S1fqJp.js
  42. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/excel-KJjsa536.js
  43. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/existing-jJhe6AQJ.js
  44. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/exit-fullscreen-WAEXo1Ae.js
  45. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/eye-cUoVrCjA.js
  46. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/eye-open-o2kmxivS.js
  47. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/form-v4semqPF.js
  48. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/fullscreen-ajtUhEIx.js
  49. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/gen-p5FXvA9T.js
  50. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/genInfoForm-rY4gXw7r.js
  51. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/github-PjteK42C.js
  52. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/guide-VDrSVKUo.js
  53. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/icon-Xhw6fbkH.js
  54. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/importTable-BTdUSMUN.js
  55. 1 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-0rlirxzx.js
  56. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-17Eq_XBJ.js
  57. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-5AKKrCti.js
  58. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-5Z1RC5vc.js
  59. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-5imhPU-7.js
  60. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-7bojoP-F.js
  61. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-8iD_dKmP.js
  62. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-AWfflP0h.js
  63. 1 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-BBHGXUFQ.js
  64. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-CrkUMuzx.css
  65. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-HxhRihcw.js
  66. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-Ld1yeO7r.css
  67. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-Pe9p-98c.js
  68. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-RaUAhswM.js
  69. 119 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-TnLvmlMR.js
  70. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-UTiIowkf.css
  71. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-VZ9Git7r.js
  72. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-XTpxJfxn.js
  73. 1 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-YyHl52U_.js
  74. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-ZjGg-pIb.js
  75. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-b6ia2l-u.js
  76. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-cpypJ24r.js
  77. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-dUqn1JA4.js
  78. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-fT3U48wL.js
  79. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-hUnpvfXv.js
  80. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-hae3yAhb.css
  81. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-iA7JHNFs.js
  82. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-ifco2N5o.js
  83. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-jWngHWg0.js
  84. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-l8EL2m8T.js
  85. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-mucJIyys.js
  86. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-s7f4Etvv.css
  87. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-srPhywwF.js
  88. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-x7s63gqY.js
  89. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/index-zKKh-JIX.js
  90. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/input-zbwv-WSo.js
  91. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/international-A5Pb_sxO.js
  92. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/job-04oofYhk.js
  93. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/job-OmGvuvSL.js
  94. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/jobLog-r3sKduTP.js
  95. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/language-k6fH2ohQ.js
  96. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/link-eWwMSKBa.js
  97. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/list-TiJwGIHp.js
  98. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/list-svyQmaHI.js
  99. 0 0
      ruoyi-admin/src/main/resources/static-bd/assets/lock-EsQeCKe6.js
  100. 0 0
      ruoyi-admin/src/main/resources/static/assets/log-LC6Pea4K.js

+ 5 - 0
pom.xml

@@ -171,6 +171,11 @@
             </dependency>
             <dependency>
                 <groupId>com.ruoyi</groupId>
+                <artifactId>calc-hub</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.ruoyi</groupId>
                 <artifactId>universal-computing-platform</artifactId>
                 <version>0.0.1</version>
             </dependency>

+ 1 - 1
ruoyi-admin/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>calc-hub</artifactId>
 
     <description>
         web服务入口

+ 223 - 43
ruoyi-admin/src/main/java/com/ruoyi/web/controller/JavaFunctionJobHandler.java

@@ -1,16 +1,11 @@
 package com.ruoyi.web.controller;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.date.DateField;
-import cn.hutool.core.date.DateRange;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.collection.*;
+import cn.hutool.core.date.*;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.text.StrBuilder;
 import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.*;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.quartz.handler.IJobHandler;
@@ -35,10 +30,10 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-@Service
 //@Service
+@Service
 public class JavaFunctionJobHandler extends IJobHandler {
-    private static Logger logger = LoggerFactory.getLogger(JavaFunctionJobHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(JavaFunctionJobHandler.class);
 
     @Resource
     private AdapterApi adapter;
@@ -271,12 +266,22 @@ public class JavaFunctionJobHandler extends IJobHandler {
         return list;
     }
 
+//    public URI taosUri() {
+//        return URI.create("http://172.16.12.101:8012/ts");
+//    }
+//
+//    public URI goldenUri() {
+//        return URI.create("http://172.16.12.103:8011/ts");
+//    }
+
     public URI taosUri() {
-        return URI.create("http://172.16.12.101:8012/ts");
+//        return URI.create("http://10.220.1.8:8011/ts");
+        return URI.create("http://127.0.0.1:8011/ts");
     }
 
     public URI goldenUri() {
-        return URI.create("http://172.16.12.103:8011/ts");
+//        return URI.create("http://10.220.1.8:8011/ts");
+        return URI.create("http://127.0.0.1:8011/ts");
     }
 
     public Map<String, String> getEntityMap(String uniformCode, String institutionType) {
@@ -589,7 +594,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
                 .eq(ProBasicProjectPlan::getMonth, String.valueOf(begin.month() + 1));
         List<ProBasicProjectPlan> plantList = proBasicProjectPlanService.list(wrapperPlan);
         for (DateTime date : range) {
-
+            System.out.println();
         }
         DateTime end = DateUtil.endOfMonth(month);
         DateTime beginTq = DateUtil.offset(begin, DateField.YEAR, -1);
@@ -798,7 +803,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
         List<StationInfoDay> list = getStationinfoByDate(time0);
         Map<String, StationInfoDay> dayMap = list.stream().collect(Collectors.toMap(StationInfoDay::getStationId, Function.identity()));
         CalcCache.swdlTime.forEach((key, ts) -> {
-            int swdl = 0;
+            int swdl;
             PointData data1, data0;
             double ll = (double) (time.getTime() - ts) / 23 * 60 * 60 * 1000;
             if (ts > 0 && (ll > 23 && ll < 25)) {
@@ -834,7 +839,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
             }
         });
         for (StationInfoDay day : list) {
-            int swdl = 0;
+            int swdl;
             if (day.getSwdl() > day.getRfdl()) {
                 PointInfo info = map.get(day.getStationId());
                 Long l = CalcCache.swdlTime.get(info.getPointKey());
@@ -958,12 +963,12 @@ public class JavaFunctionJobHandler extends IJobHandler {
 
         List<PointInfo> entity = getEntity("Z-ZXYG-JX", "meter");
         entity = entity.stream().filter(e -> !"".equals(e.getProjectId())).collect(Collectors.toList());
-        getSectionDataByEntity(entity,goldenUri(), time0, time);
+        getSectionDataByEntity(entity, goldenUri(), time0, time);
         Map<String, PointInfo> swdlMap = entity.stream().collect(Collectors.toMap(PointInfo::getLineId, Function.identity()));
         List<LineInfoDay> byDate = getLineinfoByDate(time0, entity);
         String lineId;
         PointInfo swdlPi;
-        int v = 0;
+        int v;
         for (LineInfoDay day : byDate) {
             lineId = day.getLineId();
             swdlPi = swdlMap.get(lineId);
@@ -1094,7 +1099,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
         List<LineInfoDay> byDate = getLineinfoByDate2(time0, entity);
         String lineId;
         PointInfo swdlPi;
-        int v = 0;
+        int v;
         for (LineInfoDay day : byDate) {
             lineId = day.getLineId();
             swdlPi = swdlMap.get(lineId);
@@ -1309,7 +1314,8 @@ public class JavaFunctionJobHandler extends IJobHandler {
         DateTime time0 = DateUtil.offsetDay(time, -1);
 
         List<PointInfo> entity = getEntity("AI121", "turbine");
-        getZeroNextData(entity, time0, time);
+//        getZeroNextData(entity, time0, time);
+        getSectionDataByEntity(entity, goldenUri(), time0, time);
         Map<String, PointInfo> turMap = entity.stream().collect(Collectors.toMap(PointInfo::getTurbineId, Function.identity()));
         Map<String, String> fsMap = getEntityMap("AI066", "turbine");
 
@@ -1564,16 +1570,23 @@ public class JavaFunctionJobHandler extends IJobHandler {
         Map<String, EquipmentModel> map = equipmentModelService.map();
         Double capacity = map.get(ztInfo.getSpare()).getPowerProduction();
         List<PointData> zts = ztInfo.getPointDatas();
+        boolean b = false;
+        if (ylzsgds != null && CollUtil.isNotEmpty(ylzsgds)) b = true;
         for (int i = 0; i < fss.size(); i++) {
             double ssgl = gls.get(i).getValue();
             double ssfs = fss.get(i).getValue();
-            double ylzsgd = ylzsgds.get(i).getValue();
 
             if (czxd.get(i).isBooleanValue() && ssgl < capacity * 0.9) {
                 if (ssfs >= 12) {
                     zts.get(i).setDoubleValue(8.0);
                 }
-                if (ylzsgd != 0 && ylzsgd < 17.3) {//降出力
+                if (b) {
+                    double ylzsgd = ylzsgds.get(i).getValue();
+                    if (ylzsgd != 0 && ylzsgd < 17.3) {//降出力
+                        zts.get(i).setDoubleValue(8.0);
+                    }
+                }
+                if (calcQfzt(ssgl, CalcCache.fitcoef.get(ztInfo.getTurbineId()).get(ssfs)) >= 3) {
                     zts.get(i).setDoubleValue(8.0);
                 }
             }
@@ -1698,6 +1711,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
         entity.addAll(entity2);
         entity.addAll(entity4);
         entity.addAll(entity6);
+        if (CollUtil.isEmpty(entity)) return entity;
         List<String> keys = entity.stream().map(PointInfo::getPointKey).collect(Collectors.toList());
         Map<String, PointData> latest = adapter.getHistorySection(goldenUri(), String.join(",", keys), start.getTime());
 
@@ -2165,9 +2179,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
     public void getLatestByEntity(List<PointInfo> entity, URI uri) {
         String collect = entity.stream().map(PointInfo::getPointKey).collect(Collectors.joining(","));
         Map<String, PointData> latest = adapter.getLatest(uri, collect);
-        entity.forEach(e -> {
-            e.setPointDatas(Collections.singletonList(latest.get(e.getPointKey())));
-        });
+        entity.forEach(e -> e.setPointDatas(Collections.singletonList(latest.get(e.getPointKey()))));
     }
 
     public void getLatestByEntity(List<PointInfo> entity) {
@@ -2330,9 +2342,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
                             mapTurbineValues.remove(key);
                         }
                     }
-                    mapTurbineValues.forEach((k1, v) -> {
-                        sum.updateAndGet(v1 -> v1 + v);
-                    });
+                    mapTurbineValues.forEach((k1, v) -> sum.updateAndGet(v1 -> v1 + v));
 
                     //如果值为空则置0
                     if (sum.get() == 0) {
@@ -2355,9 +2365,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
                             mapTurbineValues2.remove(key);
                         }
                     }
-                    mapTurbineValues2.forEach((k2, v) -> {
-                        sum.updateAndGet(v1 -> v1 + v);
-                    });
+                    mapTurbineValues2.forEach((k2, v) -> sum.updateAndGet(v1 -> v1 + v));
 
                     if (sum.get() == 0) {
                         avgCutOutWindSpeed = 0;
@@ -2404,8 +2412,136 @@ public class JavaFunctionJobHandler extends IJobHandler {
         }
     }
 
-    //算额定风速
     public void calcGlqxnh_edfs() {
+
+        //date当天零点
+        Date end = DateUtil.beginOfDay(new Date()).toJdkDate();
+        //date昨天零点
+        Date start = DateUtil.offsetDay(end, -1).toJdkDate();
+
+        //风速
+        List<PointInfo> entityFs = getEntity("AI066", "turbine");
+        //功率
+        List<PointInfo> entityGl = getEntity("AI114", "turbine");
+        Map<String, PointInfo> glMap = entityGl.stream().collect(Collectors.toMap(PointInfo::getTurbineId, Function.identity()));
+
+        Map<String, EquipmentModel> map = equipmentModelService.map();
+
+//        List<PointInfo> entity = new ArrayList<>();
+//        List<PointInfo> entity0 = getEntity("MX000", "state");
+//        List<PointInfo> entity1 = getEntity("MX001", "state");
+//        List<PointInfo> entity2 = getEntity("MX002", "state");
+//        List<PointInfo> entity4 = getEntity("MX004", "state");
+//        List<PointInfo> entity6 = getEntity("MX006", "state");
+//        entity.addAll(entity0);
+//        entity.addAll(entity1);
+//        entity.addAll(entity2);
+//        entity.addAll(entity4);
+//        entity.addAll(entity6);
+//        List<String> keys = entity.stream().map(PointInfo::getPointKey).collect(Collectors.toList());
+//        Map<String, PointData> latest = adapter.getHistorySection(goldenUri(), String.join(",", keys), start.getTime());
+//        Map<String, Map<String, PointInfo>> wtUcPis = entity.stream().collect(Collectors.groupingBy(PointInfo::getTurbineId, Collectors.toMap(PointInfo::getUniformCode, Function.identity())));
+
+        List<PointInfo> entityAiZt = getEntity("AI422", "state");
+        Map<String, PointInfo> aiztMap = entityAiZt.stream().collect(Collectors.toMap(PointInfo::getTurbineId, Function.identity()));
+        List<StateAi> list = stateAiService.list();
+        Map<String, Map<Integer, Integer>> collectAi = list.stream().collect(Collectors.groupingBy(
+                StateAi::getModel, Collectors.toMap(StateAi::getOriginalState, StateAi::getMappingState)));
+
+//        Map<String, Map<Double,Double>> fitMap = new HashMap<>();
+        int i = 0;
+        for (PointInfo ef : entityFs) {
+            String wtId = ef.getTurbineId();
+            PointInfo glInfo = glMap.get(wtId);
+            getSnapDataByEntity(ef, start, end, 60);
+            getSnapDataByEntity(glInfo, start, end, 60);
+            List<PointData> peek = ef.getPointDatas().stream().peek(pd -> pd.setDoubleValue(
+                    NumberUtil.round(pd.getValue(), 2).doubleValue())).collect(Collectors.toList());
+            ef.setPointDatas(peek);
+
+            try {
+//                PointInfo turbineZt = calcTurbineDizt2(wtUcPis.get(wtId), latest, start, end, 60);
+                PointInfo turbineAizt = calcTurbineAizt2(aiztMap.get(wtId), collectAi, start, end, 60);
+                Map<Double, Double> fit = new TreeMap<>();
+                double capacity = 2000;
+//                if (turbineZt != null) {
+//                    System.out.println("数据处理拟合");
+//                    capacity = map.get(turbineZt.getSpare()).getPowerProduction();
+//                    fit = dataProcessAndFit(ef, glInfo, turbineZt, CalcCache.bzgl.get(turbineZt.getSpare()), capacity);
+////                fitMap.put(wtId, fit);
+//                    turbineZt.setPointDatas(null);
+//                }
+                if (turbineAizt != null) {
+                    System.out.println("数据处理拟合");
+                    capacity = map.get(turbineAizt.getSpare()).getPowerProduction();
+                    fit = dataProcessAndFit(ef, glInfo, turbineAizt, CalcCache.bzgl.get(turbineAizt.getSpare()), capacity);
+//                fitMap.put(wtId, fit);
+                    turbineAizt.setPointDatas(null);
+                }
+                ef.setPointDatas(null);
+                glInfo.setPointDatas(null);
+
+                //存redis
+//            stringRedisTemplate.opsForValue().set("glqxnh:" + end.getMonth() + ":" + wtId, JSON.toJSONString(fit));
+                System.out.println("拟合曲线的大小"+fit.size()+":"+wtId);
+
+
+                //符合条件的风速和
+                List<Double> listDouble = new ArrayList<>();
+                //遍历fit集合,取出值与capacity相等的key
+                if (!fit.isEmpty()) {
+                    for (double key : fit.keySet()) {
+                        Double v = fit.get(key);
+                        //如果v-capacity的值小于10大于-10,则把key加入listDouble
+                        if ((Math.abs(v - capacity) <= 10) && Math.abs(v - capacity) >= -10) {
+                            listDouble.add(key);
+                        }
+                    }
+                }
+                //取出listDouble的值求平均值
+                double agValue = 0;
+                if (!listDouble.isEmpty()) {
+                    for (Double aDouble : listDouble) {
+                        agValue += aDouble;
+                    }
+                    agValue = agValue / listDouble.size();
+                }
+                System.out.println("wtId:" + wtId + "agValue平均额定风速:" + agValue);
+
+
+                //存入数据库
+                System.out.println(wtId + " " + start);
+                QueryWrapper<TurbineInfoDay> turbineInfoDayQueryWrapper = new QueryWrapper<>();
+                turbineInfoDayQueryWrapper.eq("turbine_id", wtId);
+                turbineInfoDayQueryWrapper.eq("record_date", start);
+                TurbineInfoDay one = turbineInfoDayService.getOne(turbineInfoDayQueryWrapper);
+                System.out.println(one);
+                if (one == null) {
+                    TurbineInfoDay turbineInfoDay = new TurbineInfoDay();
+                    turbineInfoDay.setTurbineId(wtId);
+                    turbineInfoDay.setRecordDate(start);
+                    turbineInfoDay.setEdfs(agValue);
+                    System.out.println(turbineInfoDay);
+                    turbineInfoDayService.save(turbineInfoDay);
+                } else {
+                    one.setEdfs(agValue);
+                    System.out.println(one);
+                    turbineInfoDayService.updateById(one);
+                }
+
+            }catch (Exception e) {
+                System.out.println(wtId + " " + start);
+            }
+
+
+
+        }
+
+//        stringRedisTemplate.opsForValue().set("glqxnh", JSON.toJSONString(fitMap));
+    }
+
+    //算额定风速
+    public void calcGlqxnh_edfs2() {
         //date当天零点
         DateTime timeNow00 = DateUtil.beginOfDay(new Date());
         //date昨天零点
@@ -3532,9 +3668,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
         List<PointInfo> entity = getEntity(uniformCode, institutionType);
         String collect = entity.stream().map(PointInfo::getPointKey).collect(Collectors.joining(","));
         Map<String, PointData> latest = adapter.getLatest(goldenUri(), collect);
-        entity.forEach(e -> {
-            e.setPointDatas(Collections.singletonList(latest.get(e.getPointKey())));
-        });
+        entity.forEach(e -> e.setPointDatas(Collections.singletonList(latest.get(e.getPointKey()))));
         return entity;
     }
 
@@ -3551,6 +3685,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
         entity.addAll(entity2);
         entity.addAll(entity4);
         entity.addAll(entity6);
+        if (entity.isEmpty()) return result;
         String keys = entity.stream().map(PointInfo::getPointKey).collect(Collectors.joining(","));
         Map<String, PointData> latest = adapter.getLatest(goldenUri(), keys);
 
@@ -4369,6 +4504,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
         //功率
         List<PointInfo> entityGl = getEntity("AI114", "turbine");
         Map<String, PointInfo> rawMapGl = getSnapDataByEntity(entityGl, goldenUri(), start, date, 15, PointInfo::getTurbineId);
+        entityGl.forEach(g -> g.getPointDatas().forEach(p -> p.setDoubleValue(p.getValue() * g.getCoef())));
         //状态
         List<PointInfo> entityZt = getEntity("MXZT", "turbine");
         Map<String, PointInfo> rawMapZt = getRawDataByEntity(entityZt, taosUri(), start, date, PointInfo::getTurbineId);
@@ -4617,10 +4753,10 @@ public class JavaFunctionJobHandler extends IJobHandler {
         Map<String, PointInfo> mapAgc = entityAgc.stream().collect(Collectors.toMap(PointInfo::getStationId, Function.identity()));
         //出线
         List<PointInfo> entityCx = getEntity("AGC001", "booster");
-        Map<String, PointInfo> statMapCx = getSnapDataByEntity(entityCx, goldenUri(), begin, end,15, PointInfo::getStationId);
+        Map<String, PointInfo> statMapCx = getSnapDataByEntity(entityCx, goldenUri(), begin, end, 15, PointInfo::getStationId);
         //环境温度
         List<PointInfo> entityHjwd = getEntity("AI072", "turbine");
-        getSnapDataByEntity(entityHjwd, goldenUri(), begin, end,15);
+        getSnapDataByEntity(entityHjwd, goldenUri(), begin, end, 15);
         Map<String, List<PointInfo>> hjwdsMap = entityHjwd.stream().collect(Collectors.groupingBy(PointInfo::getStationId));
         //日发电量
         List<PointInfo> entity = getEntity("Z-ZXYG-JX", "meter");
@@ -4653,7 +4789,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
             double rfdl = fdlInfos.stream().mapToDouble(pi -> {
                 double v = (pi.getPointDatas().get(1).getValue() - pi.getPointDatas().get(0).getValue()) * pi.getCoef();
                 if (v < 0) v = 0;
-                System.out.println(pi.getLineId()+","+v);
+                System.out.println(pi.getLineId() + "," + v);
                 return v;
             }).sum();
             if (rfdl >= 42400.0) rfdl = day.getPjgl() / 4.0;
@@ -5130,7 +5266,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
         if (actualPower.size() < n) return 0;
         double maxErrorPercentage = 0.0;
         for (int i = 0; i < n; i++) {
-            double errorPercentage = 0.0;
+            double errorPercentage;
             if (predictPower.get(i) == 0) {
                 if (Math.abs(actualPower.get(i)) <= 0.03 * installCapacity) {
                     continue; // 不考核
@@ -5162,7 +5298,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
         double totalError = 0.0;
         int validPoints = 0;
         for (int i = 0; i < n; i++) {
-            double errorPercentage = 0.0;
+            double errorPercentage;
             if (Math.abs(predictPower.get(i) - actualPower.get(i)) <= 0.03 * installCapacity) {
                 // 该点不计入误差计算
                 continue;
@@ -5178,8 +5314,8 @@ public class JavaFunctionJobHandler extends IJobHandler {
         }
     }
 
-    private Map<String, Double> fjhjwd = new HashMap<>();
-    private Map<String, Double> fjfs = new HashMap<>();
+    private final Map<String, Double> fjhjwd = new HashMap<>();
+    private final Map<String, Double> fjfs = new HashMap<>();
 
     public void calcStationPjfsHjwdMin(Date begin, Date end, String stId, StationInfoMin min) {
         //风速
@@ -5441,7 +5577,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
     }
 
     private void setpjfs(StationInfoMin2 min2, PointInfo pi, int i) {
-        double v = 0;
+        double v;
         if (pi == null || pi.getPointDatas().isEmpty()) {
             v = fjfs.getOrDefault(pi.getTurbineId(), 0.0);
         } else {
@@ -5780,7 +5916,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
                         e0 += 15 * 60 * 1000;
                     }
                 }
-                if (pi.getPointDatas().size() == 0) {
+                if (pi.getPointDatas().isEmpty()) {
                     b0 = e0;
                     e0 += 15 * 60 * 1000;
                 }
@@ -6144,4 +6280,48 @@ public class JavaFunctionJobHandler extends IJobHandler {
             System.out.println(DateUtil.formatDateTime(new Date(pd.getTs())) + "," + pd.getValue());
         }
     }
+
+//    public void calcTurbineJfplPjfxGlyzxxs(Date date) {
+//        //静风频率,平均风向、功率一致性系数
+//        //date当天零点
+//        DateTime time = DateUtil.beginOfDay(date);
+//        //date昨天零点
+//        DateTime time0 = DateUtil.offsetDay(time, -1);
+//
+//        List<PointInfo> entityFx = getEntity("AI066", "turbine");
+//        getStatDataByEntity();
+//        getZeroNextData(entity, time0, time);
+//        Map<String, PointInfo> turMap = entity.stream().collect(Collectors.toMap(PointInfo::getTurbineId, Function.identity()));
+//        Map<String, String> fsMap = getEntityMap("AI066", "turbine");
+//
+//        Map<String, TurbineInfoDay> byDate = getTurbineinfoMap(time0, entity);
+//
+//        TurbineInfoDay infoDay;
+//        PointInfo rfdlPi;
+//        String turbineId;
+//        List<TurbineInfoDay> infoDays = new ArrayList<>();
+//        DoubleStatData stat;
+//        for (PointInfo info : entity) {
+//            turbineId = info.getTurbineId();
+//            infoDay = byDate.get(turbineId);
+//
+//            rfdlPi = turMap.get(turbineId);
+//            double v = (rfdlPi.getPointDatas().get(1).getValue() - rfdlPi.getPointDatas().get(0).getValue()) * rfdlPi.getCoef();
+//            if (v < 0 || v > 1000000) {
+//                v = 0;
+//            } else if (v > 30000) {
+//                v = v / (v % 30000 + 3);
+//            }
+//            infoDay.setRfdl(v);
+//            stat = adapter.getHistoryStat(goldenUri(), fsMap.get(turbineId), time0.getTime(), time.getTime());
+//            if (stat == null) {
+//                infoDay.setPjfs(0.0);
+//            } else {
+//                infoDay.setPjfs(stat.getAvg().getValue());
+//            }
+//
+//            infoDays.add(infoDay);
+//        }
+//        turbineInfoDayService.saveOrUpdateBatch(infoDays);
+//    }
 }

+ 113 - 0
ruoyi-admin/src/main/resources/application-druid3.yml

@@ -0,0 +1,113 @@
+# 数据源配置
+spring:
+  # redis 配置
+  redis:
+    # 地址
+    host: 10.220.1.5
+    # 端口,默认为6379
+    port: 6389
+    # 数据库索引
+    database: 5
+    # 密码
+    password: GYeeNXF#@!
+    #    password:
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-wait: -1ms
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource            # 当前数据源操作类型
+    driver-class-name: org.postgresql.Driver                # pgsql驱动包
+    druid:
+      master:
+#        url: jdbc:postgresql://192.168.126.128:5432/calc_hub
+#        username: gfhd
+#        password: zghww693
+        url: jdbc:postgresql://10.220.1.5:15432/smartwindpower
+        username: smartuser
+        password: smart123!@#
+      taos:
+#        url: jdbc:TAOS-RS://192.168.126.128:6041/jsfw_db?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
+        url: jdbc:TAOS://10.220.1.8:6041/nxxny?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
+        username: root
+        password: taosdata
+        driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+#        url: jdbc:postgresql://123.60.219.66:5432/ry-vue
+#        username: postgres
+#        password: gyeepd@123
+#        url: jdbc:mysql://49.234.50.218:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        username: root
+#        password: zghww693
+#        driver-class-name: com.mysql.cj.jdbc.Driver
+      slave:
+#        url: jdbc:postgresql://192.168.126.128:5432/postgres
+#        username: gfhd
+#        password: zghww693
+#        url: jdbc:postgresql://192.168.2.232:5432/power_lcm
+#        username: postgres
+#        password: gd123
+#        url: jdbc:postgresql://123.60.219.66:5432/power_lcm
+#        username: postgres
+#        password: gyeepd@123
+        url: jdbc:postgresql://10.220.1.5:15432/smartwindpower
+        username: smartuser
+        password: smart123!@#
+#        driver-class-name: org.postgresql.Driver
+        enabled: true
+      glyc:
+        url: jdbc:postgresql://172.16.12.102:5432/power_forecast
+        username: postgres
+        password: GYee@#56
+        enabled: true
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间,单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间,单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      #      validationQuery: SELECT 1 FROM DUAL
+      validationQuery: SELECT 1
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单,不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: ruoyi
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true

+ 157 - 0
ruoyi-admin/src/main/resources/application-ha.yml

@@ -0,0 +1,157 @@
+# 项目相关配置
+ruoyi:
+  # 名称
+  name: RuoYi
+  # 版本
+  version: 3.8.5
+  # 版权年份
+  copyrightYear: 2023
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
+  #  profile: /home/ruoyi
+  #  profile: D:/Workspace/calc-hub/ruoyi/
+  profile: /huian/calculate-service/
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数组计算 char 字符验证
+  captchaType: math
+
+# 开发环境配置
+server:
+  # 服务器的HTTP端口,默认为8080
+  port: 8082
+  servlet:
+    # 应用的访问路径
+    context-path: /
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # 连接数满后的排队数,默认为100
+    accept-count: 1000
+    threads:
+      # tomcat最大线程数,默认为200
+      max: 800
+      # Tomcat启动初始化的线程数,默认值10
+      min-spare: 100
+
+# 日志配置
+logging:
+  level:
+    com.ruoyi: debug
+    org.springframework: warn
+
+# 用户配置
+user:
+  password:
+    # 密码最大错误次数
+    maxRetryCount: 5
+    # 密码锁定时间(默认10分钟)
+    lockTime: 10
+
+# Spring配置
+spring:
+  #  thymeleaf:
+  #    prefix: classpath:/templates/
+  #    mode: HTML5
+  #    cache: false
+  mvc:
+    pathmatch:
+      matching-strategy: ant-path-matcher
+  web:
+    resources:
+      static-locations: classpath:/static-nxha/
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  profiles:
+    active: druid
+  # 文件上传
+  servlet:
+    multipart:
+      # 单个文件大小
+      max-file-size: 10MB
+      # 设置总上传的文件大小
+      max-request-size: 20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: false
+  # redis 配置
+  redis:
+    # 地址
+    host: 10.220.1.5
+    port: 6389
+    timeout: 100000
+    password: GYeeNXF#@!
+    # 数据库索引
+    database: 5
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-wait: -1ms
+  cache:
+    type: redis
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss.SSS
+# token配置
+token:
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期(默认30分钟)
+  expireTime: 36000
+
+# MyBatis配置
+#mybatis:
+#    # 搜索指定包别名
+#    typeAliasesPackage: com.ruoyi.**.domain
+#    # 配置mapper的扫描,找到所有的mapper.xml映射文件
+#    mapperLocations: classpath*:mapper/**/*Mapper.xml
+#    # 加载全局的配置文件
+#    configLocation: classpath:mybatis/mybatis-config.xml
+
+mybatis-plus:
+  typeAliasesPackage: com.ruoyi.**.domain
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+
+# PageHelper分页插件
+pagehelper:
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+  pathMapping: /dev-api
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接(多个用逗号分隔)
+  excludes: /system/notice
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
+#url: ws://43.156.3.30:8080/gs-guide-websocket
+feign:
+  client:
+    config:
+      default:
+        connect-timeout: 15000
+        read-timeout: 7200000
+
+power_curve_month: "glqxnh:8:"

ruoyi-admin/src/main/resources/static/assets/401-5k9hMs-t.css → ruoyi-admin/src/main/resources/static-bd/assets/401-5k9hMs-t.css


ruoyi-admin/src/main/resources/static/assets/401-BxhekOaj.gif → ruoyi-admin/src/main/resources/static-bd/assets/401-BxhekOaj.gif


ruoyi-admin/src/main/resources/static/assets/401-Rv3bF16v.js → ruoyi-admin/src/main/resources/static-bd/assets/401-Rv3bF16v.js


ruoyi-admin/src/main/resources/static/assets/404-4V1kCEd5.js → ruoyi-admin/src/main/resources/static-bd/assets/404-4V1kCEd5.js


ruoyi-admin/src/main/resources/static/assets/404-DeGkZHVm.png → ruoyi-admin/src/main/resources/static-bd/assets/404-DeGkZHVm.png


ruoyi-admin/src/main/resources/static/assets/404-LmQjkdmX.css → ruoyi-admin/src/main/resources/static-bd/assets/404-LmQjkdmX.css


ruoyi-admin/src/main/resources/static/assets/404-f6vEaPme.js → ruoyi-admin/src/main/resources/static-bd/assets/404-f6vEaPme.js


ruoyi-admin/src/main/resources/static/assets/404_cloud-j3sY7Q4w.png → ruoyi-admin/src/main/resources/static-bd/assets/404_cloud-j3sY7Q4w.png


ruoyi-admin/src/main/resources/static/assets/authRole-QjdLHUTF.js → ruoyi-admin/src/main/resources/static-bd/assets/authRole-QjdLHUTF.js


ruoyi-admin/src/main/resources/static/assets/authUser-M1RJTGQ4.js → ruoyi-admin/src/main/resources/static-bd/assets/authUser-M1RJTGQ4.js


ruoyi-admin/src/main/resources/static/assets/basicInfoForm-Jkog39Sq.js → ruoyi-admin/src/main/resources/static-bd/assets/basicInfoForm-Jkog39Sq.js


ruoyi-admin/src/main/resources/static/assets/bug-kJfN4VKp.js → ruoyi-admin/src/main/resources/static-bd/assets/bug-kJfN4VKp.js


ruoyi-admin/src/main/resources/static/assets/build-xowWPBRN.js → ruoyi-admin/src/main/resources/static-bd/assets/build-xowWPBRN.js


ruoyi-admin/src/main/resources/static/assets/button-IPY02b_z.js → ruoyi-admin/src/main/resources/static-bd/assets/button-IPY02b_z.js


ruoyi-admin/src/main/resources/static/assets/cache-uH-4DeCX.js → ruoyi-admin/src/main/resources/static-bd/assets/cache-uH-4DeCX.js


ruoyi-admin/src/main/resources/static/assets/cascader-rUF0-qoi.js → ruoyi-admin/src/main/resources/static-bd/assets/cascader-rUF0-qoi.js


ruoyi-admin/src/main/resources/static/assets/chart-mwRDWaLS.js → ruoyi-admin/src/main/resources/static-bd/assets/chart-mwRDWaLS.js


ruoyi-admin/src/main/resources/static/assets/checkbox-pW6SnlCo.js → ruoyi-admin/src/main/resources/static-bd/assets/checkbox-pW6SnlCo.js


ruoyi-admin/src/main/resources/static/assets/clipboard-uDi-xsp1.js → ruoyi-admin/src/main/resources/static-bd/assets/clipboard-uDi-xsp1.js


ruoyi-admin/src/main/resources/static/assets/code-lTmbP-Iu.js → ruoyi-admin/src/main/resources/static-bd/assets/code-lTmbP-Iu.js


ruoyi-admin/src/main/resources/static/assets/color-mUI1IBjq.js → ruoyi-admin/src/main/resources/static-bd/assets/color-mUI1IBjq.js


ruoyi-admin/src/main/resources/static/assets/component-HDT98Liy.js → ruoyi-admin/src/main/resources/static-bd/assets/component-HDT98Liy.js


ruoyi-admin/src/main/resources/static/assets/dashboard-7m1noK0J.js → ruoyi-admin/src/main/resources/static-bd/assets/dashboard-7m1noK0J.js


ruoyi-admin/src/main/resources/static/assets/data-MHdMVyAS.js → ruoyi-admin/src/main/resources/static-bd/assets/data-MHdMVyAS.js


ruoyi-admin/src/main/resources/static/assets/date-kn4bT7bz.js → ruoyi-admin/src/main/resources/static-bd/assets/date-kn4bT7bz.js


ruoyi-admin/src/main/resources/static/assets/date-range-3-o8sJYA.js → ruoyi-admin/src/main/resources/static-bd/assets/date-range-3-o8sJYA.js


ruoyi-admin/src/main/resources/static/assets/dict-rr-JjxkQ.js → ruoyi-admin/src/main/resources/static-bd/assets/dict-rr-JjxkQ.js


ruoyi-admin/src/main/resources/static/assets/documentation-j05amGUz.js → ruoyi-admin/src/main/resources/static-bd/assets/documentation-j05amGUz.js


ruoyi-admin/src/main/resources/static/assets/download-4wGLbm9W.js → ruoyi-admin/src/main/resources/static-bd/assets/download-4wGLbm9W.js


ruoyi-admin/src/main/resources/static/assets/drag-HKPB1cGZ.js → ruoyi-admin/src/main/resources/static-bd/assets/drag-HKPB1cGZ.js


ruoyi-admin/src/main/resources/static/assets/druid-VeHbVG7P.js → ruoyi-admin/src/main/resources/static-bd/assets/druid-VeHbVG7P.js


ruoyi-admin/src/main/resources/static/assets/edit-4YKK6zr_.js → ruoyi-admin/src/main/resources/static-bd/assets/edit-4YKK6zr_.js


ruoyi-admin/src/main/resources/static/assets/editTable-nQxUXf6t.js → ruoyi-admin/src/main/resources/static-bd/assets/editTable-nQxUXf6t.js


ruoyi-admin/src/main/resources/static/assets/education-azEbe3wk.js → ruoyi-admin/src/main/resources/static-bd/assets/education-azEbe3wk.js


ruoyi-admin/src/main/resources/static/assets/email-e8PG-JSk.js → ruoyi-admin/src/main/resources/static-bd/assets/email-e8PG-JSk.js


ruoyi-admin/src/main/resources/static/assets/example-83S1fqJp.js → ruoyi-admin/src/main/resources/static-bd/assets/example-83S1fqJp.js


ruoyi-admin/src/main/resources/static/assets/excel-KJjsa536.js → ruoyi-admin/src/main/resources/static-bd/assets/excel-KJjsa536.js


ruoyi-admin/src/main/resources/static/assets/existing-jJhe6AQJ.js → ruoyi-admin/src/main/resources/static-bd/assets/existing-jJhe6AQJ.js


ruoyi-admin/src/main/resources/static/assets/exit-fullscreen-WAEXo1Ae.js → ruoyi-admin/src/main/resources/static-bd/assets/exit-fullscreen-WAEXo1Ae.js


ruoyi-admin/src/main/resources/static/assets/eye-cUoVrCjA.js → ruoyi-admin/src/main/resources/static-bd/assets/eye-cUoVrCjA.js


ruoyi-admin/src/main/resources/static/assets/eye-open-o2kmxivS.js → ruoyi-admin/src/main/resources/static-bd/assets/eye-open-o2kmxivS.js


ruoyi-admin/src/main/resources/static/assets/form-v4semqPF.js → ruoyi-admin/src/main/resources/static-bd/assets/form-v4semqPF.js


ruoyi-admin/src/main/resources/static/assets/fullscreen-ajtUhEIx.js → ruoyi-admin/src/main/resources/static-bd/assets/fullscreen-ajtUhEIx.js


ruoyi-admin/src/main/resources/static/assets/gen-p5FXvA9T.js → ruoyi-admin/src/main/resources/static-bd/assets/gen-p5FXvA9T.js


ruoyi-admin/src/main/resources/static/assets/genInfoForm-rY4gXw7r.js → ruoyi-admin/src/main/resources/static-bd/assets/genInfoForm-rY4gXw7r.js


ruoyi-admin/src/main/resources/static/assets/github-PjteK42C.js → ruoyi-admin/src/main/resources/static-bd/assets/github-PjteK42C.js


ruoyi-admin/src/main/resources/static/assets/guide-VDrSVKUo.js → ruoyi-admin/src/main/resources/static-bd/assets/guide-VDrSVKUo.js


ruoyi-admin/src/main/resources/static/assets/icon-Xhw6fbkH.js → ruoyi-admin/src/main/resources/static-bd/assets/icon-Xhw6fbkH.js


ruoyi-admin/src/main/resources/static/assets/importTable-BTdUSMUN.js → ruoyi-admin/src/main/resources/static-bd/assets/importTable-BTdUSMUN.js


File diff suppressed because it is too large
+ 1 - 0
ruoyi-admin/src/main/resources/static-bd/assets/index-0rlirxzx.js


ruoyi-admin/src/main/resources/static/assets/index-17Eq_XBJ.js → ruoyi-admin/src/main/resources/static-bd/assets/index-17Eq_XBJ.js


ruoyi-admin/src/main/resources/static/assets/index-5AKKrCti.js → ruoyi-admin/src/main/resources/static-bd/assets/index-5AKKrCti.js


ruoyi-admin/src/main/resources/static/assets/index-5Z1RC5vc.js → ruoyi-admin/src/main/resources/static-bd/assets/index-5Z1RC5vc.js


ruoyi-admin/src/main/resources/static/assets/index-5imhPU-7.js → ruoyi-admin/src/main/resources/static-bd/assets/index-5imhPU-7.js


ruoyi-admin/src/main/resources/static/assets/index-7bojoP-F.js → ruoyi-admin/src/main/resources/static-bd/assets/index-7bojoP-F.js


ruoyi-admin/src/main/resources/static/assets/index-8iD_dKmP.js → ruoyi-admin/src/main/resources/static-bd/assets/index-8iD_dKmP.js


ruoyi-admin/src/main/resources/static/assets/index-AWfflP0h.js → ruoyi-admin/src/main/resources/static-bd/assets/index-AWfflP0h.js


+ 1 - 0
ruoyi-admin/src/main/resources/static-bd/assets/index-BBHGXUFQ.js

@@ -0,0 +1 @@
+import{_ as a}from"./index-fT3U48wL.js";import{r as n,o,l,h as e,H as u}from"./index-TnLvmlMR.js";const i={__name:"index",setup(c){const r=n("http://127.0.0.1:8082/swagger-ui/index.html");return(p,s)=>(o(),l(e(a),{src:e(r),"onUpdate:src":s[0]||(s[0]=t=>u(r)?r.value=t:null)},null,8,["src"]))}};export{i as default};

ruoyi-admin/src/main/resources/static/assets/index-CrkUMuzx.css → ruoyi-admin/src/main/resources/static-bd/assets/index-CrkUMuzx.css


ruoyi-admin/src/main/resources/static/assets/index-HxhRihcw.js → ruoyi-admin/src/main/resources/static-bd/assets/index-HxhRihcw.js


ruoyi-admin/src/main/resources/static/assets/index-Ld1yeO7r.css → ruoyi-admin/src/main/resources/static-bd/assets/index-Ld1yeO7r.css


ruoyi-admin/src/main/resources/static/assets/index-Pe9p-98c.js → ruoyi-admin/src/main/resources/static-bd/assets/index-Pe9p-98c.js


ruoyi-admin/src/main/resources/static/assets/index-RaUAhswM.js → ruoyi-admin/src/main/resources/static-bd/assets/index-RaUAhswM.js


File diff suppressed because it is too large
+ 119 - 0
ruoyi-admin/src/main/resources/static-bd/assets/index-TnLvmlMR.js


ruoyi-admin/src/main/resources/static/assets/index-UTiIowkf.css → ruoyi-admin/src/main/resources/static-bd/assets/index-UTiIowkf.css


ruoyi-admin/src/main/resources/static/assets/index-VZ9Git7r.js → ruoyi-admin/src/main/resources/static-bd/assets/index-VZ9Git7r.js


ruoyi-admin/src/main/resources/static/assets/index-XTpxJfxn.js → ruoyi-admin/src/main/resources/static-bd/assets/index-XTpxJfxn.js


+ 1 - 0
ruoyi-admin/src/main/resources/static-bd/assets/index-YyHl52U_.js

@@ -0,0 +1 @@
+import{_ as s}from"./index-fT3U48wL.js";import{r as a,o as n,c as o,e as l,h as c}from"./index-TnLvmlMR.js";const i={__name:"index",setup(u){const e=a("http://127.0.0.1:8082/druid/login.html");return(m,r)=>(n(),o("div",null,[l(c(s),{src:e.value,"onUpdate:src":r[0]||(r[0]=t=>e.value=t)},null,8,["src"])]))}};export{i as default};

ruoyi-admin/src/main/resources/static/assets/index-ZjGg-pIb.js → ruoyi-admin/src/main/resources/static-bd/assets/index-ZjGg-pIb.js


ruoyi-admin/src/main/resources/static/assets/index-b6ia2l-u.js → ruoyi-admin/src/main/resources/static-bd/assets/index-b6ia2l-u.js


ruoyi-admin/src/main/resources/static/assets/index-cpypJ24r.js → ruoyi-admin/src/main/resources/static-bd/assets/index-cpypJ24r.js


ruoyi-admin/src/main/resources/static/assets/index-dUqn1JA4.js → ruoyi-admin/src/main/resources/static-bd/assets/index-dUqn1JA4.js


ruoyi-admin/src/main/resources/static/assets/index-fT3U48wL.js → ruoyi-admin/src/main/resources/static-bd/assets/index-fT3U48wL.js


ruoyi-admin/src/main/resources/static/assets/index-hUnpvfXv.js → ruoyi-admin/src/main/resources/static-bd/assets/index-hUnpvfXv.js


ruoyi-admin/src/main/resources/static/assets/index-hae3yAhb.css → ruoyi-admin/src/main/resources/static-bd/assets/index-hae3yAhb.css


ruoyi-admin/src/main/resources/static/assets/index-iA7JHNFs.js → ruoyi-admin/src/main/resources/static-bd/assets/index-iA7JHNFs.js


ruoyi-admin/src/main/resources/static/assets/index-ifco2N5o.js → ruoyi-admin/src/main/resources/static-bd/assets/index-ifco2N5o.js


ruoyi-admin/src/main/resources/static/assets/index-jWngHWg0.js → ruoyi-admin/src/main/resources/static-bd/assets/index-jWngHWg0.js


ruoyi-admin/src/main/resources/static/assets/index-l8EL2m8T.js → ruoyi-admin/src/main/resources/static-bd/assets/index-l8EL2m8T.js


ruoyi-admin/src/main/resources/static/assets/index-mucJIyys.js → ruoyi-admin/src/main/resources/static-bd/assets/index-mucJIyys.js


ruoyi-admin/src/main/resources/static/assets/index-s7f4Etvv.css → ruoyi-admin/src/main/resources/static-bd/assets/index-s7f4Etvv.css


ruoyi-admin/src/main/resources/static/assets/index-srPhywwF.js → ruoyi-admin/src/main/resources/static-bd/assets/index-srPhywwF.js


ruoyi-admin/src/main/resources/static/assets/index-x7s63gqY.js → ruoyi-admin/src/main/resources/static-bd/assets/index-x7s63gqY.js


ruoyi-admin/src/main/resources/static/assets/index-zKKh-JIX.js → ruoyi-admin/src/main/resources/static-bd/assets/index-zKKh-JIX.js


ruoyi-admin/src/main/resources/static/assets/input-zbwv-WSo.js → ruoyi-admin/src/main/resources/static-bd/assets/input-zbwv-WSo.js


ruoyi-admin/src/main/resources/static/assets/international-A5Pb_sxO.js → ruoyi-admin/src/main/resources/static-bd/assets/international-A5Pb_sxO.js


ruoyi-admin/src/main/resources/static/assets/job-04oofYhk.js → ruoyi-admin/src/main/resources/static-bd/assets/job-04oofYhk.js


ruoyi-admin/src/main/resources/static/assets/job-OmGvuvSL.js → ruoyi-admin/src/main/resources/static-bd/assets/job-OmGvuvSL.js


ruoyi-admin/src/main/resources/static/assets/jobLog-r3sKduTP.js → ruoyi-admin/src/main/resources/static-bd/assets/jobLog-r3sKduTP.js


ruoyi-admin/src/main/resources/static/assets/language-k6fH2ohQ.js → ruoyi-admin/src/main/resources/static-bd/assets/language-k6fH2ohQ.js



ruoyi-admin/src/main/resources/static/assets/list-TiJwGIHp.js → ruoyi-admin/src/main/resources/static-bd/assets/list-TiJwGIHp.js


ruoyi-admin/src/main/resources/static/assets/list-svyQmaHI.js → ruoyi-admin/src/main/resources/static-bd/assets/list-svyQmaHI.js


ruoyi-admin/src/main/resources/static/assets/lock-EsQeCKe6.js → ruoyi-admin/src/main/resources/static-bd/assets/lock-EsQeCKe6.js


+ 0 - 0
ruoyi-admin/src/main/resources/static/assets/log-LC6Pea4K.js


Some files were not shown because too many files changed in this diff