From 13677f21d97411a66f6783cd3f40fc5c6359c75a Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 26 May 2026 15:41:28 +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/SocketDevResponseService.java | 2 +- .../service/impl/PreDetectionServiceImpl.java | 2 +- .../com/njcn/gather/device/service/IPqDevService.java | 3 ++- .../gather/device/service/impl/PqDevServiceImpl.java | 10 +++++++--- .../gather/result/service/impl/ResultServiceImpl.java | 2 +- .../storage/service/impl/DetectionDataServiceImpl.java | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java index bee4e241..a1c366b7 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java @@ -1377,7 +1377,7 @@ public class SocketDevResponseService { checkDataParam.setIsValueTypeName(false); List valueType = iPqScriptCheckDataService.getValueType(checkDataParam); - iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity()); + iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity(), true); CnSocketUtil.quitSend(param); } successComm.clear(); diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java index f368466d..6758c483 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java @@ -262,7 +262,7 @@ public class PreDetectionServiceImpl implements PreDetectionService { checkDataParam.setIsValueTypeName(false); List adType = iPqScriptCheckDataService.getValueType(checkDataParam); - iPqDevService.updateResult(param.getDevIds(), adType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity()); + iPqDevService.updateResult(param.getDevIds(), adType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity(), true); CnSocketUtil.quitSend(param); } diff --git a/detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java b/detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java index 8da6b10a..50cdf78f 100644 --- a/detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java +++ b/detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java @@ -115,9 +115,10 @@ public interface IPqDevService extends IService { * @param userId * @param temperature * @param humidity + * @param updateCheckNum 是否更新检测次数 * @return */ - boolean updateResult(List ids, List adType, String code, String userId, Float temperature, Float humidity); + boolean updateResult(List ids, List adType, String code, String userId, Float temperature, Float humidity, boolean updateCheckNum); /** * 比对式-修改设备状态 diff --git a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java index 61438320..8880dc1b 100644 --- a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java @@ -483,7 +483,7 @@ public class PqDevServiceImpl extends ServiceImpl implements @Override - public boolean updateResult(List ids, List adType, String code, String userId, Float temperature, Float humidity) { + public boolean updateResult(List ids, List adType, String code, String userId, Float temperature, Float humidity, boolean updateCheckNum) { if (CollUtil.isNotEmpty(ids)) { SysTestConfig config = sysTestConfigService.getOneConfig(); @@ -515,8 +515,12 @@ public class PqDevServiceImpl extends ServiceImpl implements checkState = CheckStateEnum.DOCUMENTED.getValue(); i = pqDevVo.getRecheckNum(); } else { - checkState = CheckStateEnum.CHECKED.getValue(); - i = pqDevVo.getRecheckNum() + 1; + checkState = pqDevVo.getCheckState() == CheckStateEnum.DOCUMENTED.getValue() ? CheckStateEnum.DOCUMENTED.getValue() : CheckStateEnum.CHECKED.getValue(); + if (updateCheckNum) { + i = pqDevVo.getRecheckNum() + 1; + } else { + i = pqDevVo.getRecheckNum(); + } wrapper.set(PqDevSub::getReportState, DevReportStateEnum.NOT_GENERATED.getValue()); } wrapper.set(PqDevSub::getRecheckNum, i) diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java index b47e36de..da259608 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java @@ -3140,7 +3140,7 @@ public class ResultServiceImpl implements IResultService { checkDataParam.setIsValueTypeName(false); List valueType = iPqScriptCheckDataService.getValueType(checkDataParam); - iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity()); + iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity(), false); } /** diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java index 9b993520..05c0ab28 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java @@ -325,7 +325,7 @@ public class DetectionDataServiceImpl extends ReplenishMybatisServiceImpl 4 != x && 5 != x).distinct().collect(Collectors.toList()); if (CollUtil.isNotEmpty(resultFlags)) { if (resultFlags.contains(2)) { - return 2; + return 0; } else { switch (resultFlags.get(0)) { case 1: