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-04-01 14:38:11 +08:00
parent 9b1b21dad5
commit 186d701dcb
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -993,7 +993,7 @@ public class SocketDevResponseService {
*/
public void formalDeal(PreDetectionParam param, SocketDataMsg socketDataMsg) {
String data = socketDataMsg.getData();
DevData devData = JSON.parseObject(data, DevData.class);
DevData devData = JSON.parseObject(data, DevData.class); //DevData的id值为 设备id_通道号 这种形式
SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
SourceIssue sourceIssue = SocketManager.getSourceList().get(0);

3
detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
View File

@@ -66,6 +66,7 @@ public class DetectionServiceImpl {
/**
* 开始处理指标类型
* 一共20组数据，开始处理格式
* 返回值：key为设备id_通道号，value为检测结果
*/
public Map<String, Integer> processing(List<DevData> dev, PreDetectionParam detection, Map<String, String> devIdMapComm, SourceIssue issue, DictDataEnum dataRule) {
Map<String, List<DevData>> devDataMap = dev.stream().collect(Collectors.groupingBy(DevData::getId));
@@ -372,6 +373,7 @@ public class DetectionServiceImpl {
List<AdNonHarmonicResult> info = new ArrayList<>();
List<String> devValueTypeList = sourceIssue.getDevValueTypeList();
for (String s : devValueTypeList) {
// 根据数据处理规则取值。key为相别，value为值列表
Map<String, List<Double>> map = devListMap(dev, dataRule, s.split("\\$")[1]);
Double fData = 1.0;
if (U.equals(type)) {
@@ -933,6 +935,7 @@ public class DetectionServiceImpl {
*/
private void setDetection(DictDataEnum dataRule, List<Double> harmDataList, PqErrSysDtls errSysDtl, DetectionData data, Double v) {
if (CollUtil.isNotEmpty(harmDataList)) {
// 存放合格的数据
List<Double> qualifiedList = harmDataList.stream()
.filter(x -> v == 0 ? NumberUtil.isIn(devSubtractChannelData(x, v, errSysDtl.getErrorValueType()),
BigDecimal.valueOf(-errSysDtl.getMaxErrorValue()),

6
detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysDtlsServiceImpl.java
View File

@@ -106,7 +106,7 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl<PqErrSysDtlsMapper, PqE
(key1, key2) -> key1));
//获取误差体系
Map<String, List<PqErrSysDtls>> errMap = new HashMap<>(3);
Map<String, List<PqErrSysDtls>> errMap = new HashMap<>(3); //key为误差详情的ScriptType，value为List<PqErrSysDtls>
if (CollUtil.isNotEmpty(valueType)) {
List<PqErrSysDtls> errSysDtls = this.list(new MPJLambdaWrapper<PqErrSysDtls>().selectAll(PqErrSysDtls.class)
.selectAll(PqErrSysDtls.class)
@@ -142,12 +142,12 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl<PqErrSysDtlsMapper, PqE
if (valueType.containsKey(script.getValueType())) {
//默认值4.无法处理 5.不参与误差比较
Integer i = valueType.get(script.getValueType());
if (i == 1) {
if (i == 1) { //参与误差比较
dataVO.setIsQualified(4);
if (errMap.containsKey(script.getValueType())) {
dataVO.setErrSysDtls(errMap.get(script.getValueType()));
}
} else {
} else { //不参与误差比较
dataVO.setIsQualified(5);
}
}