hlf 2 éve
szülő
commit
3ad7aa5647

+ 9 - 4
.idea/workspace.xml

@@ -8,11 +8,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="0980a86f-de53-465e-a9ba-eb43e4c89459" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/predict/api/DataExportController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/adapter/api/TuJiEnergyDataController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/adapter/api/TuJiEnergyDataController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/adapter/api/TuJiPowerDataController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/adapter/api/TuJiPowerDataController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/predict/api/ElectricityForecastController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/predict/api/ElectricityForecastController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/predict/utils/ScheduledTaskTools.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/predict/utils/ScheduledTaskTools.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/predict/api/ElectricityForecastController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/predict/api/ElectricityForecastController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/predict/utils/ScheduledTaskTools.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/predict/utils/ScheduledTaskTools.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -279,7 +279,12 @@
       <workItem from="1673831134420" duration="12175000" />
       <workItem from="1676250883324" duration="48116000" />
       <workItem from="1676855040537" duration="54967000" />
-      <workItem from="1677459470378" duration="20622000" />
+      <workItem from="1677459470378" duration="24357000" />
+      <workItem from="1677649762242" duration="2121000" />
+      <workItem from="1677720192478" duration="17923000" />
+      <workItem from="1678064252490" duration="809000" />
+      <workItem from="1678065907007" duration="28751000" />
+      <workItem from="1678324765315" duration="43833000" />
     </task>
     <task id="LOCAL-00047" summary="fix bug">
       <created>1662521956363</created>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1718 - 45
ruoyi-admin/src/main/java/com/ruoyi/predict/api/ElectricityForecastController.java


+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/predict/utils/ScheduledTaskTools.java

@@ -206,8 +206,8 @@ public class ScheduledTaskTools {
     /**
      * 数据同步
      */
-    @Async
-    @Scheduled(cron = "0 0/5 * * * ?")
+    //@Async
+    //@Scheduled(cron = "0 0/5 * * * ?")
     public void dataSynchronizationScheduledTaskTerminal() {
         ThreadContext.bind(manager);
         ThreadUtil.execute(new Runnable() {

BIN
ruoyi-admin/target/classes/com/ruoyi/predict/api/ElectricityForecastController.class


BIN
ruoyi-admin/target/classes/com/ruoyi/predict/utils/ScheduledTaskTools.class