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-01-02 18:42:58 +08:00
parent 3b6115159c
commit 3213bc9f84
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,7 @@ public class ResultServiceImpl implements IResultService {
allResultList.addAll(adHarmonicService.get(param.getScriptId(), indexList, param.getDevId(), param.getDevNum(), param.getCode())); allResultList.addAll(adHarmonicService.get(param.getScriptId(), indexList, param.getDevId(), param.getDevNum(), param.getCode()));
Map<Integer, Set<Integer>> resultMap = new HashMap<>(5); Map<Integer, Set<Integer>> resultMap = new HashMap<>(5);
if (CollUtil.isNotEmpty(allResultList)) { if (CollUtil.isNotEmpty(allResultList)) {
resultMap = allResultList.stream().collect(Collectors.groupingBy(AdBaseResult::getIndex, Collectors.mapping(AdBaseResult::getResultFlag, Collectors.toSet()))); resultMap = allResultList.stream().collect(Collectors.groupingBy(AdBaseResult::getSort, Collectors.mapping(AdBaseResult::getResultFlag, Collectors.toSet())));
} }
Map<String, List<PqScriptDtls>> dtlsSortMap = dtlsList.stream() Map<String, List<PqScriptDtls>> dtlsSortMap = dtlsList.stream()

2
storage/src/main/java/com/njcn/gather/storage/pojo/po/AdBaseResult.java
View File

@@ -21,7 +21,7 @@ public class AdBaseResult {
/** /**
* 总检测脚本中的测试项序号 * 总检测脚本中的测试项序号
*/ */
private Integer index; private Integer sort;
/** /**
* 0.不合格 1.合格 * 0.不合格 1.合格

4
storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java
View File

@@ -16,11 +16,11 @@ public interface AdHarmonicService extends IService<AdHarmonicResult> {
* 根据设备ID和通道号获取谐波结果 * 根据设备ID和通道号获取谐波结果
* *
* @param scriptId 脚本id * @param scriptId 脚本id
* @param index 序号列表 * @param sort 序号列表
* @param deviceId 设备ID * @param deviceId 设备ID
* @param chnNum 通道号，从1开始 * @param chnNum 通道号，从1开始
* @param code 计划code * @param code 计划code
* @return 谐波结果 * @return 谐波结果
*/ */
List<AdBaseResult> get(String scriptId, List<Integer> index, String deviceId, String chnNum,Integer code); List<AdBaseResult> get(String scriptId, List<Integer> sort, String deviceId, String chnNum,Integer code);
} }

4
storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java
View File

@@ -13,12 +13,12 @@ public interface AdNonHarmonicService extends IService<AdNonHarmonicResult> {
* 根据设备ID和通道号获取非谐波结果 * 根据设备ID和通道号获取非谐波结果
* *
* @param scriptId 脚本ID * @param scriptId 脚本ID
* @param index 总检测脚本中的测试项序号列表 * @param sort 总检测脚本中的测试项序号列表
* @param deviceId 设备ID * @param deviceId 设备ID
* @param chnNum 通道号，从1开始 * @param chnNum 通道号，从1开始
* @return 非谐波结果 * @return 非谐波结果
*/ */
List<AdBaseResult> get(String scriptId, List<Integer> index, String deviceId, String chnNum,Integer code); List<AdBaseResult> get(String scriptId, List<Integer> sort, String deviceId, String chnNum,Integer code);
} }

4
storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
@Service @Service
public class AdHarmonicServiceImpl extends ServiceImpl<AdHarmonicMappper, AdHarmonicResult> implements AdHarmonicService { public class AdHarmonicServiceImpl extends ServiceImpl<AdHarmonicMappper, AdHarmonicResult> implements AdHarmonicService {
@Override @Override
public List<AdBaseResult> get(String scriptId, List<Integer> index, String deviceId, String chnNum,Integer code ) { public List<AdBaseResult> get(String scriptId, List<Integer> sort, String deviceId, String chnNum,Integer code ) {
String prefix = "ad_harmonic_result_"; String prefix = "ad_harmonic_result_";
DynamicTableNameHandler.setTableName(prefix +code); DynamicTableNameHandler.setTableName(prefix +code);
MPJLambdaWrapper<AdHarmonicResult> wrapper = new MPJLambdaWrapper<>(); MPJLambdaWrapper<AdHarmonicResult> wrapper = new MPJLambdaWrapper<>();
@@ -31,7 +31,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl<AdHarmonicMappper, AdHarm
} }
wrapper.like(AdHarmonicResult::getMonitorId, monitorId) wrapper.like(AdHarmonicResult::getMonitorId, monitorId)
.eq(ObjectUtil.isNotNull(scriptId), AdHarmonicResult::getScriptId, scriptId) .eq(ObjectUtil.isNotNull(scriptId), AdHarmonicResult::getScriptId, scriptId)
.in(CollUtil.isNotEmpty(index), AdHarmonicResult::getSort, index); .in(CollUtil.isNotEmpty(sort), AdHarmonicResult::getSort, sort);
List<AdHarmonicResult> list = this.getBaseMapper().selectJoinList(AdHarmonicResult.class, wrapper); List<AdHarmonicResult> list = this.getBaseMapper().selectJoinList(AdHarmonicResult.class, wrapper);
DynamicTableNameHandler.remove(); DynamicTableNameHandler.remove();
return BeanUtil.copyToList(list, AdBaseResult.class); return BeanUtil.copyToList(list, AdBaseResult.class);

4
storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
public class AdNonHarmonicServiceImpl extends ServiceImpl<AdNonHarmonicMapper, AdNonHarmonicResult> implements AdNonHarmonicService { public class AdNonHarmonicServiceImpl extends ServiceImpl<AdNonHarmonicMapper, AdNonHarmonicResult> implements AdNonHarmonicService {
@Override @Override
public List<AdBaseResult> get(String scriptId, List<Integer> index, String deviceId, String chnNum, Integer code) { public List<AdBaseResult> get(String scriptId, List<Integer> sort, String deviceId, String chnNum, Integer code) {
String prefix = "ad_non_harmonic_result_"; String prefix = "ad_non_harmonic_result_";
DynamicTableNameHandler.setTableName(prefix + code); DynamicTableNameHandler.setTableName(prefix + code);
@@ -32,7 +32,7 @@ public class AdNonHarmonicServiceImpl extends ServiceImpl<AdNonHarmonicMapper, A
} }
wrapper.like(AdNonHarmonicResult::getMonitorId, monitorId) wrapper.like(AdNonHarmonicResult::getMonitorId, monitorId)
.eq(ObjectUtil.isNotNull(scriptId), AdNonHarmonicResult::getScriptId, scriptId) .eq(ObjectUtil.isNotNull(scriptId), AdNonHarmonicResult::getScriptId, scriptId)
.in(CollUtil.isNotEmpty(index), AdNonHarmonicResult::getSort, index); .in(CollUtil.isNotEmpty(sort), AdNonHarmonicResult::getSort, sort);
List<AdNonHarmonicResult> list = this.getBaseMapper().selectJoinList(AdNonHarmonicResult.class, wrapper); List<AdNonHarmonicResult> list = this.getBaseMapper().selectJoinList(AdNonHarmonicResult.class, wrapper);
DynamicTableNameHandler.remove(); DynamicTableNameHandler.remove();
return BeanUtil.copyToList(list, AdBaseResult.class); return BeanUtil.copyToList(list, AdBaseResult.class);