xushili 3 months ago
parent
commit
07dcfecf83
47 changed files with 1995 additions and 831 deletions
  1. 0 4
      .idea/dataSources.local.xml
  2. 0 7
      .idea/dataSources.xml
  3. 97 19
      .idea/workspace.xml
  4. 9 3
      common/src/main/java/com/gyee/common/config/GeneratorCodeConfig.java
  5. 115 0
      common/src/main/java/com/gyee/common/model/PointData2.java
  6. 35 0
      common/src/main/java/com/gyee/common/model/TsDataType.java
  7. 1 1
      data-adapter/src/main/resources/application.yaml
  8. 5 0
      generationXK-service/pom.xml
  9. 13 5
      generationXK-service/src/main/java/com/gyee/generation/config/GeneratorCodeConfig.java
  10. 7 7
      generationXK-service/src/main/java/com/gyee/generation/service/InputOrOutPutService.java
  11. 1 1
      generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java
  12. 157 155
      generationXK-service/src/main/java/com/gyee/generation/service/initalcache/CacheService.java
  13. 3 3
      generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java
  14. 1518 0
      generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil2.java
  15. 1 1
      generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/IEdosUtil.java
  16. 6 6
      generationXK-service/src/main/resources/application-nxf.yml
  17. 0 22
      generationXK-service/src/main/resources/xxl-job-7001.properties
  18. 0 22
      generationXK-service/src/main/resources/xxl-job-7002.properties
  19. 0 22
      generationXK-service/src/main/resources/xxl-job-7003.properties
  20. 0 22
      generationXK-service/src/main/resources/xxl-job-accuracy.properties
  21. 0 22
      generationXK-service/src/main/resources/xxl-job-analyNew.properties
  22. 0 22
      generationXK-service/src/main/resources/xxl-job-efficiency.properties
  23. 0 23
      generationXK-service/src/main/resources/xxl-job-executor.properties
  24. 0 23
      generationXK-service/src/main/resources/xxl-job-executor2.properties
  25. 2 2
      generationXK-service/src/main/resources/xxl-job-executor3.properties
  26. 0 23
      generationXK-service/src/main/resources/xxl-job-executor4.properties
  27. 0 23
      generationXK-service/src/main/resources/xxl-job-executor5.properties
  28. 0 23
      generationXK-service/src/main/resources/xxl-job-executor6.properties
  29. 0 22
      generationXK-service/src/main/resources/xxl-job-executorGF000.properties
  30. 0 22
      generationXK-service/src/main/resources/xxl-job-executorGF001.properties
  31. 0 22
      generationXK-service/src/main/resources/xxl-job-executorGF002.properties
  32. 0 22
      generationXK-service/src/main/resources/xxl-job-executorGF003.properties
  33. 0 22
      generationXK-service/src/main/resources/xxl-job-executorGF004.properties
  34. 0 22
      generationXK-service/src/main/resources/xxl-job-executorGF005.properties
  35. 0 22
      generationXK-service/src/main/resources/xxl-job-executorGF006.properties
  36. 0 22
      generationXK-service/src/main/resources/xxl-job-executorGF007.properties
  37. 0 22
      generationXK-service/src/main/resources/xxl-job-executorGF008.properties
  38. 0 16
      generationXK-service/src/main/resources/xxl-job-executorJN.properties
  39. 0 22
      generationXK-service/src/main/resources/xxl-job-executorRG.properties
  40. 0 22
      generationXK-service/src/main/resources/xxl-job-executorWPGD.properties
  41. 0 22
      generationXK-service/src/main/resources/xxl-job-executorWPGH.properties
  42. 0 22
      generationXK-service/src/main/resources/xxl-job-executorWPLY.properties
  43. 0 22
      generationXK-service/src/main/resources/xxl-job-executorWPXNY.properties
  44. 0 22
      generationXK-service/src/main/resources/xxl-job-irradiation.properties
  45. 0 22
      generationXK-service/src/main/resources/xxl-job-region.properties
  46. 24 1
      generationXK-service/src/test/java/com/gyee/generation/SaticScheduleCALTaskTest.java
  47. 1 1
      pom.xml

+ 0 - 4
.idea/dataSources.local.xml

@@ -5,10 +5,6 @@
       <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="POSTGRES" />
       <schema-mapping />
     </data-source>
-    <data-source name="smartwindpower@10.220.1.5" uuid="27031d7f-c412-4296-8c42-17a6aee4daad">
-      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="POSTGRES" />
-      <schema-mapping />
-    </data-source>
     <data-source name="postgres@123.60.219.66" uuid="43053514-c798-46b8-9730-774126a5f46e">
       <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="POSTGRES" />
       <schema-mapping />

+ 0 - 7
.idea/dataSources.xml

@@ -8,13 +8,6 @@
       <jdbc-url>jdbc:postgresql://rm-cn-adn3tj2bu00032so.rwlb.rds.aliyuncs.com:5432/admin_1</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
-    <data-source source="LOCAL" name="smartwindpower@10.220.1.5" uuid="27031d7f-c412-4296-8c42-17a6aee4daad">
-      <driver-ref>postgresql</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
-      <jdbc-url>jdbc:postgresql://10.220.1.5:15432/smartwindpower</jdbc-url>
-      <working-dir>$ProjectFileDir$</working-dir>
-    </data-source>
     <data-source source="LOCAL" name="postgres@123.60.219.66" uuid="43053514-c798-46b8-9730-774126a5f46e">
       <driver-ref>postgresql</driver-ref>
       <synchronize>true</synchronize>

+ 97 - 19
.idea/workspace.xml

