From 0a83177566033ec84590f3a76101598087e69f10 Mon Sep 17 00:00:00 2001
From: han-l <1025185070@qq.com>
Date: Thu, 30 Nov 2023 11:30:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nmgs/controller/WebSocketController.java  |  1 +
 .../java/com/nmgs/mapper/CarLineMapper.xml    | 54 +++++++++----------
 CentralizedMonitoringView/.idea/workspace.xml | 26 +++++----
 .../main/java/com/nmgs/mapper/OrgMapper.xml   |  2 +-
 .../target/NMGJTManager/META-INF/MANIFEST.MF  |  9 ----
 .../classes/com/nmgs/mapper/OrgMapper.xml     |  2 +-
 .../classes/com/nmgs/mapper/OrgMapper.xml     |  2 +-
 7 files changed, 44 insertions(+), 52 deletions(-)
 delete mode 100644 NMGJTManager/target/NMGJTManager/META-INF/MANIFEST.MF

diff --git a/CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java b/CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java
index 396320d..149e808 100644
--- a/CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java
+++ b/CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java
@@ -61,6 +61,7 @@ public class WebSocketController {
     @OnError
     public void onError(Session session, Throwable throwable) {
         portInfoSocketAsyncService.clearIsOpen();
+        portInfoSocketAsyncService.closeUntitled();
         try {
             if (session.isOpen()) {
                 session.close();
diff --git a/CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.xml b/CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.xml
index 3ae2f13..c3ea38a 100644
--- a/CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.xml
+++ b/CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.xml
@@ -6,23 +6,19 @@
     <select id="selectStaList" resultType="java.util.Map">
         SELECT a.*
         FROM NAME_TABLE_DCOM a INNER JOIN
+        <if test="manNo !=null and manNo==0">
+           (select * from MONITORSTA_TABLE)
+        </if>
+        <if test="manNo !=null and manNo!=0">
             (select
-                 <if test="manNo !=null and manNo!=0">
-                   *
-                </if>
-                <if test="manNo ==null or manNo==0">
-                    STANO
-                </if>
-             from USER_STA_TABLE
-                      <where>
-                          <if test="manNo !=null and manNo!=0">
-                               MANNO=${manNo}
-                          </if>
-                      </where>
-                      <if test="manNo ==null or manNo==0">
-                          GROUP BY STANO
-                      </if>
-            ) b on a.STANO=b.STANO
+                *
+            from USER_STA_TABLE
+            <where>
+                MANNO=${manNo}
+            </where>
+            )
+        </if>
+        b on a.STANO=b.STANO
         WHERE a.USERTYPE = 1
           AND (a.SUBCOMNO = ${STANO} OR a.STANO = ${STANO})
     </select>
@@ -102,23 +98,21 @@
          </if>
     </select>
     <select id="getStaNameByManNo" resultType="java.util.Map">
-        SELECT a.STANO,b.STANAME FROM (select
-        <if test="manNo !=null and manNo!=0">
-            *
-        </if>
+        SELECT a.STANO,b.STANAME
+        FROM
         <if test="manNo ==null or manNo==0">
-            STANO
+            (SELECT * from MONITORSTA_TABLE)
         </if>
-        from USER_STA_TABLE
-        <where>
-            <if test="manNo !=null and manNo!=0">
-                MANNO=${manNo}
-            </if>
-        </where>
-        <if test="manNo ==null or manNo==0">
-            GROUP BY STANO
+        <if test="manNo ==null or manNo!=0">
+            (select
+                *
+            from USER_STA_TABLE
+            <where>
+                    MANNO=${manNo}
+            </where>
+            )
         </if>
-        )  a INNER JOIN NAME_TABLE_DCOM b on a.STANO=b.STANO
+             a INNER JOIN NAME_TABLE_DCOM b on a.STANO=b.STANO
         <if test="manNo !=null and manNo!=0">
             WHERE a.MANNO=${manNo}
         </if>
diff --git a/CentralizedMonitoringView/.idea/workspace.xml b/CentralizedMonitoringView/.idea/workspace.xml
index 851ec4f..94e0647 100644
--- a/CentralizedMonitoringView/.idea/workspace.xml
+++ b/CentralizedMonitoringView/.idea/workspace.xml
@@ -2,16 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="3f61f33b-1398-438f-b18e-516860fc6663" name="更改" comment="">
-      <change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/assets/index.38f67042.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/assets/index.8e23a08c.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/CentralizedMonitoring/assets/index.8e23a08c.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/PortInfoSocketAsyncService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/PortInfoSocketAsyncService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CentralizedMonitoring/assets/index.975a1f81.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/CentralizedMonitoring/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/CentralizedMonitoring/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/views/CarLine/components/PortInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/CarLine/components/PortInfo.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../NMGJTManager/src/main/java/com/nmgs/mapper/OrgMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../NMGJTManager/src/main/java/com/nmgs/mapper/OrgMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../NMGJTManager/target/NMGJTManager/META-INF/MANIFEST.MF" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../NMGJTManager/target/NMGJTManager/WEB-INF/classes/com/nmgs/mapper/OrgMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../NMGJTManager/target/NMGJTManager/WEB-INF/classes/com/nmgs/mapper/OrgMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../NMGJTManager/target/classes/com/nmgs/mapper/OrgMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../NMGJTManager/target/classes/com/nmgs/mapper/OrgMapper.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -30,6 +27,7 @@
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+    <option name="WARN_ABOUT_CRLF" value="false" />
   </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
@@ -99,7 +97,8 @@
       <workItem from="1701066715379" duration="1825000" />
       <workItem from="1701218529863" duration="1213000" />
       <workItem from="1701224666672" duration="769000" />
-      <workItem from="1701306952152" duration="2398000" />
+      <workItem from="1701306952152" duration="2532000" />
+      <workItem from="1701314488909" duration="390000" />
     </task>
     <task id="LOCAL-00001" summary="变更">
       <created>1699319109952</created>
@@ -122,7 +121,14 @@
       <option name="project" value="LOCAL" />
       <updated>1700729566664</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="变更">
+      <created>1701313330372</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1701313330372</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/NMGJTManager/src/main/java/com/nmgs/mapper/OrgMapper.xml b/NMGJTManager/src/main/java/com/nmgs/mapper/OrgMapper.xml
index 3dc256e..080e415 100644
--- a/NMGJTManager/src/main/java/com/nmgs/mapper/OrgMapper.xml
+++ b/NMGJTManager/src/main/java/com/nmgs/mapper/OrgMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nmgs.mapper.OrgMapper">
     <select id="getStanTree" resultType="java.util.Map">
-        select * from NAME_TABLE_DCOM where USERTYPE=1 and SUBCOMNO=${UserStaNO}
+        select * from MONITORSTA_TABLE
     </select>
     <select id="getUserStan" resultType="java.lang.String">
         SELECT
diff --git a/NMGJTManager/target/NMGJTManager/META-INF/MANIFEST.MF b/NMGJTManager/target/NMGJTManager/META-INF/MANIFEST.MF
deleted file mode 100644
index 61fc992..0000000
--- a/NMGJTManager/target/NMGJTManager/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Created-By: IntelliJ IDEA
-Built-By: 10251
-Build-Jdk: Oracle OpenJDK version 1.8.0_181
-Implementation-Title: NMGJTManager
-Implementation-Version: 0.0.1-SNAPSHOT
-Implementation-Vendor-Id: com.nmgs
-Main-Class: ${start-class}
-
diff --git a/NMGJTManager/target/NMGJTManager/WEB-INF/classes/com/nmgs/mapper/OrgMapper.xml b/NMGJTManager/target/NMGJTManager/WEB-INF/classes/com/nmgs/mapper/OrgMapper.xml
index 3dc256e..080e415 100644
--- a/NMGJTManager/target/NMGJTManager/WEB-INF/classes/com/nmgs/mapper/OrgMapper.xml
+++ b/NMGJTManager/target/NMGJTManager/WEB-INF/classes/com/nmgs/mapper/OrgMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nmgs.mapper.OrgMapper">
     <select id="getStanTree" resultType="java.util.Map">
-        select * from NAME_TABLE_DCOM where USERTYPE=1 and SUBCOMNO=${UserStaNO}
+        select * from MONITORSTA_TABLE
     </select>
     <select id="getUserStan" resultType="java.lang.String">
         SELECT
diff --git a/NMGJTManager/target/classes/com/nmgs/mapper/OrgMapper.xml b/NMGJTManager/target/classes/com/nmgs/mapper/OrgMapper.xml
index 3dc256e..080e415 100644
--- a/NMGJTManager/target/classes/com/nmgs/mapper/OrgMapper.xml
+++ b/NMGJTManager/target/classes/com/nmgs/mapper/OrgMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nmgs.mapper.OrgMapper">
     <select id="getStanTree" resultType="java.util.Map">
-        select * from NAME_TABLE_DCOM where USERTYPE=1 and SUBCOMNO=${UserStaNO}
+        select * from MONITORSTA_TABLE
     </select>
     <select id="getUserStan" resultType="java.lang.String">
         SELECT