微调

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

@@ -1122,6 +1122,7 @@ public class SocketDevResponseService {
 
         switch (Objects.requireNonNull(dictDataEnumByCode)) {
             case SUCCESS:
+                if (devData.getResult()) {
                     FormalTestManager.realDataXiList.add(devData);
                     successComm.add(devData.getId());
 
@@ -1210,17 +1211,22 @@ public class SocketDevResponseService {
                         FormalTestManager.realDataXiList.clear();
 
                     }
+                } else {
+                    System.out.println("被抛除的数据：" + data);
+                }
                 break;
-
             case UNPROCESSED_BUSINESS:
                 break;
 
             case NORMAL_RESPONSE:
+                if (devData.getResult()) {
                     if (SocketManager.clockMap.containsKey(sourceIssue.getIndex())) {
                         SocketManager.clockMap.put(sourceIssue.getIndex(), 0L);
                     }
                     FormalTestManager.realDataXiList.add(devData);
-
+                } else {
+                    System.out.println("被抛除的数据：" + data);
+                }
                 break;
             case DEV_ERROR:
 

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

@@ -503,7 +503,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
                     int i;
                     LambdaUpdateWrapper<PqDev> wrapper = new LambdaUpdateWrapper<PqDev>()
                             .set(PqDev::getCheckResult, result.get(pqDev.getId()))
-                            .set(PqDev::getCheckBy, userId)
+                            .set(StrUtil.isNotBlank(userId), PqDev::getCheckBy, userId)
                             .set(PqDev::getCheckTime, LocalDateTime.now())
                             .eq(PqDev::getId, pqDev.getId());
                     String currrentScene = sysTestConfigService.getCurrrentScene();
@@ -1092,7 +1092,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
     public void visualizeProvinceDev(List<PqDev> pqDevs) {
         pqDevs.forEach(pqDev -> {
             pqDev.setDevType(devTypeService.getById(pqDev.getDevType()).getName());
-            if(StrUtil.isNotBlank(pqDev.getManufacturer())){
+            if (StrUtil.isNotBlank(pqDev.getManufacturer())) {
                 pqDev.setManufacturer(dictDataService.getDictDataById(pqDev.getManufacturer()).getName());
             }
 

detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java

@@ -36,6 +36,7 @@ import com.njcn.gather.result.pojo.vo.ResultVO;
 import com.njcn.gather.result.pojo.vo.TreeDataVO;
 import com.njcn.gather.result.service.IResultService;
 import com.njcn.gather.script.mapper.PqScriptMapper;
+import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam;
 import com.njcn.gather.script.pojo.param.PqScriptIssueParam;
 import com.njcn.gather.script.pojo.po.PqScriptCheckData;
 import com.njcn.gather.script.pojo.po.PqScriptDtls;
@@ -81,7 +82,6 @@ import java.util.stream.Collectors;
 public class ResultServiceImpl implements IResultService {
 
     private final IAdPlanService adPlanService;
-    private final ISysTestConfigService sysTestConfigService;
     private final IPqDevService pqDevService;
     private final AdNonHarmonicService adNonHarmonicService;
     private final AdHarmonicService adHarmonicService;
@@ -92,6 +92,8 @@ public class ResultServiceImpl implements IResultService {
     private final TableGenMapper tableGenMapper;
     private final DetectionServiceImpl detectionServiceImpl;
     private final IDictDataService dictDataService;
+    private final IPqScriptCheckDataService iPqScriptCheckDataService;
+    private final IPqDevService iPqDevService;
 
     /**
      * 谐波类code，取树形字典表中的code
@@ -1625,6 +1627,13 @@ public class ResultServiceImpl implements IResultService {
 
             detectionServiceImpl.processing(realDataXiList, param, devIdMapComm, sourceIssue, dataRule);
         });
+
+        PqScriptCheckDataParam checkDataParam = new PqScriptCheckDataParam();
+        checkDataParam.setScriptId(scriptId);
+        checkDataParam.setIsValueTypeName(false);
+        List<String> valueType = iPqScriptCheckDataService.getValueType(checkDataParam);
+
+        iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), null, param.getTemperature(), param.getHumidity());
     }
 
     private List<DevData> toList(List<AdNonHarmonicResult> nonHarm, List<AdHarmonicResult> harm, boolean containBaseHarm) {