NM-gaoshuguang
/
CentralizedMonitoring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

变更

Browse Source
main
han-l 2 years ago
parent 64cfb279fc
commit 8a5d055194
3 changed files with 3 additions and 187 deletions
Show Stats Download Patch File Download Diff File

32
CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java
Unescape Escape View File

@ -1,15 +1,9 @@
package com.nmgs.controller;
import com.nmgs.service.PortInfoSocketAsyncService;
import com.nmgs.util.SpringUtil;
import com.nmgs.util.WebsocketUtil;
import com.sun.javafx.fxml.BeanAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import javax.websocket.*;
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
@ -18,14 +12,7 @@ import java.util.Map;
@ServerEndpoint(value = "/WebSocket")
@Component
public class WebSocketController {
private static final Logger log = LoggerFactory.getLogger(WebSocketController.class);
public static PortInfoSocketAsyncService portInfoSocketAsyncService;
/**
* 连接事件，加入注解
*
* @param session
*/
@OnOpen
public void onOpen(Session session) {
String socketId = WebsocketUtil.getParam(WebsocketUtil.sessionKey, session);
@ -33,27 +20,14 @@ public class WebSocketController {
WebsocketUtil.addSession(socketId, session);
WebsocketUtil.sendMessage(socketId, portInfoSocketAsyncService.getSocketResult("staNoPortNo", "socketLine", "连接成功"));
}
/**
* 连接事件，加入注解
* 用户断开链接
*
* @param session
*/
@OnClose
public void onClose(Session session) {
String socketId = WebsocketUtil.getParam(WebsocketUtil.sessionKey, session);
// 删除映射关系
log.info("WebSocket删除链接", socketId);
portInfoSocketAsyncService.isOpen.clear();
WebsocketUtil.removeSession(socketId);
}
/**
* 当接收到用户上传的消息
*
* @param session
*/
@OnMessage
public void onMessage(Session session, String message) {
String socketId = WebsocketUtil.getParam(WebsocketUtil.sessionKey, session);
@ -70,12 +44,6 @@ public class WebSocketController {
}
}
/**
* 处理用户活连接异常
*
* @param session
* @param throwable
*/
@OnError
public void onError(Session session, Throwable throwable) {
try {

2
CentralizedMonitoring/src/main/java/com/nmgs/service/PortInfoSocketAsyncService.java
Unescape Escape View File

@ -16,7 +16,7 @@ import java.util.Map;
@Service
public class PortInfoSocketAsyncService {
public static Map<String, Boolean> isOpen =new HashMap<>();
public Map<String, Boolean> isOpen =new HashMap<>();
@Async
public void getComStr(String staNoPortNo, Session session) {

156
CentralizedMonitoringView/.idea/workspace.xml
Unescape Escape View File

@ -2,159 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="3f61f33b-1398-438f-b18e-516860fc6663" name="更改" comment="变更">
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/artifacts/CentralizedMonitoring_war_exploded.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/META-INF/MANIFEST.MF" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/META-INF/spring.factories" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/CentralizedMonitoringApplication.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/MyEnvironmentPostProcessor.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/Constant.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/CorsConfig.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/ErrorConfig.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/FilterConfig.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/MybatisConfig.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/RedisSessionConfig.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/ThreadPoolConfig.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/controller/CarLineController.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/controller/WebSocketController.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/entity/GisStaSysInfo.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/mapper/CarLineMapper.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/mapper/CarLineMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/service/PortInfoSocketAsyncService.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/CRCUtil.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/DESUtil.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/DateTimeUtil.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/DateUtils.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/Main.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/PathUtil.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/PlateRegexUtil.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/PropertiesUtil.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/SpringUtil.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/TokenUtil.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/UuidUtil.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/WebsocketUtil.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/logback-spring.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/static/application.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/DmJdbcDriver18-1.8.0.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/EndPassJava-1.0.0.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/HikariCP-4.0.3.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/android-json-0.0.20131108.vaadin1.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/axis-1.4.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/axis-jaxrpc-1.4.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/axis-saaj-1.4.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/commons-discovery-0.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/commons-lang-2.6.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/commons-lang3-3.12.0.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-core-3.4.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-bindings-soap-3.4.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-bindings-xml-3.4.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-databinding-jaxb-3.4.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-frontend-jaxws-3.4.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-frontend-simple-3.4.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-transports-http-3.4.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-ws-addr-3.4.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-ws-policy-3.4.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-wsdl-3.4.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/dom4j-1.6.1.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/fastjson-2.0.32.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/fastjson2-2.0.32.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/fastjson2-extension-2.0.32.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/istack-commons-runtime-3.0.12.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jackson-annotations-2.13.5.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jackson-core-2.13.5.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jackson-databind-2.13.5.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jackson-datatype-jdk8-2.13.5.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jackson-datatype-jsr310-2.13.5.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jackson-module-parameter-names-2.13.5.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jakarta.activation-1.2.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jakarta.activation-api-1.2.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jakarta.annotation-api-1.3.5.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jakarta.xml.bind-api-2.3.3.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/java-jwt-4.3.0.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jaxb-runtime-2.3.8.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/joda-time-2.10.13.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jsqlparser-4.4.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jul-to-slf4j-1.7.36.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/log4j-api-2.17.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/log4j-to-slf4j-2.17.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/logback-classic-1.2.12.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/logback-core-1.2.12.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/lombok-1.18.28.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-3.5.10.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-plus-3.5.3.1.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-plus-annotation-3.5.3.1.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-plus-boot-starter-3.5.3.1.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-plus-core-3.5.3.1.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-plus-extension-3.5.3.1.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-spring-2.0.7.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatisplus-plus-1.7.3-RELEASE.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mysql-connector-j-8.0.33.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/neethi-3.1.1.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/ojdbc8-21.5.0.0.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/orai18n-21.9.0.0.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/slf4j-api-1.7.36.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/snakeyaml-1.30.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-aop-5.3.29.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-beans-5.3.29.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-2.7.15.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-autoconfigure-2.7.15.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-starter-2.7.15.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-starter-jdbc-2.7.15.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-starter-json-2.7.15.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-starter-logging-2.7.15.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-starter-web-2.7.15.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-context-5.3.29.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-context-support-5.3.29.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-core-5.3.29.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-data-commons-2.7.15.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-data-keyvalue-2.7.15.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-data-redis-2.7.15.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-expression-5.3.29.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-jcl-5.3.29.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-jdbc-5.3.29.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-oxm-5.3.29.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-session-core-2.7.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-session-data-redis-2.7.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-session-jdbc-2.7.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-tx-5.3.29.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-web-5.3.29.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-webmvc-5.3.29.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/sqljdbc4-3.0.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/stax2-api-4.2.1.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/tomcat-annotations-api-9.0.79.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/tomcat-embed-websocket-9.0.80.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/txw2-2.3.8.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/woodstox-core-6.2.3.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/wsdl4j-1.6.3.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/xml-apis-1.0.b2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/xml-resolver-1.2.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/xmlschema-core-2.2.5.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/controller/CarLineController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/entity/GisStaSysInfo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/mapper/CarLineMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/PortInfoSocketAsyncService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/SpringUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/WebsocketUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/CentralizedMonitoring/assets/index.1558ddec.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/CentralizedMonitoring/assets/index.df0944b4.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/CentralizedMonitoring/assets/车道图片.632ad228.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/CentralizedMonitoring/index.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/CentralizedMonitoring/resource/img/车道图片.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/resource/img/车道图片.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/resource/img/车道图片2.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/CarLine/CarLine.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/CarLine/components/PortInfo.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/CarLine/components/TreeData.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/FilterConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/FilterConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/util/api/api.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/api/api.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/util/axios/axios.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/axios/axios.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/util/router/router.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/router/router.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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -221,7 +69,7 @@
<option name="presentableId" value="Default" />
<updated>1699318463001</updated>
<workItem from="1699318464254" duration="17281000" />
<workItem from="1699403821274" duration="5178000" />
<workItem from="1699403821274" duration="5269000" />
</task>
<task id="LOCAL-00001" summary="变更">
<created>1699319109952</created>

Write Preview
Loading…
Cancel
Save