ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2025-05-30 15:48:59 +08:00
parent 34f317780e
commit 9058c9081b
3 changed files with 98 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
View File

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

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

@@ -503,7 +503,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
int i; int i;
LambdaUpdateWrapper<PqDev> wrapper = new LambdaUpdateWrapper<PqDev>() LambdaUpdateWrapper<PqDev> wrapper = new LambdaUpdateWrapper<PqDev>()
.set(PqDev::getCheckResult, result.get(pqDev.getId())) .set(PqDev::getCheckResult, result.get(pqDev.getId()))
.set(PqDev::getCheckBy, userId) .set(StrUtil.isNotBlank(userId), PqDev::getCheckBy, userId)
.set(PqDev::getCheckTime, LocalDateTime.now()) .set(PqDev::getCheckTime, LocalDateTime.now())
.eq(PqDev::getId, pqDev.getId()); .eq(PqDev::getId, pqDev.getId());
String currrentScene = sysTestConfigService.getCurrrentScene(); String currrentScene = sysTestConfigService.getCurrrentScene();

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

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