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 d329a44cc9
commit 0240e89f1c
4 changed files with 105 additions and 187 deletions
Show Stats Download Patch File Download Diff File

4
CentralizedMonitoring/src/main/java/com/nmgs/service/ThreadTaskService.java
Unescape Escape View File

@ -44,8 +44,8 @@ public class ThreadTaskService {
List<String> logsList = HTTPUtil.sendRequestGet("http://" + ip + ":" + port + "/GetData2?portno=" + portNo + "&watchno=2", List.class);
try {
Connection conn = JDBCUtil.getConnect(sqliteName);
PreparedStatement ps = null;
for (String str : logsList) {
PreparedStatement ps = null;
Map<String, Object> map = JSONObject.parseObject(str, HashMap.class);
List<Map<String, Object>> logsMaps = (List<Map<String, Object>>) map.get("UNITINFO");
for (Map<String, Object> logsMap : logsMaps) {
@ -122,8 +122,8 @@ public class ThreadTaskService {
portInfo.putCarInfo(sqliteName, carInfo);
}
}
closePs(ps);
}
closePs(ps);
closeConn(conn);
} catch (Exception e) {
logger.info("采集 " + ip + ":" + port + "-" + staNo + "-" + portNo);

102
CentralizedMonitoring/src/main/java/com/nmgs/util/FileUtil.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.nmgs.util;
import com.nmgs.workorder.common.MessageEnum;
import com.nmgs.workorder.common.PPException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
@ -155,4 +155,98 @@ public class FileUtil {
}
return result;
}
/**
* 删除指定文件夹下包含文件名的文件
*
* @param folderPath 指定文件夹
* @param fileNameToDelete 要删除的文件名
* @author shuguang
* @date 2023-11-14 21:10
*/
public static void delContainsFileName(String folderPath, String fileNameToDelete) {
File folder = new File(folderPath);
if (folder.isDirectory()) {
File[] files = folder.listFiles();
if (files != null) {
for (File file : files) {
if (file.getName().contains(fileNameToDelete)) {
boolean isDeleted = file.delete();
if (isDeleted) {
log.info("已删除文件：{}", file.getAbsolutePath());
} else {
log.info("无法删除文件：{}", file.getAbsolutePath());
}
}
}
}
} else {
log.info("给定的路径不是一个文件夹");
}
}
/**
* 删除
*
* @param file
*/
public static boolean delete(File file) {
boolean result = file.delete();
if (result) {
log.info("删除: {} 成功", file.getAbsolutePath());
} else {
log.warn("删除: {} 失败", file.getAbsolutePath());
}
return result;
}
public static void fileInput(HttpServletResponse response, String filename, File filePath) {
if (filePath.exists()) {
FileInputStream fis = null;
BufferedInputStream bis = null;
try {
response.setContentType("application/octet-stream;charset=utf-8");
// 在controller层中的二进制流文件下载方法下配置放行属性：
response.setHeader("Access-Control-Expose-Headers", "content-disposition");
response.setHeader("content-disposition", "attachment;filename=" + java.net.URLEncoder.encode(filename, "UTF-8"));
byte[] buffer = new byte[4096];
fis = new FileInputStream(filePath);
//增加文件的大小
response.setContentLengthLong(fis.available());
bis = new BufferedInputStream(fis);
OutputStream os = response.getOutputStream();
int i = bis.read(buffer);
while (i != -1) {
os.write(buffer, 0, i);
i = bis.read(buffer);
}
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new PPException(MessageEnum.下载文件失败.getCode(), MessageEnum.下载文件失败.getMessage());
} finally {
if (bis != null) {
try {
bis.close();
// 删除临时文件
//filePath.delete();
} catch (IOException e) {
log.info(e.getMessage(), e);
}
}
if (fis != null) {
try {
fis.close();
} catch (IOException e) {
log.error(e.getMessage(), e);
}
}
}
}
}
/**
* 判断文件是否存在
*/
public static boolean fileExists(String plainFilePath) {
File file = new File(plainFilePath);
return file.exists();
}
}

3
CentralizedMonitoring/src/main/java/com/nmgs/workorder/service/impl/WorkOrderServiceImpl.java
Unescape Escape View File