@@ -4,19 +4,54 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="c9251c3e-9f2f-4b6c-a5f7-503156fe13c0" name="Changes" comment="bug修复2">
+    <list default="true" id="c9251c3e-9f2f-4b6c-a5f7-503156fe13c0" name="Changes" comment="null问题">
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/gyee/common/model/PointData2.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/gyee/common/model/TsDataType.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil2.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/controller/AdapterController.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/controller/AdapterController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/dao/IHistoryDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/dao/IHistoryDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/dao_mqtt_influxdb_taos/MqttTaosLatestDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/dao_mqtt_influxdb_taos/MqttTaosLatestDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/entity/PointData.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/entity/PointData.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/service/IAdapterService.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/service/IAdapterService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/service/TaosDataService.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/dao_mqtt_influxdb_taos/TaosDataService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/service/TsDataService.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/service/TsDataService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/gyee/common/config/GeneratorCodeConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/gyee/common/config/GeneratorCodeConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data-adapter/src/main/resources/application.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/data-adapter/src/main/resources/application.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/config/GeneratorCodeConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/config/GeneratorCodeConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/service/InputOrOutPutService.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/service/InputOrOutPutService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/service/initalcache/CacheService.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/service/initalcache/CacheService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/IEdosUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/IEdosUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/application-nxf.yml" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/resources/application-nxf.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-7001.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-7002.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-7003.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-accuracy.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-analyNew.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-efficiency.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor2.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor3.properties" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor3.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor4.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor5.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor6.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF000.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF001.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF002.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF003.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF004.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF005.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF006.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF007.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF008.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorJN.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorRG.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorWPGD.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorWPGH.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorWPLY.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorWPXNY.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-irradiation.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-region.properties" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/generationXK-service/src/test/java/com/gyee/generation/SaticScheduleCALTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/test/java/com/gyee/generation/SaticScheduleCALTaskTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -69,6 +104,7 @@
     &quot;HTTP 请求.generated-requests | #263.executor&quot;: &quot;Run&quot;,
     &quot;HTTP 请求.generated-requests | #264.executor&quot;: &quot;Run&quot;,
     &quot;JUnit.SaticScheduleCALTaskTest.all.executor&quot;: &quot;Debug&quot;,
+    &quot;JUnit.SaticScheduleCALTaskTest.initialRedis_PG.executor&quot;: &quot;Run&quot;,
     &quot;JUnit.test.test1.executor&quot;: &quot;Debug&quot;,
     &quot;Maven.common [clean].executor&quot;: &quot;Run&quot;,
     &quot;Maven.common [compile].executor&quot;: &quot;Run&quot;,
@@ -89,9 +125,10 @@
     &quot;Spring Boot.GenerationMain.executor&quot;: &quot;Debug&quot;,
     &quot;Spring Boot.RunEconomyApplication.executor&quot;: &quot;Debug&quot;,
     &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;database.data.extractors.current.export.id&quot;: &quot;SQL 插入&quot;,
     &quot;git-widget-placeholder&quot;: &quot;master&quot;,
     &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/ruoyi/runeconomy-nx/generationXK-service/src/test/java/com/gyee/generation&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/宁夏新项目/数据库备份&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
@@ -121,11 +158,11 @@
       <recent name="D:\work\workspaces\runeconomy-nx\runeconomy-xk\src\main\java\com\gyee\runeconomy" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.gyee.common.model" />
+      <recent name="com.gyee.generation.util" />
       <recent name="com.gyee.dataadapter.dao" />
       <recent name="com.gyee.dataadapter.config" />
       <recent name="com.gyee.dataadapter.service" />
-      <recent name="com.gyee.dataadapter.entity" />
-      <recent name="com.gyee.runeconomy.initalcache" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -136,13 +173,10 @@
       </set>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.DataAdapterApp">
+  <component name="RunManager" selected="Spring Boot.GenerationMain">
     <configuration name="generated-requests | #259" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/generated-requests.http" index="259" requestIdentifier="#259" runType="运行单个请求">
       <method v="2" />
     </configuration>
-    <configuration name="generated-requests | #261" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/generated-requests.http" index="261" requestIdentifier="#261" runType="运行单个请求">
-      <method v="2" />
-    </configuration>
     <configuration name="generated-requests | #263" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/generated-requests.http" index="263" requestIdentifier="#263" runType="运行单个请求">
       <method v="2" />
     </configuration>
@@ -165,6 +199,22 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="SaticScheduleCALTaskTest.initialRedis_PG" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="generationXK-service" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.gyee.generation.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="com.gyee.generation" />
+      <option name="MAIN_CLASS_NAME" value="com.gyee.generation.SaticScheduleCALTaskTest" />
+      <option name="METHOD_NAME" value="initialRedis_PG" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="JetRunConfigurationType">
       <module name="runeconomy-nx" />
       <method v="2">
@@ -208,11 +258,11 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.SaticScheduleCALTaskTest.initialRedis_PG" />
         <item itemvalue="JUnit.SaticScheduleCALTaskTest.all" />
         <item itemvalue="HTTP 请求.generated-requests | #264" />
         <item itemvalue="HTTP 请求.generated-requests | #259" />
         <item itemvalue="HTTP 请求.generated-requests | #263" />
-        <item itemvalue="HTTP 请求.generated-requests | #261" />
       </list>
     </recent_temporary>
   </component>
@@ -252,7 +302,7 @@
       <workItem from="1726642901861" duration="8316000" />
       <workItem from="1726708351953" duration="14726000" />
       <workItem from="1726731645761" duration="7456000" />
-      <workItem from="1726794107135" duration="7768000" />
+      <workItem from="1726794107135" duration="17673000" />
     </task>
     <task id="LOCAL-00001" summary="宁夏风公司">
       <option name="closed" value="true" />
@@ -302,7 +352,23 @@
       <option name="project" value="LOCAL" />
       <updated>1726731399306</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="taos读取">
+      <option name="closed" value="true" />
+      <created>1726803282337</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1726803282337</updated>
+    </task>
+    <task id="LOCAL-00008" summary="null问题">
+      <option name="closed" value="true" />
+      <created>1726813400017</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1726813400017</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -325,7 +391,9 @@
     <MESSAGE value="读取调试" />
     <MESSAGE value="bug修复" />
     <MESSAGE value="bug修复2" />
-    <option name="LAST_COMMIT_MESSAGE" value="bug修复2" />
+    <MESSAGE value="taos读取" />
+    <MESSAGE value="null问题" />
+    <option name="LAST_COMMIT_MESSAGE" value="null问题" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -350,6 +418,16 @@
           <line>1258</line>
           <option name="timeStamp" value="8" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/generationXK-service/src/test/java/com/gyee/generation/SaticScheduleCALTaskTest.java</url>
+          <line>52</line>
+          <option name="timeStamp" value="9" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/task/SaticScheduleCALTask.java</url>
+          <line>205</line>
+          <option name="timeStamp" value="20" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>

+ 9 - 3
common/src/main/java/com/gyee/common/config/GeneratorCodeConfig.java

@@ -1,3 +1,4 @@
+/*
 package com.gyee.common.config;
 
 
@@ -10,13 +11,15 @@ import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
 
 import java.util.Scanner;
 
+*/
 /**
  * @ClassName GeneratorCodeConfig
  * @Description 自动生成mybatisplus的相关代码
  * @Author 谢生杰
  * @Date 2020/9/25 18:26
  * @Version 1.0
- **/
+ **//*
+
 public class GeneratorCodeConfig {
     public static String scanner(String tip) {
         Scanner scanner = new Scanner(System.in);
@@ -101,7 +104,8 @@ public class GeneratorCodeConfig {
         //                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
         //            }
         //        });
-        /*
+        */
+/*
         cfg.setFileCreate(new IFileCreate() {
             @Override
             public boolean isCreate(ConfigBuilder configBuilder, FileType fileType, String filePath) {
@@ -110,7 +114,8 @@ public class GeneratorCodeConfig {
                 return false;
             }
         });
-        */
+        *//*
+
         //        cfg.setFileOutConfigList(focList);
         //        mpg.setCfg(cfg);
 
@@ -147,3 +152,4 @@ public class GeneratorCodeConfig {
         mpg.execute();
     }
 }
+*/

+ 115 - 0
common/src/main/java/com/gyee/common/model/PointData2.java

@@ -0,0 +1,115 @@
+package com.gyee.common.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.Date;
+
+/**
+ * 测点数据
+ */
+public class PointData2 {
+    /**
+     * 时间戳
+     */
+    private long ts;
+    private Date time;
+    //@JsonInclude(JsonInclude.Include.NON_NULL)
+    private String tagName;
+    /**
+     * 数据
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Double doubleValue;
+    /**
+     * Boolean 数据
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Boolean booleanValue;
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Long longValue;
+
+    public PointData2() {
+    }
+
+    public PointData2(Date time, double doubleValue) {
+        this.time = time;
+        this.doubleValue = doubleValue;
+    }
+
+    public long getTs() {
+        if (ts == 0 && time != null) {
+            return time.getTime();
+        }
+        return ts;
+    }
+
+    public void setTs(long ts) {
+        this.ts = ts;
+    }
+
+    @JsonIgnore
+    public TsDataType getDataType() {
+        if (booleanValue != null) {
+            return TsDataType.BOOLEAN;
+        } else if (longValue != null) {
+            return TsDataType.LONG;
+        }
+        return TsDataType.DOUBLE;
+    }
+
+    public Boolean getBooleanValue() {
+        return booleanValue;
+    }
+
+    public Boolean isBooleanValue() {
+        return booleanValue;
+    }
+
+    public void setBooleanValue(boolean booleanValue) {
+        this.booleanValue = booleanValue;
+    }
+
+    public Long getLongValue() {
+        return longValue;
+    }
+
+    public void setLongValue(long longValue) {
+        this.longValue = longValue;
+    }
+
+    public Date getTime() {
+        return time;
+    }
+
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    public String getTagName() {
+        return tagName;
+    }
+
+    public void setTagName(String tagName) {
+        this.tagName = tagName;
+    }
+
+    public Double getDoubleValue() {
+        return doubleValue;
+    }
+
+    public void setDoubleValue(double doubleValue) {
+        this.doubleValue = doubleValue;
+    }
+
+    @JsonIgnore
+    public Double getValue() {
+        if (booleanValue != null) {
+            return booleanValue ? 1.0 : 0.0;
+        } else if (longValue != null) {
+            doubleValue = Double.valueOf(longValue);
+        }
+        return doubleValue;
+    }
+
+}

+ 35 - 0
common/src/main/java/com/gyee/common/model/TsDataType.java

@@ -0,0 +1,35 @@
+package com.gyee.common.model;
+
+/**
+ * @author songwb<songwb @ aliyun.com>
+ */
+public enum TsDataType {
+    LONG("long"),
+    DOUBLE("double"),
+    BOOLEAN("boolean"),
+    STRING("string"),
+    BLOB("blob"),
+    COORDINATE("coordinate");
+
+    private final String descript;
+
+    private TsDataType(String descript) {
+        this.descript = descript;
+    }
+
+    // 公共方法,用于获取枚举常量的描述
+    public String getDescript() {
+        return descript;
+    }
+
+    // 静态方法,通过描述性字符串获取对应的枚举常量
+    public static TsDataType getByDescript(String descript) {
+        for (TsDataType type : TsDataType.values()) {
+            if (type.getDescript().equalsIgnoreCase(descript)) {
+                return type;
+            }
+        }
+        return TsDataType.DOUBLE;
+    }
+}
+

+ 1 - 1
data-adapter/src/main/resources/application.yaml

@@ -1,5 +1,5 @@
 server:
-  port: 9011
+  port: 8011
 
 # Mqtt相关配置
 publish:

+ 5 - 0
generationXK-service/pom.xml

@@ -136,6 +136,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!--        <dependency>-->
         <!--            <groupId>com.gyee</groupId>-->

+ 13 - 5
generationXK-service/src/main/java/com/gyee/generation/config/GeneratorCodeConfig.java

@@ -1,3 +1,4 @@
+/*
 package com.gyee.generation.config;
 
 
@@ -10,13 +11,15 @@ import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
 
 import java.util.Scanner;
 
+*/
 /**
  * @ClassName GeneratorCodeConfig
  * @Description 自动生成mybatisplus的相关代码
  * @Author 谢生杰
  * @Date 2020/9/25 18:26
  * @Version 1.0
- **/
+ **//*
+
 public class GeneratorCodeConfig {
     public static String scanner(String tip) {
         Scanner scanner = new Scanner(System.in);
@@ -48,11 +51,13 @@ public class GeneratorCodeConfig {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        /*dsc.setUrl("jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true");
+        */
+/*dsc.setUrl("jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true");
         dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("root");
-        mpg.setDataSource(dsc);*/
+        mpg.setDataSource(dsc);*//*
+
         //        dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
         //        dsc.setUsername("gdprod");
         //        dsc.setPassword("gd123");
@@ -106,7 +111,8 @@ public class GeneratorCodeConfig {
         //                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
         //            }
         //        });
-        /*
+        */
+/*
         cfg.setFileCreate(new IFileCreate() {
             @Override
             public boolean isCreate(ConfigBuilder configBuilder, FileType fileType, String filePath) {
@@ -115,7 +121,8 @@ public class GeneratorCodeConfig {
                 return false;
             }
         });
-        */
+        *//*
+
         //        cfg.setFileOutConfigList(focList);
         //        mpg.setCfg(cfg);
 
@@ -152,3 +159,4 @@ public class GeneratorCodeConfig {
         mpg.execute();
     }
 }
+*/

+ 7 - 7
generationXK-service/src/main/java/com/gyee/generation/service/InputOrOutPutService.java

@@ -74,18 +74,18 @@ public class InputOrOutPutService {
         }
 
         try {
-            //            List<PointData> mxztvaluels = edosUtil.getRealData(mxztls);
-            Map<String, PointInfo> mxztvaluelsMap = iAdapterService.getLatestData(mxzts);
-            List<PointInfo> mxztvaluels = null;
-            if (null != mxztvaluelsMap && mxztvaluelsMap.size() != 0) {
-                mxztvaluels = (List<PointInfo>) mxztvaluelsMap.values();
-            }
+                        List<PointData> mxztvaluels = edosUtil.getRealData(mxztls);
+            //Map<String, PointInfo> mxztvaluelsMap = iAdapterService.getLatestData(mxzts);
+            //List<PointInfo> mxztvaluels = null;
+            //if (null != mxztvaluelsMap && mxztvaluelsMap.size() != 0) {
+            //    mxztvaluels = (List<PointInfo>) mxztvaluelsMap.values();
+            //}
             if (null != mxztvaluels && mxztvaluels.size() == wtls.size()) {
                 for (int i = 0; i < wtls.size(); i++) {
 
                     ProBasicEquipment wt = wtls.get(i);
                     //                    statusRanngMap.put(wt.getId(), mxztvaluels.get(i).getPointValueInDouble());
-                    statusRanngMap.put(wt.getId(), (Double) mxztvaluels.get(i).getValue());
+                    statusRanngMap.put(wt.getId(), (Double) mxztvaluels.get(i).getPointValueInDouble());
                 }
             }
 

+ 1 - 1
generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java

@@ -1256,7 +1256,7 @@ public class WindPowerInfo1Service {
     public void writegf(Date date) throws Exception {
         LocalDate localDate = LocalDateTime.now().toLocalDate();
         String[] split = gf.split(",");
-        List<PointData> realData = edosUtil.getRealData(split);
+        List<PointData> realData = edosUtil.getRealData(Arrays.asList(split));
         QueryWrapper<ProEconAnalysisSubtableBottom> qw = new QueryWrapper<>();
         qw.lambda().eq(ProEconAnalysisSubtableBottom::getRecordDate, localDate);
         List<ProEconAnalysisSubtableBottom> sel = iProEconAnalysisSubtableBottomService.sel(qw);

+ 157 - 155
generationXK-service/src/main/java/com/gyee/generation/service/initalcache/CacheService.java

@@ -4,7 +4,8 @@ package com.gyee.generation.service.initalcache;/*
 */
 
 import com.alibaba.fastjson.JSONObject;
-import com.gyee.generation.model.auto.ProBasicStatusPoint;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.generation.model.auto.*;
 import com.gyee.generation.service.auto.*;
 import com.gyee.generation.util.redis.RedisService;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +17,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -58,38 +60,97 @@ public class CacheService {
 
     public void initRedisCache() {
         redisService.select(9);
-        //        log.info("--------------------------redisWT");
-        ////        List<ProBasicEquipment> windturbineList = windturbineService.list().stream().filter(i->(
-        ////                i.getWindpowerstationId().equals("SXJ_KGDL_XWT_FDC_STA")
-        //////                        ||
-        //////                i.getWindpowerstationId().equals("SXJ_KGDL_GJY_FDC_STA") ||
-        //////                        i.getWindpowerstationId().equals("SXJ_KGDL_NJL_FDC_STA") ||
-        //////                        i.getWindpowerstationId().equals("SXJ_KGDL_PDL_FDC_STA")  ||
-        //////                        i.getWindpowerstationId().equals("SXJ_KGDL_ZK_FDC_STA")
-        ////        ) &&  i.getIsable().equals(1)).collect(Collectors.toList());
-        //        List<ProBasicEquipment> windturbineList = windturbineService.list().stream().filter(i-> i.getIsable().equals(1)).collect(Collectors.toList());
-        //
-        //        log.info("--------------------------windturbineList"+windturbineList.size());
-        //        windturbineList.stream().forEach(i->{
-        //            Map<String, ProBasicEquipmentPoint> codeaimap = new HashMap<>();
-        //            QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
-        //            qw.eq("windturbine_id",i.getId());
-        //            List<ProBasicEquipmentPoint> windturbinetestingpointai2List = windturbinetestingpointnewService.list(qw);
-        //            log.info("--------------------------windturbinetestingpointai2List"+windturbinetestingpointai2List.size());
-        //            windturbinetestingpointai2List.stream().forEach(x->{
+                log.info("--------------------------redisWT");
+        //        List<ProBasicEquipment> windturbineList = windturbineService.list().stream().filter(i->(
+        //                i.getWindpowerstationId().equals("SXJ_KGDL_XWT_FDC_STA")
+        ////                        ||
+        ////                i.getWindpowerstationId().equals("SXJ_KGDL_GJY_FDC_STA") ||
+        ////                        i.getWindpowerstationId().equals("SXJ_KGDL_NJL_FDC_STA") ||
+        ////                        i.getWindpowerstationId().equals("SXJ_KGDL_PDL_FDC_STA")  ||
+        ////                        i.getWindpowerstationId().equals("SXJ_KGDL_ZK_FDC_STA")
+        //        ) &&  i.getIsable().equals(1)).collect(Collectors.toList());
+                List<ProBasicEquipment> windturbineList = windturbineService.list().stream().filter(i-> i.getIsable().equals(1)).collect(Collectors.toList());
+
+                log.info("--------------------------windturbineList"+windturbineList.size());
+                windturbineList.stream().forEach(i->{
+                    Map<String, ProBasicEquipmentPoint> codeaimap = new HashMap<>();
+                    QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
+                    qw.eq("windturbine_id",i.getId());
+                    List<ProBasicEquipmentPoint> windturbinetestingpointai2List = windturbinetestingpointnewService.list(qw);
+                    log.info("--------------------------windturbinetestingpointai2List"+windturbinetestingpointai2List.size());
+                    windturbinetestingpointai2List.stream().forEach(x->{
+                        codeaimap.put(x.getUniformCode(),x);
+                    });
+                    log.info("--------------------------codeaimap"+codeaimap.size());
+                    String s = JSONObject.toJSONString(codeaimap);
+                    redisService.set(i.getId(),s);
+                });
+
+
+
+
+                log.info("--------------------------redisSQ");
+                List<ProBasicSquare> squareList = proBasicSquareService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+                squareList.stream().forEach(i->{
+                    Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+                    QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+                    qw.eq("windpowerstation_id",i.getId());
+                    List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+                    windpowerstationtestingpoint2List.stream().forEach(x->{
+                        codeaimap.put(x.getUniformCode(),x);
+                    });
+                    String s = JSONObject.toJSONString(codeaimap);
+                    redisService.set(i.getId(),s);
+                });
+
+                log.info("--------------------------redisLN");
+                List<ProBasicLine> lineList = lineService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+                lineList.stream().forEach(i->{
+                    Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+                    QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+                    qw.eq("windpowerstation_id",i.getId());
+                    List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+                    windpowerstationtestingpoint2List.stream().forEach(x->{
+                        codeaimap.put(x.getUniformCode(),x);
+                    });
+                    String s = JSONObject.toJSONString(codeaimap);
+                    redisService.set(i.getId(),s);
+                });
+
+
+
+                log.info("--------------------------redisPJ");
+                List<ProBasicProject> projectList = projectService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+                projectList.stream().forEach(i->{
+                    Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+                    QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+                    qw.eq("windpowerstation_id",i.getId());
+                    List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+                    windpowerstationtestingpoint2List.stream().forEach(x->{
+                        codeaimap.put(x.getUniformCode(),x);
+                    });
+                    String s = JSONObject.toJSONString(codeaimap);
+                    redisService.set(i.getId(),s);
+                });
+
+        //        log.info("--------------------------redisSubWP");
+        //        redisService.select(9);
+        //        List<ProBasicSubStation> subStationList = subStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+        //        subStationList.stream().forEach(i->{
+        //            Map<String, ProBasicSubStationTestpoint> codeaimap = new HashMap<>();
+        //            QueryWrapper<ProBasicSubStationTestpoint> qw = new QueryWrapper<>();
+        //            qw.eq("windpowerstation_id",i.getId());
+        //            List<ProBasicSubStationTestpoint> windpowerstationtestingpoint2List = proBasicSubStationTestpointService.list(qw);
+        //            windpowerstationtestingpoint2List.stream().forEach(x->{
         //                codeaimap.put(x.getUniformCode(),x);
         //            });
-        //            log.info("--------------------------codeaimap"+codeaimap.size());
         //            String s = JSONObject.toJSONString(codeaimap);
         //            redisService.set(i.getId(),s);
         //        });
-
         //
-        //
-        //
-        //        log.info("--------------------------redisSQ");
-        //        List<ProBasicSquare> squareList = proBasicSquareService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        //        squareList.stream().forEach(i->{
+        //        log.info("--------------------------redisWeatherWP");
+        //        List<ProBasicWeatherStation> weatherStationList = proBasicWeatherStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+        //        weatherStationList.stream().forEach(i->{
         //            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
         //            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
         //            qw.eq("windpowerstation_id",i.getId());
@@ -101,158 +162,99 @@ public class CacheService {
         //            redisService.set(i.getId(),s);
         //        });
         //
-        //        log.info("--------------------------redisLN");
-        //        List<ProBasicLine> lineList = lineService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        //        lineList.stream().forEach(i->{
+        //        log.info("--------------------------redisWP");
+                List<ProBasicPowerstation> wpList = windpowerstationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+
+                wpList.stream().forEach(i->{
+                    Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+                    QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+                    qw.eq("windpowerstation_id",i.getId());
+                    List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+                    windpowerstationtestingpoint2List.stream().forEach(x->{
+                        codeaimap.put(x.getUniformCode(),x);
+                    });
+                    String s = JSONObject.toJSONString(codeaimap);
+                    redisService.set(i.getId(),s);
+                });
+        //
+        //        log.info("--------------------------redisCOMPANY");
+        //        List<ProBasicCompany> coms = companyService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+        ////        List<String> comList = coms.stream().map(i->i.getId()).collect(Collectors.toList());
+        //        List<String> comList = new ArrayList<>();
+        //        coms.stream().forEach(company -> {
+        //            comList.add(company.getId()+"0");
+        //            comList.add(company.getId()+"-1");
+        //            comList.add(company.getId()+"-2");
+        //        });
+        //        comList.stream().forEach(i->{
         //            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
         //            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-        //            qw.eq("windpowerstation_id",i.getId());
+        //            qw.eq("windpowerstation_id",i);
         //            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
         //            windpowerstationtestingpoint2List.stream().forEach(x->{
         //                codeaimap.put(x.getUniformCode(),x);
         //            });
         //            String s = JSONObject.toJSONString(codeaimap);
-        //            redisService.set(i.getId(),s);
+        //            redisService.set(i,s);
         //        });
         //
-        //
-        //
-        //        log.info("--------------------------redisPJ");
-        //        List<ProBasicProject> projectList = projectService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        //        projectList.stream().forEach(i->{
+        //        log.info("--------------------------redisREGION");
+        //        List<ProBasicRegion> regs = regionsService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+        //        List<String> regList = new ArrayList<>();
+        ////        List<String> regList = regs.stream().map(i->i.getId()).collect(Collectors.toList());
+        //        regs.stream().forEach(region -> {
+        //            regList.add(region.getId()+"0");
+        //            regList.add(region.getId()+"-1");
+        //            regList.add(region.getId()+"-2");
+        //        });
+        //        regList.stream().forEach(i->{
         //            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
         //            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-        //            qw.eq("windpowerstation_id",i.getId());
+        //            qw.eq("windpowerstation_id",i);
         //            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
         //            windpowerstationtestingpoint2List.stream().forEach(x->{
         //                codeaimap.put(x.getUniformCode(),x);
         //            });
         //            String s = JSONObject.toJSONString(codeaimap);
-        //            redisService.set(i.getId(),s);
+        //            redisService.set(i,s);
         //        });
-        //
-        ////        log.info("--------------------------redisSubWP");
-        ////        redisService.select(9);
-        ////        List<ProBasicSubStation> subStationList = subStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        ////        subStationList.stream().forEach(i->{
-        ////            Map<String, ProBasicSubStationTestpoint> codeaimap = new HashMap<>();
-        ////            QueryWrapper<ProBasicSubStationTestpoint> qw = new QueryWrapper<>();
-        ////            qw.eq("windpowerstation_id",i.getId());
-        ////            List<ProBasicSubStationTestpoint> windpowerstationtestingpoint2List = proBasicSubStationTestpointService.list(qw);
-        ////            windpowerstationtestingpoint2List.stream().forEach(x->{
-        ////                codeaimap.put(x.getUniformCode(),x);
-        ////            });
-        ////            String s = JSONObject.toJSONString(codeaimap);
-        ////            redisService.set(i.getId(),s);
-        ////        });
-        ////
-        ////        log.info("--------------------------redisWeatherWP");
-        ////        List<ProBasicWeatherStation> weatherStationList = proBasicWeatherStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        ////        weatherStationList.stream().forEach(i->{
-        ////            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-        ////            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-        ////            qw.eq("windpowerstation_id",i.getId());
-        ////            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-        ////            windpowerstationtestingpoint2List.stream().forEach(x->{
-        ////                codeaimap.put(x.getUniformCode(),x);
-        ////            });
-        ////            String s = JSONObject.toJSONString(codeaimap);
-        ////            redisService.set(i.getId(),s);
-        ////        });
-        ////
-        ////        log.info("--------------------------redisWP");
-        //        List<ProBasicPowerstation> wpList = windpowerstationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        //
-        //        wpList.stream().forEach(i->{
+        //        log.info("--------------------------redisGroup");
+        //        List<ProBasicEnergyGroup> groups = energyGroupService.list().stream().filter(i->i.getIsAble().equals(1) && !i.getParentid().equals("0")).collect(Collectors.toList());
+        //        List<String> groupList = new ArrayList<>();
+        ////        List<String> regList = regs.stream().map(i->i.getId()).collect(Collectors.toList());
+        //        groups.stream().forEach(group -> {
+        //            groupList.add(group.getId()+"0");
+        //            groupList.add(group.getId()+"-1");
+        //            groupList.add(group.getId()+"-2");
+        //        });
+        //        groupList.stream().forEach(i->{
         //            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
         //            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-        //            qw.eq("windpowerstation_id",i.getId());
+        //            qw.eq("windpowerstation_id",i);
         //            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
         //            windpowerstationtestingpoint2List.stream().forEach(x->{
         //                codeaimap.put(x.getUniformCode(),x);
         //            });
         //            String s = JSONObject.toJSONString(codeaimap);
-        //            redisService.set(i.getId(),s);
+        //            redisService.set(i,s);
         //        });
-        ////
-        ////        log.info("--------------------------redisCOMPANY");
-        ////        List<ProBasicCompany> coms = companyService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        //////        List<String> comList = coms.stream().map(i->i.getId()).collect(Collectors.toList());
-        ////        List<String> comList = new ArrayList<>();
-        ////        coms.stream().forEach(company -> {
-        ////            comList.add(company.getId()+"0");
-        ////            comList.add(company.getId()+"-1");
-        ////            comList.add(company.getId()+"-2");
-        ////        });
-        ////        comList.stream().forEach(i->{
-        ////            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-        ////            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-        ////            qw.eq("windpowerstation_id",i);
-        ////            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-        ////            windpowerstationtestingpoint2List.stream().forEach(x->{
-        ////                codeaimap.put(x.getUniformCode(),x);
-        ////            });
-        ////            String s = JSONObject.toJSONString(codeaimap);
-        ////            redisService.set(i,s);
-        ////        });
-        ////
-        ////        log.info("--------------------------redisREGION");
-        ////        List<ProBasicRegion> regs = regionsService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        ////        List<String> regList = new ArrayList<>();
-        //////        List<String> regList = regs.stream().map(i->i.getId()).collect(Collectors.toList());
-        ////        regs.stream().forEach(region -> {
-        ////            regList.add(region.getId()+"0");
-        ////            regList.add(region.getId()+"-1");
-        ////            regList.add(region.getId()+"-2");
-        ////        });
-        ////        regList.stream().forEach(i->{
-        ////            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-        ////            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-        ////            qw.eq("windpowerstation_id",i);
-        ////            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-        ////            windpowerstationtestingpoint2List.stream().forEach(x->{
-        ////                codeaimap.put(x.getUniformCode(),x);
-        ////            });
-        ////            String s = JSONObject.toJSONString(codeaimap);
-        ////            redisService.set(i,s);
-        ////        });
-        ////        log.info("--------------------------redisGroup");
-        ////        List<ProBasicEnergyGroup> groups = energyGroupService.list().stream().filter(i->i.getIsAble().equals(1) && !i.getParentid().equals("0")).collect(Collectors.toList());
-        ////        List<String> groupList = new ArrayList<>();
-        //////        List<String> regList = regs.stream().map(i->i.getId()).collect(Collectors.toList());
-        ////        groups.stream().forEach(group -> {
-        ////            groupList.add(group.getId()+"0");
-        ////            groupList.add(group.getId()+"-1");
-        ////            groupList.add(group.getId()+"-2");
-        ////        });
-        ////        groupList.stream().forEach(i->{
-        ////            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-        ////            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-        ////            qw.eq("windpowerstation_id",i);
-        ////            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-        ////            windpowerstationtestingpoint2List.stream().forEach(x->{
-        ////                codeaimap.put(x.getUniformCode(),x);
-        ////            });
-        ////            String s = JSONObject.toJSONString(codeaimap);
-        ////            redisService.set(i,s);
-        ////        });
-        ////        redisService.select(9);
-        ////        log.info("--------------------------redis理论保证功率");
-        ////        Map<String, Map<Double, ProBasicModelPowerRd>> powerrdMap = new HashMap<>();
-        ////
-        ////        List<ProBasicModelPowerRd> proBasicModelPowerRds = proBasicModelPowerRdService.list();
-        ////        proBasicModelPowerRds.stream().forEach(powerrd->{
-        ////            if (powerrdMap.containsKey(powerrd.getModelId())){
-        ////                powerrdMap.get(powerrd.getModelId()).put(powerrd.getSpeed(),powerrd);
-        ////            }else {
-        ////                Map<Double,ProBasicModelPowerRd> powerMap = new HashMap<>();
-        ////                powerMap.put(powerrd.getSpeed(),powerrd);
-        ////                powerrdMap.put(powerrd.getModelId(),powerMap);
-        ////            }
-        ////        });
-        ////        redisService.set("ZLLGL", JSONObject.toJSONString(powerrdMap));
+        //        redisService.select(9);
+        //        log.info("--------------------------redis理论保证功率");
+        //        Map<String, Map<Double, ProBasicModelPowerRd>> powerrdMap = new HashMap<>();
         //
-        //        log.info("--------------------------redis十三种状态");
+        //        List<ProBasicModelPowerRd> proBasicModelPowerRds = proBasicModelPowerRdService.list();
+        //        proBasicModelPowerRds.stream().forEach(powerrd->{
+        //            if (powerrdMap.containsKey(powerrd.getModelId())){
+        //                powerrdMap.get(powerrd.getModelId()).put(powerrd.getSpeed(),powerrd);
+        //            }else {
+        //                Map<Double,ProBasicModelPowerRd> powerMap = new HashMap<>();
+        //                powerMap.put(powerrd.getSpeed(),powerrd);
+        //                powerrdMap.put(powerrd.getModelId(),powerMap);
+        //            }
+        //        });
+        //        redisService.set("ZLLGL", JSONObject.toJSONString(powerrdMap));
+
+                log.info("--------------------------redis十三种状态");
         Map<String, List<ProBasicStatusPoint>> sszztMap = new HashMap<>();
         List<ProBasicStatusPoint> windturbinestatusdis = proBasicStatusPointService.list();
         windturbinestatusdis.stream().forEach(w -> {
@@ -265,7 +267,7 @@ public class CacheService {
             }
         });
         redisService.set("SSZZT", JSONObject.toJSONString(sszztMap));
-        //
-        //        log.info("--------------------------完成");
+
+                log.info("--------------------------完成");
     }
 }

+ 3 - 3
generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java

@@ -704,7 +704,7 @@ public class EdosUtil implements IEdosUtil {
 
     @Override
 //    public List<PointData> getRealData(String... pointids) throws Exception {
-    public List<PointData> getRealDataPost(List<String> pointids) throws Exception {
+    public List<PointData> getRealData(List<String> pointids) throws Exception {
 
 //        String pointIdString = StringUtil.join(pointids, ",");
 //        Optional<String> keys = Optional.ofNullable(pointIdString);
@@ -801,8 +801,8 @@ public class EdosUtil implements IEdosUtil {
 
     }
 
-    @Override
-    public List<PointData> getRealData(List<String> pointids) throws Exception {
+    //@Override
+    public List<PointData> getRealData2(List<String> pointids) throws Exception {
 
 
         String pointIdString = StringUtil.join(pointids.toArray(), ",");

File diff suppressed because it is too large
+ 1518 - 0
generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil2.java


+ 1 - 1
generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/IEdosUtil.java

@@ -116,7 +116,7 @@ public interface IEdosUtil {
      * @throws Exception
      */
 //    public List<PointData> getRealData(String... pointids) throws Exception;
-    public List<PointData> getRealDataPost(List<String> pointids) throws Exception;
+//    public List<PointData> getRealDataPost(List<String> pointids) throws Exception;
 
     /**
      * 通过全局点名获得测点实时数据 读取多个点

+ 6 - 6
generationXK-service/src/main/resources/application-nxf.yml

@@ -36,7 +36,7 @@ spring:
           password: smart123!@#
         slave:
           driver-class-name: com.taosdata.jdbc.TSDBDriver
-          url: jdbc:TAOS://10.220.1.5:6030/nemjn?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
+          url: jdbc:TAOS://10.220.1.5:6041/nxxny?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
           username: root
           password: taosdata
         #配置初始化连接数大小
@@ -114,13 +114,13 @@ logging:
 
 #db url
 db:
-  url1: http://10.81.3.160:8011/ts
-  url2: http://10.81.3.160:8012/ts
-#  url1: http://127.0.0.1:8011/ts
-#  url2: http://127.0.0.1:8011/ts
+#  url1: http://10.81.3.160:8011/ts
+#  url2: http://10.81.3.160:8012/ts
+  url1: http://127.0.0.1:8011/ts
+  url2: http://127.0.0.1:8011/ts
 
 #参与计算的场站
-runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_YG_GDC_STA,SXJ_KGDL_YX_GDC_STA,SXJ_KGDL_TZ_GDC_STA,SXJ_KGDL_TL_GDC_STA
+runWindpowerstation: NX_FGS_HA_FDC_STA
 #runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_YG_GDC_STA,SXJ_KGDL_YX_GDC_STA,SXJ_KGDL_TZ_GDC_STA,SXJ_KGDL_TL_GDC_STA
 #runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA
 #runWindpowerstation: SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_YG_GDC_STA,SXJ_KGDL_YX_GDC_STA,SXJ_KGDL_TZ_GDC_STA,SXJ_KGDL_TL_GDC_STA,SXJ_KGDL_SY_GDC_STA

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-7001.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generation7001-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9309
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\7001log
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-7002.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://localhost:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generation7002-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9307
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\7002log
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-7003.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://localhost:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generation7003-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9308
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\7003log
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-accuracy.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=accuracy-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9377
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\accuracylog
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-analyNew.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=analydm-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9380
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\analy
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-efficiency.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=efficiency-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9379
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\efficiency
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 23
generationXK-service/src/main/resources/xxl-job-executor.properties

@@ -1,23 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-#xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
-xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-xxl.job.executor.appname=generationTarget-job
-### 区域公司计算
-#xxl.job.executor.appname=generationRG-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-xxl.job.executor.port=9201
-#区域端口
-#xxl.job.executor.port=9202
-### xxl-job executor log-path
-xxl.job.executor.logpath=/data/nem/computeEngine/logs
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 23
generationXK-service/src/main/resources/xxl-job-executor2.properties

@@ -1,23 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-#xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
-xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-xxl.job.executor.appname=generationTarget-job-2
-### 区域公司计算
-#xxl.job.executor.appname=generationRG-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-xxl.job.executor.port=9203
-#区域端口
-#xxl.job.executor.port=9202
-### xxl-job executor log-path
-xxl.job.executor.logpath=/data/nem/computeEngine/logs
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 2 - 2
generationXK-service/src/main/resources/xxl-job-executor3.properties

@@ -1,12 +1,12 @@
 ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
 #xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
 #xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
-xxl.job.admin.addresses=http://10.220.1.5:8175/xxl-job-admin
+xxl.job.admin.addresses=http://10.220.1.8:8175/xxl-job-admin
 ### xxl-job, access token
 xxl.job.accessToken=
 ### xxl-job executor appname
 ### ³¡Õ¾¼ÆËã
-xxl.job.executor.appname=generationTarget-job-3
+xxl.job.executor.appname=generationTarget
 ### ÇøÓò¹«Ë¾¼ÆËã
 #xxl.job.executor.appname=generationRG-job
 ### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null

+ 0 - 23
generationXK-service/src/main/resources/xxl-job-executor4.properties

@@ -1,23 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-#xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
-xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-xxl.job.executor.appname=generationTarget-job-4
-### 区域公司计算
-#xxl.job.executor.appname=generationRG-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-xxl.job.executor.port=9205
-#区域端口
-#xxl.job.executor.port=9202
-### xxl-job executor log-path
-xxl.job.executor.logpath=/data/nem/computeEngine/logs
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 23
generationXK-service/src/main/resources/xxl-job-executor5.properties

@@ -1,23 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-#xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
-xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-xxl.job.executor.appname=generationTarget-job-5
-### 区域公司计算
-#xxl.job.executor.appname=generationRG-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-xxl.job.executor.port=9206
-#区域端口
-#xxl.job.executor.port=9202
-### xxl-job executor log-path
-xxl.job.executor.logpath=/data/nem/computeEngine/logs
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 23
generationXK-service/src/main/resources/xxl-job-executor6.properties

@@ -1,23 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-#xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
-xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-xxl.job.executor.appname=generationTarget-job-6
-### 区域公司计算
-#xxl.job.executor.appname=generationRG-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-xxl.job.executor.port=9207
-#区域端口
-#xxl.job.executor.port=9202
-### xxl-job executor log-path
-xxl.job.executor.logpath=/data/nem/computeEngine/executor6/logs
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorGF000.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationGF000-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9310
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\GFlog
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorGF001.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationGF001-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9311
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\GFlog
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorGF002.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationGF002-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9312
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\GF02log
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorGF003.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationGF003-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9313
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\GF03log
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorGF004.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationGF004-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9314
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\GF04log
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorGF005.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationGF005-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9315
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\GF05log
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorGF006.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://localhost:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationGF006-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9316
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\GF06log
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorGF007.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationGF007-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9317
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\GF07log
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorGF008.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationGF008-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9318
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\GF08log
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 16
generationXK-service/src/main/resources/xxl-job-executorJN.properties

@@ -1,16 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.155:8175/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### ³¡Õ¾¼ÆËã
-xxl.job.executor.appname=generationJN-job
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#³¡Õ¾¶Ë¿Ú
-xxl.job.executor.port=9114
-### xxl-job executor log-path
-xxl.job.executor.logpath=/usr/local/gyee/generationJN/logs
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorRG.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationRG-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9202
-### xxl-job executor log-path
-xxl.job.executor.logpath=/data/nem/computeEngine/logs
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorWPGD.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationWPGD-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9301
-### xxl-job executor log-path
-xxl.job.executor.logpath=/data/nem/computeEngine/logs
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorWPGH.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationWPGH-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9303
-### xxl-job executor log-path
-xxl.job.executor.logpath=/data/nem/computeEngine/logs
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorWPLY.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationWPLY-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9302
-### xxl-job executor log-path
-xxl.job.executor.logpath=/data/nem/computeEngine/logs
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-executorWPXNY.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationWPXNY-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9304
-### xxl-job executor log-path
-xxl.job.executor.logpath=/data/nem/computeEngine/logs
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-irradiation.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=irradiation-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9381
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\irradiation
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 22
generationXK-service/src/main/resources/xxl-job-region.properties

@@ -1,22 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8179/xxl-job-admin
-### xxl-job, access token
-xxl.job.accessToken=
-### xxl-job executor appname
-### 场站计算
-#xxl.job.executor.appname=generationWP-job
-### 区域公司计算
-xxl.job.executor.appname=generationregion-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-#场站端口
-#xxl.job.executor.port=9201
-#区域端口
-xxl.job.executor.port=9202
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\gyee\log\RGlog
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 24 - 1
generationXK-service/src/test/java/com/gyee/generation/SaticScheduleCALTaskTest.java

@@ -1,11 +1,17 @@
 package com.gyee.generation;
 
 import com.gyee.generation.service.InitialRedisService;
+import com.gyee.generation.service.initalcache.CacheService;
 import com.gyee.generation.service.realtimelibrary.AccessStatusService;
 import com.gyee.generation.task.SaticScheduleCALTask;
 import com.gyee.generation.task.SaticSchedulePgTask;
+import com.xxl.job.core.context.XxlJobHelper;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
 
@@ -14,6 +20,7 @@ import javax.annotation.Resource;
  * Data  : 2023: 12: 13
  **/
 @SpringBootTest
+@RunWith(SpringRunner.class)
 public class SaticScheduleCALTaskTest {
 
     @Resource
@@ -25,9 +32,25 @@ public class SaticScheduleCALTaskTest {
     @Resource
     private SaticSchedulePgTask saticSchedulePgTask;
 
+    @Resource
+    private CacheService cacheService;
+    /**
+     * 缓存Redis散点图数据
+     * 每天执行一次
+     */
+    @Test
+    public void initialRedis_PG() {
+
+        try {
+            cacheService.initRedisCache();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     @Test
     public void all() throws Exception {
-        saticSchedulePgTask.ndgfzb();
+        saticScheduleCALTask.status_powerRationing();
         //        saticScheduleCALTask.status_powerRationing();//status_middleStatusReal
         //        saticScheduleCALTask.status_statusReal();
         //          saticScheduleCALTask.calculate_powerRationing();

+ 1 - 1
pom.xml

@@ -34,7 +34,7 @@
         <pgsql.version>42.2.5</pgsql.version>
         <druid.version>1.2.11</druid.version>
         <mybatis.plus.boot.starter.version>3.5.7</mybatis.plus.boot.starter.version>
-        <mybatis.plus.generator.version>3.3.2</mybatis.plus.generator.version>
+        <mybatis.plus.generator.version>3.5.7</mybatis.plus.generator.version>
         <fastjson.version>1.2.17</fastjson.version>
         <tomcat.version>9.0.52</tomcat.version>
     </properties>