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 28e5e7fc..4b3a0bfa 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 @@ -125,7 +125,7 @@ public class ResultServiceImpl implements IResultService { allResultList.addAll(adHarmonicService.get(param.getScriptId(), indexList, param.getDevId(), param.getDevNum(), param.getCode())); Map> resultMap = new HashMap<>(5); 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> dtlsSortMap = dtlsList.stream() diff --git a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdBaseResult.java b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdBaseResult.java index 3f80e20b..01989832 100644 --- a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdBaseResult.java +++ b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdBaseResult.java @@ -21,7 +21,7 @@ public class AdBaseResult { /** * 总检测脚本中的测试项序号 */ - private Integer index; + private Integer sort; /** * 0.不合格 1.合格 diff --git a/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java b/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java index 18bec624..4c1bae67 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java @@ -16,11 +16,11 @@ public interface AdHarmonicService extends IService { * 根据设备ID和通道号获取谐波结果 * * @param scriptId 脚本id - * @param index 序号列表 + * @param sort 序号列表 * @param deviceId 设备ID * @param chnNum 通道号,从1开始 * @param code 计划code * @return 谐波结果 */ - List get(String scriptId, List index, String deviceId, String chnNum,Integer code); + List get(String scriptId, List sort, String deviceId, String chnNum,Integer code); } diff --git a/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java b/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java index 7bbdb46b..252de29f 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java @@ -13,12 +13,12 @@ public interface AdNonHarmonicService extends IService { * 根据设备ID和通道号获取非谐波结果 * * @param scriptId 脚本ID - * @param index 总检测脚本中的测试项序号列表 + * @param sort 总检测脚本中的测试项序号列表 * @param deviceId 设备ID * @param chnNum 通道号,从1开始 * @return 非谐波结果 */ - List get(String scriptId, List index, String deviceId, String chnNum,Integer code); + List get(String scriptId, List sort, String deviceId, String chnNum,Integer code); } diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java index 01225e37..c03aa7d0 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java @@ -21,7 +21,7 @@ import java.util.List; @Service public class AdHarmonicServiceImpl extends ServiceImpl implements AdHarmonicService { @Override - public List get(String scriptId, List index, String deviceId, String chnNum,Integer code ) { + public List get(String scriptId, List sort, String deviceId, String chnNum,Integer code ) { String prefix = "ad_harmonic_result_"; DynamicTableNameHandler.setTableName(prefix +code); MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); @@ -31,7 +31,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl list = this.getBaseMapper().selectJoinList(AdHarmonicResult.class, wrapper); DynamicTableNameHandler.remove(); return BeanUtil.copyToList(list, AdBaseResult.class); diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java index 3cf95081..b92c823d 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java @@ -21,7 +21,7 @@ import java.util.List; public class AdNonHarmonicServiceImpl extends ServiceImpl implements AdNonHarmonicService { @Override - public List get(String scriptId, List index, String deviceId, String chnNum, Integer code) { + public List get(String scriptId, List sort, String deviceId, String chnNum, Integer code) { String prefix = "ad_non_harmonic_result_"; DynamicTableNameHandler.setTableName(prefix + code); @@ -32,7 +32,7 @@ public class AdNonHarmonicServiceImpl extends ServiceImpl list = this.getBaseMapper().selectJoinList(AdNonHarmonicResult.class, wrapper); DynamicTableNameHandler.remove(); return BeanUtil.copyToList(list, AdBaseResult.class);