微调

detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java

@@ -555,7 +555,6 @@ public class SocketContrastResponseService {
                                     this.sendAlignData(s, requestOperateCode);
 
                                     FormalTestManager.currentStep = SourceOperateCodeEnum.YJC_ALIGN;
-
 //                                    if (FormalTestManager.isWaveCheck) {
 //                                        System.out.println("（仅有闪变、录波）模型一致性校验成功！》》》》》》》》》》》》》》》》》》》》》》》》》》》》》开始相序校验》》》》》》》》》》》》》》》》");
 //                                        this.sendXu(s);

detection/src/main/java/com/njcn/gather/device/controller/PqDevController.java

@@ -9,6 +9,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
+import com.njcn.gather.device.pojo.dto.DataCheckResDTO;
 import com.njcn.gather.device.pojo.param.PqDevParam;
 import com.njcn.gather.device.pojo.vo.PqDevVO;
 import com.njcn.gather.device.service.IPqDevService;
@@ -170,23 +171,14 @@ public class PqDevController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
+    @OperateInfo
-    @PostMapping(value = "/ttt")
+    @GetMapping("/getDataCheckRes")
-    @ApiOperation("批量导入被检设备")
+    @ApiOperation("获取接入测试-数据校验结果")
-    @ApiImplicitParams({
+    @ApiImplicitParam(name = "monitorId", value = "监测点id", required = true)
-            @ApiImplicitParam(name = "file", value = "被检设备数据文件", required = true),
+    public HttpResult<DataCheckResDTO> getDataCheckRes(@RequestParam("monitorId") String monitorId) {
-            @ApiImplicitParam(name = "patternId", value = "模式id", required = true)
+        String methodDescribe = getMethodDescribe("getDataCheckRes");
-    })
+        DataCheckResDTO dataCheckRes = pqDevService.getDataCheckRes(monitorId);
-    public HttpResult ttt(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, @RequestParam("planId") String planId, @RequestParam(value = "cover", defaultValue = "0") Integer cover, HttpServletResponse response) {
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataCheckRes, methodDescribe);
-        String methodDescribe = getMethodDescribe("ttt");
-        LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename());
-        boolean fileType = FileUtil.judgeFileIsExcel(file.getOriginalFilename());
-        if (!fileType) {
-            throw new BusinessException(CommonResponseEnum.FILE_XLSX_ERROR);
-        }
-        if ("null".equals(planId)) {
-            planId = null;
-        }
-        return pqDevService.importDev(file, patternId, planId, response, cover);
     }
+
 }

detection/src/main/java/com/njcn/gather/device/pojo/dto/DataCheckResDTO.java

@@ -0,0 +1,8 @@
+package com.njcn.gather.device.pojo.dto;
+
+/**
+ * @author caozehui
+ * @data 2026-06-15
+ */
+public class DataCheckResDTO {
+}

detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.common.pojo.poi.PullDown;
 import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.gather.device.pojo.dto.DataCheckResDTO;
 import com.njcn.gather.device.pojo.enums.TimeCheckResultEnum;
 import com.njcn.gather.device.pojo.param.PqDevParam;
 import com.njcn.gather.device.pojo.po.PqDev;
@@ -289,4 +290,11 @@ public interface IPqDevService extends IService<PqDev> {
      * @return
      */
     List<ContrastDevExcel> getExportContrastDevData(List<PqDevVO> pqDevVOList);
+
+    /**
+     * 获取接入测试-数据校验结果
+     * @param monitorId
+     * @return
+     */
+    DataCheckResDTO getDataCheckRes(String monitorId);
 }

detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java

@@ -28,6 +28,7 @@ import com.njcn.common.utils.EncryptionUtil;
 import com.njcn.db.mybatisplus.constant.DbConstant;
 import com.njcn.gather.detection.util.socket.FormalTestManager;
 import com.njcn.gather.device.mapper.PqDevMapper;
+import com.njcn.gather.device.pojo.dto.DataCheckResDTO;
 import com.njcn.gather.device.pojo.enums.*;
 import com.njcn.gather.device.pojo.param.PqDevParam;
 import com.njcn.gather.device.pojo.po.PqDev;
@@ -55,6 +56,7 @@ import com.njcn.gather.type.pojo.po.DevType;
 import com.njcn.gather.type.service.IDevTypeService;
 import com.njcn.gather.user.user.pojo.po.SysUser;
 import com.njcn.gather.user.user.service.ISysUserService;
+import com.njcn.http.util.RestTemplateUtil;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.ExcelUtil;
 import com.njcn.web.utils.HttpResultUtil;
@@ -93,6 +95,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
     private final IPqDevSubService pqDevSubService;
     private final AdPlanMapper adPlanMapper;
     private final IPqDevCheckHistoryService pqDevCheckHistoryService;
+    private final RestTemplateUtil restTemplateUtil;
 
     @Override
     public Page<PqDevVO> listPqDevs(PqDevParam.QueryParam queryParam) {
@@ -1679,4 +1682,11 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
         }
         return result;
     }
+
+    @Override
+    public DataCheckResDTO getDataCheckRes(String monitorId) {
+//        restTemplateUtil.postJson();
+        DataCheckResDTO dataCheckResDTO = restTemplateUtil.postJson("http://localhost:8080/api/v1/dataCheck/getDataCheckRes", monitorId, DataCheckResDTO.class);
+        return dataCheckResDTO;
+    }
 }