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

导入测试后数据，查看数据报错BUG

Browse Source
This commit is contained in:
caozehui
2025-10-23 13:28:14 +08:00
parent 1534327f6f
commit 5d161acfad
6 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,8 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
wrapper.like(StrUtil.isNotBlank(queryParam.getName()), "name", queryParam.getName()) wrapper.like(StrUtil.isNotBlank(queryParam.getName()), "name", queryParam.getName())
.eq(StrUtil.isNotBlank(queryParam.getManufacturer()), "manufacturer", queryParam.getManufacturer()) .eq(StrUtil.isNotBlank(queryParam.getManufacturer()), "manufacturer", queryParam.getManufacturer())
.eq(StrUtil.isNotBlank(queryParam.getDevType()), "dev_type", queryParam.getDevType()) .eq(StrUtil.isNotBlank(queryParam.getDevType()), "dev_type", queryParam.getDevType())
.eq("state", DataStateEnum.ENABLE.getCode()); .eq("state", DataStateEnum.ENABLE.getCode())
.orderByDesc("create_time");
return this.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), wrapper); return this.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), wrapper);
} }

2
detection/src/main/java/com/njcn/gather/result/controller/ResultController.java
View File

@@ -198,7 +198,7 @@ public class ResultController extends BaseController {
String methodDescribe = getMethodDescribe("getCheckItem"); String methodDescribe = getMethodDescribe("getCheckItem");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, monitorQueryParam); LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, monitorQueryParam);
List<ContrastTestItemVO> result = resultService.getCheckItem(monitorQueryParam.getDevId(),monitorQueryParam.getChnNum(), monitorQueryParam.getNum()); List<ContrastTestItemVO> result = resultService.getCheckItem(monitorQueryParam.getPlanId(), monitorQueryParam.getDevId(), monitorQueryParam.getChnNum(), monitorQueryParam.getNum());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
} }
} }

2
detection/src/main/java/com/njcn/gather/result/pojo/param/MonitorQueryParam.java
View File

@@ -15,4 +15,6 @@ public class MonitorQueryParam {
private Integer num; private Integer num;
private Integer waveNum; private Integer waveNum;
private String planId;
} }

6
detection/src/main/java/com/njcn/gather/result/service/IResultService.java
View File

@@ -119,17 +119,19 @@ public interface IResultService {
/** /**
* 获取检测项 * 获取检测项
* *
* @param planId
* @param devId * @param devId
* @param chnNum * @param chnNum
* @param num * @param num
* @return * @return
*/ */
List<ContrastTestItemVO> getCheckItem(String devId, String chnNum, Integer num); List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num);
/** /**
* 获取设备比对式结果，用于出比对检测的报告 * 获取设备比对式结果，用于出比对检测的报告
*
* @param devReportParam 设备报告参数 * @param devReportParam 设备报告参数
* @param pqDevVO 设备信息 省去一次sql查询 * @param pqDevVO 设备信息 省去一次sql查询
* @return 该设备的比对式结果 * @return 该设备的比对式结果
*/ */
Map<Integer, List<ContrastTestResult>> getContrastResultForReport(DevReportParam devReportParam, PqDevVO pqDevVO); Map<Integer, List<ContrastTestResult>> getContrastResultForReport(DevReportParam devReportParam, PqDevVO pqDevVO);

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

@@ -1807,9 +1807,9 @@ public class ResultServiceImpl implements IResultService {
} }
@Override @Override
public List<ContrastTestItemVO> getCheckItem(String devId, String chnNum, Integer num) { public List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num) {
PqDev dev = pqDevService.getById(devId); // PqDev dev = pqDevService.getById(devId);
AdPlan plan = adPlanService.getById(dev.getPlanId()); AdPlan plan = adPlanService.getById(planId);
String code = String.valueOf(plan.getCode()); String code = String.valueOf(plan.getCode());
String monitorId = devId + CnSocketUtil.SPLIT_TAG + chnNum; String monitorId = devId + CnSocketUtil.SPLIT_TAG + chnNum;

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

@@ -40,7 +40,8 @@ public class DevTypeServiceImpl extends ServiceImpl<DevTypeMapper, DevType> impl
@Override @Override
public List<DevType> listAll() { public List<DevType> listAll() {
LambdaQueryWrapper<DevType> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<DevType> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DevType::getState, DataStateEnum.ENABLE.getCode()); queryWrapper.eq(DevType::getState, DataStateEnum.ENABLE.getCode())
.orderByAsc(DevType::getName);
List<DevType> devTypes = this.baseMapper.selectList(queryWrapper); List<DevType> devTypes = this.baseMapper.selectList(queryWrapper);
return devTypes; return devTypes;
} }