Merge remote-tracking branch 'origin/main'

2026-01-05 16:55:53 +08:00
parent 322001150a b805bda25b
commit 95a571d3c3
6 changed files with 8715 additions and 3993 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
        <!--                <middle.server.url>10.95.53.49</middle.server.url>-->
        <middle.server.url>192.168.1.103</middle.server.url>
        <!--微服务模块发布地址-->
-        <service.server.url>127.0.0.1</service.server.url>
+        <service.server.url>192.168.2.130</service.server.url>
        <!--docker仓库地址-->
        <docker.server.url>192.168.1.22</docker.server.url>
        <!--nacos的ip:port-->
@@ -53,9 +53,9 @@
        <!--nacos的ip:port-->
        <nacos.password>nacos</nacos.password>
        <!--服务器发布内容为空-->
-        <!--                <nacos.namespace></nacos.namespace>-->
+                        <nacos.namespace>hswbpm</nacos.namespace>
        <!--                <nacos.namespace>30c701c4-2a94-49d9-82e1-76aa9456573f</nacos.namespace>-->
-        <nacos.namespace>6fd2d036-f390-46ee-9c9d-d5a5c00e3314</nacos.namespace>
+<!--        <nacos.namespace>12b467cc-a7e6-411d-8944-090cbfa09dde</nacos.namespace>-->
        <!--        <nacos.namespace>910d0d69-2254-481b-b9f7-7ecf9cb881b0</nacos.namespace>-->
        <!--        sentinel:port-->
        <sentinel.url>${middle.server.url}:8080</sentinel.url>
@@ -81,6 +81,7 @@
        <springcloud.alibaba.version>2.2.7.RELEASE</springcloud.alibaba.version>
        <hutool.version>5.8.11</hutool.version>
        <knife4j.version>3.0.2</knife4j.version>
+        <postgresql.version>42.3.8</postgresql.version>
        <knife4j.aggregation.version>2.0.8</knife4j.aggregation.version>
        <lombok.version>1.18.18</lombok.version>
        <mybatis.version>2.1.3</mybatis.version>
