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-21 16:23:21 +08:00
parent bd9f518241
commit 7da5d7c1f8
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
detection/src/main/java/com/njcn/gather/device/mapper/PqDevMapper.java
View File

@@ -27,5 +27,7 @@ public interface PqDevMapper extends MPJBaseMapper<PqDev> {
void updateReportState(@Param("id")String id); void updateReportState(@Param("id")String id);
void updatePlanCheckResult(@Param("planId")String planId, @Param("checkResult")Integer checkResult); void updatePlanCheckResult(@Param("planId")String planId, @Param("checkResult")Integer checkResult);
void updatePlanTestState(@Param("planId")String planId, @Param("testState")Integer testState);
} }

4
detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml
View File

@@ -61,6 +61,10 @@
update ad_plan set Result = #{checkResult} where id = #{planId} update ad_plan set Result = #{checkResult} where id = #{planId}
</update> </update>
<update id="updatePlanTestState">
update ad_plan set Test_State = #{testState} where id = #{planId}
</update>
</mapper> </mapper>

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

@@ -593,14 +593,21 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
.eq(PqDev::getState, DataStateEnum.ENABLE.getCode()); .eq(PqDev::getState, DataStateEnum.ENABLE.getCode());
List<PqDev> pqDevList = this.list(queryWrapper); List<PqDev> pqDevList = this.list(queryWrapper);
if (CollUtil.isNotEmpty(pqDevList)) { if (CollUtil.isNotEmpty(pqDevList)) {
Set<Integer> checkResultSet = pqDevList.stream().map(PqDev::getCheckResult).collect(Collectors.toSet()); Set<Integer> set = pqDevList.stream().map(PqDev::getCheckResult).collect(Collectors.toSet());
if (checkResultSet.contains(CheckResultEnum.UNCHECKED.getValue())) { if (set.contains(CheckResultEnum.NOT_ACCORD.getValue())) {
this.baseMapper.updatePlanCheckResult(pqDev.getPlanId(), CheckResultEnum.UNCHECKED.getValue());
} else if (checkResultSet.contains(CheckResultEnum.NOT_ACCORD.getValue())) {
this.baseMapper.updatePlanCheckResult(pqDev.getPlanId(), CheckResultEnum.NOT_ACCORD.getValue()); this.baseMapper.updatePlanCheckResult(pqDev.getPlanId(), CheckResultEnum.NOT_ACCORD.getValue());
} else if (set.contains(CheckResultEnum.UNCHECKED.getValue())) {
this.baseMapper.updatePlanCheckResult(pqDev.getPlanId(), CheckResultEnum.UNCHECKED.getValue());
} else { } else {
this.baseMapper.updatePlanCheckResult(pqDev.getPlanId(), CheckResultEnum.ACCORD.getValue()); this.baseMapper.updatePlanCheckResult(pqDev.getPlanId(), CheckResultEnum.ACCORD.getValue());
} }
// set = pqDevList.stream().map(PqDev::getCheckState).collect(Collectors.toSet());
// if (set.contains(CheckStateEnum.UNCHECKED.getValue())) {
// this.baseMapper.updatePlanTestState(pqDev.getPlanId(), CheckStateEnum.UNCHECKED.getValue());
// } else {
// this.baseMapper.updatePlanTestState(pqDev.getPlanId(), CheckStateEnum.CHECKED.getValue());
// }
} }
} }
} }