From ab236cd34f94006ebbc8a64032ca07f3ae6346bb Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Fri, 21 Nov 2025 10:09:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detection/handler/SocketContrastResponseService.java   | 3 ++-
 .../njcn/gather/icd/service/impl/PqIcdPathServiceImpl.java | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java
index eaa8c490..9fd87441 100644
--- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java
+++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java
@@ -182,7 +182,8 @@ public class SocketContrastResponseService {
         FormalTestManager.pstDataType = null;
         FormalTestManager.isPstData = false;
         FormalTestManager.isWaveCheck = false;
-        FormalTestManager.isXu = param.getPhaseCheck() == 1 ? true : false;
+//        FormalTestManager.isXu = param.getPhaseCheck() == 1 ? true : false;
+        FormalTestManager.isXu = true;
         FormalTestManager.nonWaveDataSourceEnum = null;
 
         String[] datasourceIds = FormalTestManager.currentTestPlan.getDatasourceId().split(",");
diff --git a/detection/src/main/java/com/njcn/gather/icd/service/impl/PqIcdPathServiceImpl.java b/detection/src/main/java/com/njcn/gather/icd/service/impl/PqIcdPathServiceImpl.java
index 7c926c77..692d6963 100644
--- a/detection/src/main/java/com/njcn/gather/icd/service/impl/PqIcdPathServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/icd/service/impl/PqIcdPathServiceImpl.java
@@ -71,9 +71,11 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
         pqIcdPath.setState(DataStateEnum.ENABLE.getCode());
 
         String commInstallPath = this.getCommInstallPath();
+        System.out.println("commInstallPath = " + commInstallPath);
         long FILE_SIZE_LIMIT = 1 * 1024 * 1024;
         MultipartFile mappingFile = param.getMappingFile();
 
+        System.out.println("mappingFile = " + ObjectUtil.isNotNull(mappingFile) + " " + !mappingFile.isEmpty());
         if (ObjectUtil.isNotNull(mappingFile) && !mappingFile.isEmpty()) {
             String mappingFilename = mappingFile.getOriginalFilename();
 
@@ -87,6 +89,7 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
             try {
                 // 如果文件存在，则先删除
                 String mappingFilePath = commInstallPath + "\\DeviceControl\\Config\\" + mappingFilename;
+                System.out.println("mappingFilePath = " + mappingFilePath);
                 Path path = Paths.get(mappingFilePath);
                 File file = path.toFile();
                 if (file.exists()) {
@@ -100,10 +103,12 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
                 bufferedOutputStream.flush();
 
                 bufferedOutputStream.close();
+                System.out.println("File saved successfully");
             } catch (IOException e) {
                 throw new BusinessException(ReportResponseEnum.FILE_UPLOAD_FAILED);
             }
         } else {
+            System.out.println("mappingFile is null or empty");
             throw new BusinessException(IcdResponseEnum.FILE_NOT_NULL);
         }
 
@@ -131,7 +136,7 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
         String workDir = System.getProperty("user.dir");
 //        String workDir = "D:\\program\\CN_Gather";
         // 获取映射文件存放文件夹
-        String dirPath = workDir.substring(0, workDir.lastIndexOf("\\")) + "\\9100";
+        String dirPath = workDir + "\\9100";
         return dirPath;
     }