@@ -171,6 +172,11 @@
                <artifactId>knife4j-spring-ui</artifactId>
                <version>${knife4j.version}</version>
            </dependency>
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>${postgresql.version}</version>
+            </dependency>
            <dependency>
                <groupId>com.github.xiaoymin</groupId>
                <artifactId>knife4j-aggregation-spring-boot-starter</artifactId>
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
@@ -340,30 +340,30 @@ public class TransientServiceImpl implements TransientService {
            // 获取按终端分类的监测点索引集合
            List<String> lineList = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
            List<TerminalTree> data = deviceTreeClient.getTerminalTree().getData();
-            if (!CollectionUtils.isEmpty(transientParam.getSubstationIds())) {
-                List<String> collect = data.stream().map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .filter(temp -> transientParam.getSubstationIds().contains(temp.getId()))
-                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .map(TerminalTree::getId).collect(Collectors.toList());
-                lineList.retainAll(collect);
-            }
+//            if (!CollectionUtils.isEmpty(transientParam.getSubstationIds())) {
+//                List<String> collect = data.stream().map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .filter(temp -> transientParam.getSubstationIds().contains(temp.getId()))
+//                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .map(TerminalTree::getId).collect(Collectors.toList());
+//                lineList.retainAll(collect);
+//            }

            if (!CollectionUtils.isEmpty(transientParam.getLineIds())) {
-                List<String> collect1 = data.stream().map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
-                        .filter(temp -> transientParam.getLineIds().contains(temp.getId()))
-                        .map(TerminalTree::getId).collect(Collectors.toList());
-                lineList.retainAll(collect1);
+//                List<String> collect1 = data.stream().map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .map(TerminalTree::getChildren).flatMap(Collection::stream)
+//                        .filter(temp -> transientParam.getLineIds().contains(temp.getId()))
+//                        .map(TerminalTree::getId).collect(Collectors.toList());
+                lineList.retainAll(transientParam.getLineIds());
            }
            if (CollUtil.isEmpty(lineList)) {
                return new Page<>();
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
@@ -330,7 +330,8 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
        param.setDeptName(deptName);
        String inputUrl = "file/warningReport.docx";
        String alarmType = param.getType() == 1 ? "预" : "告";
-        String fileName = "电能[" + alarmType + "]" + param.getYear() + "年" + param.getNumber() + "号-" + param.getDeptName() + "地市 电能质量技术监督" + alarmType + "警单.docx";
+        //前端下载有问题将【】改成()
+        String fileName = "电能(" + alarmType + ")" + param.getYear() + "年" + param.getNumber() + "号-" + param.getDeptName() + "地市 电能质量技术监督" + alarmType + "警单.docx";
        //获取无数据监测点集合
        List<ReportLineInfoVo> list1 = getReportLineInfo(true, param.getIdList(), null, param.getSearchBeginTime(), param.getSearchEndTime(), param.getDeptId(), allLineWarnings);
        //获取谐波电压超标监测点集合
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
@@ -173,6 +173,8 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,

    }

+
+
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void addFeedback(WarningLeafletParam.WarningLeafletUpdateParam warningLeafletUpdateParam) {
--- a/pqs.ipr
+++ b/pqs.ipr
--- a/pqs.iws
+++ b/pqs.iws
@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
  <component name="ChangeListManager">
-    <list default="true" id="2448d918-1a26-4571-be80-21a8dfa375ac" name="Default" comment="EventTemplate控制器编写">
-      <change beforePath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/enums/EventResponseEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/enums/EventResponseEnum.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventDictParam.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventDictParam.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventTemplate.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventTemplate.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pqs.iws" beforeDir="false" afterPath="$PROJECT_DIR$/pqs.iws" afterDir="false" />
-    </list>
-    <list id="8dc99cd4-ae87-448e-8b91-038fd7ebf613" name="no commit" comment="no commit">
+    <list default="true" id="2448d918-1a26-4571-be80-21a8dfa375ac" name="Default" comment="海南bug修改提交">
      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/BpmApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/BpmApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/job/DeviceComflagTasks.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/job/ScheduledTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/job/ScheduledTasks.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/TerminalServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/TerminalServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/pqs.ipr" beforeDir="false" afterPath="$PROJECT_DIR$/pqs.ipr" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/pqs.iws" beforeDir="false" afterPath="$PROJECT_DIR$/pqs.iws" afterDir="false" />
    </list>
+    <list id="8dc99cd4-ae87-448e-8b91-038fd7ebf613" name="no commit" comment="no commit" />
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
+  <component name="ChangesViewManager">
+    <option name="groupingKeys">
+      <option value="directory" />
+      <option value="module" />
+    </option>
+  </component>
  <component name="Commander">
    <leftPanel view="Project" />
    <rightPanel view="Project" />
@@ -254,28 +258,6 @@
    <detection-done>true</detection-done>
    <sorting>DEFINITION_ORDER</sorting>
  </component>
-  <component name="LineStatusTrackerManager">
-    <file path="$PROJECT_DIR$/pqs.iws">
-      <ranges>
-        <range start1="2" end1="2" start2="2" end2="5" changelist="8dc99cd4-ae87-448e-8b91-038fd7ebf613" />
-        <range start1="4" end1="15" start2="7" end2="9" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="16" end1="17" start2="10" end2="12" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="20" end1="21" start2="15" end2="16" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="268" end1="332" start2="263" end2="278" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="550" end1="551" start2="496" end2="497" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="568" end1="579" start2="514" end2="514" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="622" end1="622" start2="557" end2="559" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="636" end1="636" start2="573" end2="577" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="659" end1="659" start2="600" end2="604" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="793" end1="794" start2="738" end2="742" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="809" end1="810" start2="757" end2="807" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="867" end1="871" start2="864" end2="865" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="873" end1="873" start2="867" end2="868" changelist="2448d918-1a26-4571-be80-21a8dfa375ac" />
-        <range start1="928" end1="933" start2="923" end2="926" changelist="8dc99cd4-ae87-448e-8b91-038fd7ebf613" />
-        <range start1="937" end1="937" start2="930" end2="933" changelist="8dc99cd4-ae87-448e-8b91-038fd7ebf613" />
-      </ranges>
-    </file>
-  </component>
  <component name="LvcsProjectConfiguration">
    <option name="ADD_LABEL_ON_PROJECT_OPEN" value="true" />
    <option name="ADD_LABEL_ON_PROJECT_COMPILATION" value="true" />
@@ -286,12 +268,15 @@
    <option name="ADD_LABEL_ON_UNIT_TEST_PASSED" value="true" />
    <option name="ADD_LABEL_ON_UNIT_TEST_FAILED" value="true" />
  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
  <component name="MavenImportPreferences">
    <option name="generalSettings">
      <MavenGeneralSettings>
-        <option name="localRepository" value="D:\AJava\Maven\apache-maven-3.8.6\mvn_repo" />
-        <option name="mavenHome" value="$PROJECT_DIR$/../../../AJava/Maven/apache-maven-3.8.6" />
-        <option name="userSettingsFile" value="D:\AJava\Maven\apache-maven-3.8.6\conf\settings.xml" />
+        <option name="localRepository" value="D:\maven3.6.3\repository" />
+        <option name="mavenHome" value="Use Maven wrapper" />
+        <option name="userSettingsFile" value="D:\java\apache-maven-3.3.9\conf\settings.xml" />
      </MavenGeneralSettings>
    </option>
  </component>
@@ -438,32 +423,16 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
-  <component name="PropertiesComponent">
-    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="RequestMappingsPanelOrder0" value="0" />
-    <property name="RequestMappingsPanelOrder1" value="1" />
-    <property name="RequestMappingsPanelOrder2" value="2" />
-    <property name="RequestMappingsPanelWidth0" value="75" />
-    <property name="RequestMappingsPanelWidth1" value="75" />
-    <property name="RequestMappingsPanelWidth2" value="75" />
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/TransientServiceImpl.java" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="restartRequiresConfirmation" value="false" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;
+  }
+}</component>
  <component name="ReactorSettings">
    <option name="notificationShown" value="true" />
  </component>
