变更

CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java

@@ -48,8 +48,8 @@ public class WebSocketController {
         String command = resultMap.get("command").toString();
         if (command.equals("open")) {
             portInfoSocketAsyncService.putIsOpen(socketId + resultMap.get("staNoPortNo").toString(), true);
-            portInfoSocketAsyncService.getComStr(resultMap.get("staNoPortNo").toString(),Integer.parseInt(resultMap.get("id").toString()), session);
-            portInfoSocketAsyncService.getImgBase64AndCarInfo(resultMap.get("staNoPortNo").toString(),Integer.parseInt(resultMap.get("id").toString()), session);
+            portInfoSocketAsyncService.getComStr(resultMap.get("staNoPortNo").toString(), session);
+            portInfoSocketAsyncService.getImgBase64AndCarInfo(resultMap.get("staNoPortNo").toString(), session);
         } else if (command.equals("close")) {
             portInfoSocketAsyncService.removeIsOpen(socketId + resultMap.get("staNoPortNo").toString());
         } else if (command.equals("Untitled")) {

CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.java

@@ -33,4 +33,5 @@ public interface CarLineMapper {
 
     List<Map<String, Object>> getStaNameByManNo(@Param("manNo")String manNo);
 
+    List<String> getStaByManNoAdmin();
 }

CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.xml

@@ -7,7 +7,7 @@
         SELECT a.*
         FROM NAME_TABLE_DCOM a INNER JOIN
         <if test="manNo !=null and manNo==0">
-           (select * from MONITORSTA_TABLE)
+           (select * from IP_PORT_TYPE_TEXT WHERE TEXT ='集中监控车道日志')
         </if>
         <if test="manNo !=null and manNo!=0">
             (select
@@ -56,11 +56,10 @@
     <select id="getAllStaList" resultType="java.util.Map">
         SELECT b.*,c.PORTNO
         FROM NAME_TABLE_DCOM a
-                 INNER JOIN IP_PORT_TYPE_TEXT b on a.STANO=b.STANO
+                 INNER JOIN (SELECT * from IP_PORT_TYPE_TEXT WHERE TEXT ='集中监控车道日志') b on a.STANO=b.STANO
                  LEFT JOIN SETUP_TABLE c on c.STANO=a.STANO
         WHERE a.USERTYPE = 1
           AND (a.SUBCOMNO = ${STANO} OR a.STANO = ${STANO})
-          AND b.TEXT='集中监控车道日志'
         ORDER BY c.PORTNO
     </select>
     <select id="getOnlySta" resultType="java.util.Map">
@@ -68,11 +67,10 @@
             b.*
         FROM
             NAME_TABLE_DCOM a
-                INNER JOIN IP_PORT_TYPE_TEXT b ON a.STANO= b.STANO
+                INNER JOIN (SELECT * from IP_PORT_TYPE_TEXT WHERE TEXT ='集中监控车道日志') b ON a.STANO= b.STANO
         WHERE
             a.USERTYPE = 1
           AND (a.SUBCOMNO = ${STANO} OR a.STANO = ${STANO})
-          AND b.TEXT= '集中监控车道日志'
         ORDER BY
             a.STANO
     </select>
@@ -96,12 +94,13 @@
          <if test="manNo !=null and manNo!=0">
             WHERE MANNO=${manNo}
          </if>
+        GROUP BY STANO
     </select>
     <select id="getStaNameByManNo" resultType="java.util.Map">
         SELECT a.STANO,b.STANAME
         FROM
         <if test="manNo ==null or manNo==0">
-            (SELECT * from MONITORSTA_TABLE)
+            (SELECT * from IP_PORT_TYPE_TEXT WHERE TEXT ='集中监控车道日志')
         </if>
         <if test="manNo ==null or manNo!=0">
             (select
@@ -117,4 +116,7 @@
             WHERE a.MANNO=${manNo}
         </if>
     </select>
+    <select id="getStaByManNoAdmin" resultType="java.lang.String">
+        SELECT STANO from IP_PORT_TYPE_TEXT WHERE TEXT ='集中监控车道日志'
+    </select>
 </mapper>

CentralizedMonitoring/src/main/java/com/nmgs/service/PortInfoSocketAsyncService.java

@@ -31,10 +31,11 @@ public class PortInfoSocketAsyncService {
     CarLineMapper carLineMapper;
 
     @Async("CentralizedMonitoringThreadPool")
-    public void getComStr(String staNoPortNo,int id, Session session) {
+    public void getComStr(String staNoPortNo,  Session session) {
         String socketId = WebsocketUtil.getParam(WebsocketUtil.sessionKey, session);
         HikariDataSource sqliteSource = JDBCUtil.getSqliteSource(staNoPortNo);
         List<Map<String, String>> logsList = getComByStaNoPortNo(staNoPortNo, 0, sqliteSource);
+        int id=0;
         if (logsList != null && logsList.size() > 0) {
             id = Integer.parseInt(logsList.get(logsList.size() - 1).get("id"));
             WebsocketUtil.sendMessage(session, getSocketResult(staNoPortNo, "ComStrList", JSONArray.toJSONString(logsList)));
@@ -73,14 +74,14 @@ public class PortInfoSocketAsyncService {
     }
 
     @Async("CentralizedMonitoringThreadPool")
-    public void getImgBase64AndCarInfo(String staNoPortNo,int id, Session session) {
+    public void getImgBase64AndCarInfo(String staNoPortNo,Session session) {
         String socketId = WebsocketUtil.getParam(WebsocketUtil.sessionKey, session);
         HikariDataSource sqliteSource = JDBCUtil.getSqliteSource(staNoPortNo);
 
         String carInfo = portInfo.getCarInfo(staNoPortNo);
         carInfo = carInfo == null ? "" : carInfo;
         WebsocketUtil.sendMessage(session, getSocketResult(staNoPortNo, "CarInfo", carInfo));
-
+        int id=0;
         List<Map<String, String>> imgsList = getImgByStaNoPortNo(staNoPortNo, 0, sqliteSource);
         if (imgsList != null && imgsList.size() > 0) {
             id = Integer.parseInt(imgsList.get(imgsList.size() - 1).get("id"));
@@ -149,20 +150,20 @@ public class PortInfoSocketAsyncService {
     }
 
     private void reloadUntitledMap(String manNo) {
-        if (staList == null || staList.size() == 0) {
+        if(manNo.equals("0")){
+            staList = carLineMapper.getStaByManNoAdmin();
+        }else{
             staList = carLineMapper.getStaByManNo(manNo);
-            if (dbMap == null || dbMap.size() == 0) {
-                for (String sta : staList) {
-                    HikariDataSource sqliteSource = null;
-                    try {
-                        sqliteSource = JDBCUtil.getSqliteSource(sta + "Untitled");
-                    } catch (Exception e) {
-                        logger.info("获取sqlite链接失败 " + sta + "Untitled");
-                        logger.info(ExceptionUtil.getExceptionStr(e));
-                    }
-                    dbMap.put(sta, sqliteSource);
-                }
+        }
+        for (String sta : staList) {
+            HikariDataSource sqliteSource = null;
+            try {
+                sqliteSource = JDBCUtil.getSqliteSource(sta + "Untitled");
+            } catch (Exception e) {
+                logger.info("获取sqlite链接失败 " + sta + "Untitled");
+                logger.info(ExceptionUtil.getExceptionStr(e));
             }
+            dbMap.put(sta, sqliteSource);
         }
     }
 

CentralizedMonitoring/src/main/java/com/nmgs/service/ScheduleService.java

@@ -39,22 +39,25 @@ public class ScheduleService implements SchedulingConfigurer {
 
         //动态使用毫秒数设置循环间隔
         taskRegistrar.addTriggerTask(() -> {
-            if (isFirst || (PropertiesUtil.getValue("isReloadText").equals("1") && !isFirst)) {
-                try {
-                    new PropertiesUtil().set("isReloadText", "0");
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
+            String runTask=PropertiesUtil.getValue("runTask");
+            if(runTask==null||runTask.equals("1")||runTask.equals("")){
+                if (isFirst || (PropertiesUtil.getValue("isReloadText").equals("1") && !isFirst)) {
+                    try {
+                        new PropertiesUtil().set("isReloadText", "0");
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                    loadTextMap();
                 }
-                loadTextMap();
-            }
-            if (isFirst || (PropertiesUtil.getValue("isReloadPortTask").equals("1") && !isFirst)) {
-                try {
-                    new PropertiesUtil().set("isReloadPortTask", "0");
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
+                if (isFirst || (PropertiesUtil.getValue("isReloadPortTask").equals("1") && !isFirst)) {
+                    try {
+                        new PropertiesUtil().set("isReloadPortTask", "0");
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                    reStartRequestPortLogs();
+                    isFirst = false;
                 }
-                reStartRequestPortLogs();
-                isFirst = false;
             }
         }, triggerContext -> {
             PeriodicTrigger periodicTrigger = new PeriodicTrigger(time);

CentralizedMonitoring/src/main/java/com/nmgs/util/Main.java

@@ -14,8 +14,9 @@ public class Main {
 //        String str="20231117093727";
 //        String date=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.dateTime(DateUtils.YYYYMMDDHHMMSS,str));
 //        System.out.println(date);
-//        int staList = HTTPUtil.sendRequestGet("http://10.15.57.3:6000/get_portstat?portno="+51, Integer.class);
-        Object stat = HTTPUtil.sendRequestGet("http://10.15.57.141:6000/GetData2?portno=" + 21 + "&watchno=2", Object.class);
+        Object stat = HTTPUtil.sendRequestGet("http://10.15.57.3:6000/get_portstat?portno="+51, Object.class);
+//        Object stat = HTTPUtil.sendRequestGet("http://10.15.57.141:6000/GetData2?portno=" + 21 + "&watchno=2", Object.class);
+//        Object stat = HTTPUtil.sendRequestGet("http://10.15.57.141:6000/get_listall2?watchno=" + 2, Object.class);
         System.out.println(stat);
 //        String url = "http://10.15.136.194:6000/get_listall2?watchno=2";
 //        String url = "http://192.168.101.66:1234/get_listall2?watchno=2";
@@ -29,6 +30,6 @@ public class Main {
 
     //1F0C22332CEF190B53
     public static void aaa(Map<String, Integer> map) {
-        map.put("a",2);
+        map.put("a", 2);
     }
 }

CentralizedMonitoringView/.idea/workspace.xml

@@ -2,14 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="3f61f33b-1398-438f-b18e-516860fc6663" name="更改" comment="">
-      <change afterPath="$PROJECT_DIR$/CentralizedMonitoring/assets/index.edf3ac11.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../NMGJTManager/target/NMGJTManager/META-INF/MANIFEST.MF" 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/util/WebsocketUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/WebsocketUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/assets/index.9f29a44c.js" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/assets/index.edf3ac11.js" 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.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.java" 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$/../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/java/com/nmgs/service/ScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ScheduleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/assets/index.38f67042.css" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/static/View/assets/index.edf3ac11.js" beforeDir="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.9f29a44c.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -104,7 +106,10 @@
       <workItem from="1701315283584" duration="282000" />
       <workItem from="1701324458686" duration="602000" />
       <workItem from="1701330062757" duration="1163000" />
-      <workItem from="1701332001805" duration="599000" />
+      <workItem from="1701332001805" duration="3137000" />
+      <workItem from="1701391080614" duration="159000" />
+      <workItem from="1701391437003" duration="9000" />
+      <workItem from="1701393376051" duration="70000" />
     </task>
     <task id="LOCAL-00001" summary="变更">
       <created>1699319109952</created>

CentralizedMonitoringView/src/views/CarLine/components/PortInfo.vue

@@ -146,9 +146,9 @@ export default {
       }
       this.portInfoMapIterator = this.portInfoMap.values()
       if (isLoad) {
-        this.onSend(staNoPortNo, 'open',0)
+        this.onSend(staNoPortNo, 'open')
       } else {
-        this.onSend(staNoPortNo, 'close',0)
+        this.onSend(staNoPortNo, 'close')
       }
       this.$emit('closeTreeLoading')
     },
@@ -243,8 +243,8 @@ export default {
       };
     },
     //特殊处理
-    onSend(staNoPortNo, data,id) {
-      let _bar = {"staNoPortNo": staNoPortNo, "command": data,"id":id}
+    onSend(staNoPortNo, data) {
+      let _bar = {"staNoPortNo": staNoPortNo, "command": data}
       this.socket.send(JSON.stringify(_bar));
     },
     startAutoLoad(staNoPortNo) {

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 MONITORSTA_TABLE
+        select a.STANO,b.STANAME from IP_PORT_TYPE_TEXT a INNER JOIN NAME_TABLE_DCOM b on a.STANO=b.STANO WHERE TEXT ='集中监控车道日志'
     </select>
     <select id="getUserStan" resultType="java.lang.String">
         SELECT

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 MONITORSTA_TABLE
+        select a.STANO,b.STANAME from IP_PORT_TYPE_TEXT a INNER JOIN NAME_TABLE_DCOM b on a.STANO=b.STANO WHERE TEXT ='集中监控车道日志'
     </select>
     <select id="getUserStan" resultType="java.lang.String">
         SELECT

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 MONITORSTA_TABLE
+        select a.STANO,b.STANAME from IP_PORT_TYPE_TEXT a INNER JOIN NAME_TABLE_DCOM b on a.STANO=b.STANO WHERE TEXT ='集中监控车道日志'
     </select>
     <select id="getUserStan" resultType="java.lang.String">
         SELECT