@ -177,8 +177,7 @@ public class WorkOrderServiceImpl implements WorkOrderService {
.eq("WORKORDERNO", info.getWorkorderno());
count += workInfoMapper.delete(queryWrapper);
QueryWrapper<WorkFeedBack> wrapper = new QueryWrapper<>();
wrapper
.eq("WORKORDERNO", info.getWorkorderno());
wrapper.eq("WORKORDERNO", info.getWorkorderno());
feeCount += workFeedBackMapper.delete(wrapper);
FileUtil.delContainsFileName(downloadPath, info.getWorkorderno());
QueryWrapper<Unprocessed> wrap = new QueryWrapper<>();

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

@ -2,185 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="3f61f33b-1398-438f-b18e-516860fc6663" name="更改" comment="变更">
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/javaee.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/lib.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/lib1.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/maven_wrapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/libraries/maven_wrapper1.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/entity/PortInfo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ApplicationStopImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ScheduleService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ThreadTaskService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/TimeTaskInfo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/ExceptionUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/FileUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/HTTPUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/JDBCUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/LogUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/baseSqlite/Untitled.sqlite" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/baseSqlite/sqlite.sqlite" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/resource/img/disConnect.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/resource/img/normal.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/resource/img/warning.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/CarLine/components/selectLogs.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/CarLine/test.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/artifacts/CentralizedMonitoring_war_exploded.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/artifacts/CentralizedMonitoring_war_exploded.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/META-INF/MANIFEST.MF" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/META-INF/spring.factories" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/CentralizedMonitoringApplication.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/MyEnvironmentPostProcessor.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/Constant.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/CorsConfig.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/ErrorConfig.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/FilterConfig.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/MybatisConfig.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/RedisSessionConfig.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/config/ThreadPoolConfig.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/controller/CarLineController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/controller/WebSocketController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/entity/GisStaSysInfo.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/mapper/CarLineMapper.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/mapper/CarLineMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/service/ApplicationRunnerImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/service/PortInfoSocketAsyncService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/CRCUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/DESUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/DateTimeUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/DateUtils.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/Main.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/PathUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/PlateRegexUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/PropertiesUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/SpringUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/TokenUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/UuidUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/com/nmgs/util/WebsocketUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/logback-spring.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/classes/static/application.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/DmJdbcDriver18-1.8.0.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/EndPassJava-1.0.0.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/HikariCP-4.0.3.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/android-json-0.0.20131108.vaadin1.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/axis-1.4.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/axis-jaxrpc-1.4.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/axis-saaj-1.4.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/commons-discovery-0.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/commons-lang-2.6.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/commons-lang3-3.12.0.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-core-3.4.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-bindings-soap-3.4.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-bindings-xml-3.4.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-databinding-jaxb-3.4.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-frontend-jaxws-3.4.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-frontend-simple-3.4.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-transports-http-3.4.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-ws-addr-3.4.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-ws-policy-3.4.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/cxf-rt-wsdl-3.4.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/dom4j-1.6.1.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/fastjson-2.0.32.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/fastjson2-2.0.32.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/fastjson2-extension-2.0.32.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/istack-commons-runtime-3.0.12.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jackson-annotations-2.13.5.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jackson-core-2.13.5.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jackson-databind-2.13.5.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jackson-datatype-jdk8-2.13.5.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jackson-datatype-jsr310-2.13.5.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jackson-module-parameter-names-2.13.5.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jakarta.activation-1.2.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jakarta.activation-api-1.2.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jakarta.annotation-api-1.3.5.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jakarta.xml.bind-api-2.3.3.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/java-jwt-4.3.0.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jaxb-runtime-2.3.8.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/joda-time-2.10.13.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jsqlparser-4.4.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/jul-to-slf4j-1.7.36.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/log4j-api-2.17.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/log4j-to-slf4j-2.17.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/logback-classic-1.2.12.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/logback-core-1.2.12.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/lombok-1.18.28.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-3.5.10.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-plus-3.5.3.1.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-plus-annotation-3.5.3.1.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-plus-boot-starter-3.5.3.1.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-plus-core-3.5.3.1.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-plus-extension-3.5.3.1.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatis-spring-2.0.7.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mybatisplus-plus-1.7.3-RELEASE.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/mysql-connector-j-8.0.33.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/neethi-3.1.1.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/ojdbc8-21.5.0.0.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/orai18n-21.9.0.0.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/slf4j-api-1.7.36.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/snakeyaml-1.30.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-aop-5.3.29.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-beans-5.3.29.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-2.7.15.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-autoconfigure-2.7.15.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-starter-2.7.15.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-starter-jdbc-2.7.15.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-starter-json-2.7.15.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-starter-logging-2.7.15.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-boot-starter-web-2.7.15.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-context-5.3.29.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-context-support-5.3.29.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-core-5.3.29.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-data-commons-2.7.15.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-data-keyvalue-2.7.15.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-data-redis-2.7.15.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-expression-5.3.29.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-jcl-5.3.29.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-jdbc-5.3.29.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-oxm-5.3.29.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-session-core-2.7.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-session-data-redis-2.7.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-session-jdbc-2.7.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-tx-5.3.29.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-web-5.3.29.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/spring-webmvc-5.3.29.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/sqljdbc4-3.0.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/stax2-api-4.2.1.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/tomcat-annotations-api-9.0.79.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/tomcat-embed-websocket-9.0.80.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/txw2-2.3.8.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/woodstox-core-6.2.3.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/wsdl4j-1.6.3.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/xml-apis-1.0.b2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/xml-resolver-1.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/out/artifacts/CentralizedMonitoring_war_exploded/WEB-INF/lib/xmlschema-core-2.2.5.jar" beforeDir="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/ThreadPoolConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/config/ThreadPoolConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/controller/CarLineController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/controller/CarLineController.java" 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/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/ApplicationRunnerImpl.java" beforeDir="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/util/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/DateUtils.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/java/com/nmgs/util/PathUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/PathUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/PropertiesUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/PropertiesUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/resources/logback-spring.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ThreadTaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/service/ThreadTaskService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/FileUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/util/FileUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/workorder/service/impl/WorkOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../CentralizedMonitoring/src/main/java/com/nmgs/workorder/service/impl/WorkOrderServiceImpl.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$/public/resource/img/车道图片.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/resource/img/车道图片2.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/plugins/element.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/plugins/element.js" 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$/src/views/CarLine/CarLine.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/CarLine/CarLine.vue" 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$/src/views/CarLine/components/TreeData.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/CarLine/components/TreeData.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vite.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/vite.config.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -258,7 +83,7 @@
<workItem from="1700440639228" duration="8015000" />
<workItem from="1700526626927" duration="13000" />
<workItem from="1700526652439" duration="15614000" />
<workItem from="1700619113617" duration="1502000" />
<workItem from="1700619113617" duration="1860000" />
</task>
<task id="LOCAL-00001" summary="变更">
<created>1699319109952</created>

Write Preview
Loading…
Cancel
Save