@@ -487,11 +456,13 @@
  <component name="RunDashboard">
    <option name="configurationTypes">
      <set>
+        <option value="Application" />
+        <option value="JarApplication" />
        <option value="SpringBootApplicationConfigurationType" />
      </set>
    </option>
  </component>
-  <component name="RunManager" selected="Spring Boot.SystemBootMain">
+  <component name="RunManager" selected="Application.HarmonicBootApplication">
    <configuration default="true" type="Applet" factoryName="Applet">
      <module />
      <option name="HTML_USED" value="false" />
@@ -499,15 +470,92 @@
      <option name="HEIGHT" value="300" />
      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
    </configuration>
-    <configuration name="DataTest" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="DataTest" />
-      <module name="common-influxDB" />
+    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="DeviceBootApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.njcn.DeviceBootApplication" />
+      <module name="device-boot" />
      <shortenClasspath name="MANIFEST" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.njcn.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="EventBootApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.njcn.event.EventBootApplication" />
+      <module name="event-boot" />
+      <shortenClasspath name="MANIFEST" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.njcn.event.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="GatewayMain" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.njcn.gateway.GatewayMain" />
+      <module name="pqs-gateway" />
+      <shortenClasspath name="MANIFEST" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.njcn.gateway.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="HarmonicBootApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.njcn.harmonic.HarmonicBootApplication" />
+      <module name="harmonic-boot" />
+      <shortenClasspath name="MANIFEST" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.njcn.harmonic.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="SupervisionBootMain" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.njcn.supervision.SupervisionBootMain" />
+      <module name="supervision-boot" />
+      <shortenClasspath name="MANIFEST" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.njcn.supervision.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration default="true" type="Application" factoryName="Application">
+      <shortenClasspath name="MANIFEST" />
      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
      <method v="2">
        <option name="Make" enabled="true" />
@@ -623,32 +671,20 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
-    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SHORTEN_COMMAND_LINE" value="NONE" />
-      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
-      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
    <list>
-      <item itemvalue="Application.DataTest" />
-      <item itemvalue="Spring Boot.DeviceBootApplication" />
-      <item itemvalue="Spring Boot.SystemBootMain" />
-      <item itemvalue="Spring Boot.HarmonicBootApplication" />
-      <item itemvalue="Spring Boot.AuthApplication" />
-      <item itemvalue="Spring Boot.JobAdminApplication" />
-      <item itemvalue="Spring Boot.EventBootApplication" />
-      <item itemvalue="Spring Boot.EnergyBootApplication" />
-      <item itemvalue="Spring Boot.QualityBootApplication" />
-      <item itemvalue="Spring Boot.UserBootApplication" />
-      <item itemvalue="Spring Boot.JobExecutorApplication" />
-      <item itemvalue="Spring Boot.GatewayMain" />
+      <item itemvalue="Application.GatewayMain" />
+      <item itemvalue="Application.SupervisionBootMain" />
+      <item itemvalue="Application.HarmonicBootApplication" />
+      <item itemvalue="Application.EventBootApplication" />
+      <item itemvalue="Application.DeviceBootApplication" />
    </list>
    <recent_temporary>
      <list>
-        <item itemvalue="Application.DataTest" />
+        <item itemvalue="Application.HarmonicBootApplication" />
+        <item itemvalue="Application.EventBootApplication" />
+        <item itemvalue="Application.SupervisionBootMain" />
+        <item itemvalue="Application.DeviceBootApplication" />
+        <item itemvalue="Application.GatewayMain" />
      </list>
    </recent_temporary>
  </component>
@@ -801,7 +837,42 @@
      <option name="project" value="LOCAL" />
      <updated>1664284251724</updated>
    </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="添加海量数据库驱动">
+      <created>1764050271282</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1764050271282</updated>
+    </task>
+    <task id="LOCAL-00011" summary="添加注释">
+      <created>1765873374234</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1765873374234</updated>
+    </task>
+    <task id="LOCAL-00012" summary="海南bug修改提交">
+      <created>1766461219349</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1766461219349</updated>
+    </task>
+    <task id="LOCAL-00013" summary="海南bug修改提交">
+      <created>1766989590709</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1766989590709</updated>
+    </task>
+    <task id="LOCAL-00014" summary="海南bug修改提交">
+      <created>1766993391650</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1766993391650</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
    <servers />
  </component>
  <component name="TimeTrackingManager">
@@ -861,10 +932,90 @@
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="3" />
  </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ID_ORDER">
+      <list>
+        <option value="Default.Root" />
+        <option value="Default.Author" />
+        <option value="Default.Date" />
+        <option value="Default.Subject" />
+        <option value="Space.CommitStatus" />
+      </list>
+    </option>
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="OPEN_GENERIC_TABS">
+      <map>
+        <entry key="1dd2665e-6e1e-474f-8693-738d46c6010c" value="TOOL_WINDOW" />
+      </map>
+    </option>
+    <option name="TAB_STATES">
+      <map>
+        <entry key="1dd2665e-6e1e-474f-8693-738d46c6010c">
+          <value>
+            <State>
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="HEAD" />
+                      </list>
+                    </value>
+                  </entry>
+                  <entry key="structure">
+                    <value>
+                      <list>
+                        <option value="dir:D:/cannengyun/vastbase-version/pqs-vastbase/pqs-system" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
+            </State>
+          </value>
+        </entry>
+        <entry key="5de75105-e341-4e7d-8c8a-a17350de871f">
+          <value>
+            <State>
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="HEAD" />
+                      </list>
+                    </value>
+                  </entry>
+                  <entry key="structure">
+                    <value>
+                      <list>
+                        <option value="dir:D:/cannengyun/vastbase-version/pqs-vastbase/pqs-common" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
+            </State>
+          </value>
+        </entry>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
  <component name="VcsManagerConfiguration">
    <MESSAGE value="装置在线率调度任务" />
    <MESSAGE value="EventTemplate控制器编写" />
-    <option name="LAST_COMMIT_MESSAGE" value="EventTemplate控制器编写" />
+    <MESSAGE value="添加海量数据库驱动" />
+    <MESSAGE value="添加注释" />
+    <MESSAGE value="海南bug修改提交" />
+    <option name="LAST_COMMIT_MESSAGE" value="海南bug修改提交" />
  </component>
  <component name="VssConfiguration">
    <CheckoutOptions>
@@ -920,9 +1071,74 @@
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
-      <option name="time" value="1" />
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/pqs-auth/src/main/java/com/njcn/auth/config/AuthorizationServerConfig.java</url>
+          <line>161</line>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/EventRelevantAnalysisController.java</url>
+          <line>85</line>
+          <option name="timeStamp" value="3" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java</url>
+          <line>1755</line>
+          <option name="timeStamp" value="4" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmProcessInstanceController.java</url>
+          <line>201</line>
+          <option name="timeStamp" value="5" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java</url>
+          <line>193</line>
+          <option name="timeStamp" value="7" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java</url>
+          <line>203</line>
+          <option name="timeStamp" value="8" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/strategy/BpmTaskCandidateInvoker.java</url>
+          <line>105</line>
+          <option name="timeStamp" value="10" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/strategy/BpmTaskCandidateRoleStrategy.java</url>
+          <line>36</line>
+          <option name="timeStamp" value="11" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/strategy/BpmTaskCandidateInvoker.java</url>
+          <line>75</line>
+          <option name="timeStamp" value="12" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java</url>
+          <line>323</line>
+          <option name="timeStamp" value="14" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java</url>
+          <line>342</line>
+          <option name="timeStamp" value="15" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/IntegrityController.java</url>
+          <line>59</line>
+          <option name="timeStamp" value="16" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java</url>
+          <line>166</line>
+          <option name="timeStamp" value="17" />
+        </line-breakpoint>
+      </breakpoints>
    </breakpoint-manager>
-    <watches-manager />
  </component>
  <component name="antWorkspaceConfiguration">
    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />