feat(ps-inspection): 添加通过ID查询巡检信息的功能

- 在多个巡检控制器中增加根据ID查询详细信息的逻辑
- 优化应急物资柜类型的判断与处理逻辑
- 修复数据库查询条件中的表别名引用错误
- 更新前端路由跳转路径以匹配新的接口地址

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionAlarmController.java

@@ -77,6 +77,9 @@ public class TPsInspectionAlarmController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByDevNo(TPsInspectionAlarm tPsInspectionAlarm) {
+        if (tPsInspectionAlarm.getId()!=null){
+            return AjaxResult.success(tPsInspectionAlarmService.selectTPsInspectionAlarmById(tPsInspectionAlarm.getId()));
+        }
         if (!"PS".equals(tPsInspectionAlarm.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionAppController.java

@@ -508,6 +508,7 @@ public class TPsInspectionAppController extends BaseController {
                         break;
                     case "19": // Wardrobe
                         jsonObject.put("ppeType", devNo);
+                        jsonObject.put("wardrobeType", jsonObject.getString("position"));
                         break;
                 }
             }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionCabinetController.java

@@ -77,6 +77,9 @@ public class TPsInspectionCabinetController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByBoxNo(TPsInspectionCabinet tPsInspectionCabinet) {
+        if (tPsInspectionCabinet.getId()!=null){
+            return AjaxResult.success(tPsInspectionCabinetService.selectTPsInspectionCabinetById(tPsInspectionCabinet.getId()));
+        }
         if (!"PS".equals(tPsInspectionCabinet.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionCallsystemController.java

@@ -77,6 +77,9 @@ public class TPsInspectionCallsystemController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByDevno(TPsInspectionCallsystem tPsInspectionCallsystem) {
+        if (tPsInspectionCallsystem.getId()!=null){
+            return AjaxResult.success(tPsInspectionCallsystemService.selectTPsInspectionCallsystemById(tPsInspectionCallsystem.getId()));
+        }
         if (!"PS".equals(tPsInspectionCallsystem.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionCofferController.java

@@ -77,6 +77,9 @@ public class TPsInspectionCofferController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByCofferno(TPsInspectionCoffer tPsInspectionCoffer) {
+        if (tPsInspectionCoffer.getId()!=null){
+            return AjaxResult.success(tPsInspectionCofferService.selectTPsInspectionCofferById(tPsInspectionCoffer.getId()));
+        }
         if (!"PS".equals(tPsInspectionCoffer.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionCurtainController.java

@@ -77,6 +77,9 @@ public class TPsInspectionCurtainController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByCurtainname(TPsInspectionCurtain tPsInspectionCurtain) {
+        if (tPsInspectionCurtain.getId()!=null){
+            return AjaxResult.success(tPsInspectionCurtainService.selectTPsInspectionCurtainById(tPsInspectionCurtain.getId()));
+        }
         if (!"PS".equals(tPsInspectionCurtain.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionExtinguisherController.java

@@ -77,6 +77,9 @@ public class TPsInspectionExtinguisherController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByFireextinguisherno(TPsInspectionExtinguisher tPsInspectionExtinguisher) {
+        if (tPsInspectionExtinguisher.getId()!=null){
+            return AjaxResult.success(tPsInspectionExtinguisherService.selectTPsInspectionExtinguisherById(tPsInspectionExtinguisher.getId()));
+        }
         if (!"PS".equals(tPsInspectionExtinguisher.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionEyewashController.java

@@ -77,6 +77,9 @@ public class TPsInspectionEyewashController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByDevno(TPsInspectionEyewash tPsInspectionEyewash) {
+        if (tPsInspectionEyewash.getId()!=null){
+            return AjaxResult.success(tPsInspectionEyewashService.selectTPsInspectionEyewashById(tPsInspectionEyewash.getId()));
+        }
         if (!"PS".equals(tPsInspectionEyewash.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionFgsController.java

@@ -77,6 +77,9 @@ public class TPsInspectionFgsController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByFgsno(TPsInspectionFgs tPsInspectionFgs) {
+        if (tPsInspectionFgs.getId()!=null){
+            return AjaxResult.success(tPsInspectionFgsService.selectTPsInspectionFgsById(tPsInspectionFgs.getId()));
+        }
         if (!"PS".equals(tPsInspectionFgs.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionFiredoorController.java

@@ -77,6 +77,9 @@ public class TPsInspectionFiredoorController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByDoorno(TPsInspectionFiredoor tPsInspectionFiredoor) {
+        if (tPsInspectionFiredoor.getId()!=null){
+            return AjaxResult.success(tPsInspectionFiredoorService.selectTPsInspectionFiredoorById(tPsInspectionFiredoor.getId()));
+        }
         if (!"PS".equals(tPsInspectionFiredoor.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionHydrantController.java

@@ -77,6 +77,9 @@ public class TPsInspectionHydrantController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByEquipid(TPsInspectionHydrant tPsInspectionHydrant) {
+        if (tPsInspectionHydrant.getId()!=null){
+            return AjaxResult.success(tPsInspectionHydrantService.selectTPsInspectionHydrantById(tPsInspectionHydrant.getId()));
+        }
         if (!"PS".equals(tPsInspectionHydrant.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionLiftController.java

@@ -77,6 +77,9 @@ public class TPsInspectionLiftController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByDevno(TPsInspectionLift tPsInspectionLift) {
+        if (tPsInspectionLift.getId()!=null){
+            return AjaxResult.success(tPsInspectionLiftService.selectTPsInspectionLiftById(tPsInspectionLift.getId()));
+        }
         if (!"PS".equals(tPsInspectionLift.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionMonitorController.java

@@ -77,6 +77,9 @@ public class TPsInspectionMonitorController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByDevno(TPsInspectionMonitor tPsInspectionMonitor) {
+        if (tPsInspectionMonitor.getId()!=null){
+            return AjaxResult.success(tPsInspectionMonitorService.selectTPsInspectionMonitorById(tPsInspectionMonitor.getId()));
+        }
         if (!"PS".equals(tPsInspectionMonitor.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionPitController.java

@@ -77,6 +77,9 @@ public class TPsInspectionPitController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByDevno(TPsInspectionPit tPsInspectionPit) {
+        if (tPsInspectionPit.getId()!=null){
+            return AjaxResult.success(tPsInspectionPitService.selectTPsInspectionPitById(tPsInspectionPit.getId()));
+        }
         if (!"PS".equals(tPsInspectionPit.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionRainvalveController.java

@@ -77,6 +77,9 @@ public class TPsInspectionRainvalveController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByValvename(TPsInspectionRainvalve tPsInspectionRainvalve) {
+        if (tPsInspectionRainvalve.getId()!=null){
+            return AjaxResult.success(tPsInspectionRainvalveService.selectTPsInspectionRainvalveById(tPsInspectionRainvalve.getId()));
+        }
         if (!"PS".equals(tPsInspectionRainvalve.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionSteamController.java

@@ -77,6 +77,9 @@ public class TPsInspectionSteamController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoBySteamname(TPsInspectionSteam tPsInspectionSteam) {
+        if (tPsInspectionSteam.getId()!=null){
+            return AjaxResult.success(tPsInspectionSteamService.selectTPsInspectionSteamById(tPsInspectionSteam.getId()));
+        }
         if (!"PS".equals(tPsInspectionSteam.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionSumpController.java

@@ -77,6 +77,9 @@ public class TPsInspectionSumpController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoBySumpno(TPsInspectionSump tPsInspectionSump) {
+        if (tPsInspectionSump.getId()!=null){
+            return AjaxResult.success(tPsInspectionSumpService.selectTPsInspectionSumpById(tPsInspectionSump.getId()));
+        }
         if (!"PS".equals(tPsInspectionSump.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionUtilitystationController.java

@@ -77,6 +77,9 @@ public class TPsInspectionUtilitystationController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByUtilitystationname(TPsInspectionUtilitystation tPsInspectionUtilitystation) {
+        if (tPsInspectionUtilitystation.getId()!=null){
+            return AjaxResult.success(tPsInspectionUtilitystationService.selectTPsInspectionUtilitystationById(tPsInspectionUtilitystation.getId()));
+        }
         if (!"PS".equals(tPsInspectionUtilitystation.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionVentvalveController.java

@@ -77,6 +77,9 @@ public class TPsInspectionVentvalveController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByVentvalveno(TPsInspectionVentvalve tPsInspectionVentvalve) {
+        if (tPsInspectionVentvalve.getId()!=null){
+            return AjaxResult.success(tPsInspectionVentvalveService.selectTPsInspectionVentvalveById(tPsInspectionVentvalve.getId()));
+        }
         if (!"PS".equals(tPsInspectionVentvalve.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionWardrobeController.java

@@ -76,6 +76,9 @@ public class TPsInspectionWardrobeController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByPpeType(TPsInspectionWardrobe tPsInspectionWardrobe) {
+        if (tPsInspectionWardrobe.getId()!=null){
+            return AjaxResult.success(tPsInspectionWardrobeService.selectTPsInspectionWardrobeById(tPsInspectionWardrobe.getId()));
+        }
         if (!"PS".equals(tPsInspectionWardrobe.getPlant())) {
             return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
         }
@@ -85,6 +88,11 @@ public class TPsInspectionWardrobeController extends BaseController {
         TPsInspectionWardrobe item = new TPsInspectionWardrobe();
         item.setPlanId(tPsInspectionWardrobe.getPlanId());
         item.setPpeType(tPsInspectionWardrobe.getPpeType());
+        if (StringUtils.isNotEquals(tPsInspectionWardrobe.getWardrobeType())&&tPsInspectionWardrobe.getWardrobeType().contains("应急物资柜")){
+            item.setWardrobeType(tPsInspectionWardrobe.getPpeType().replace("应急物资柜", "").trim());
+        }else{
+            return AjaxResult.error("未知的应急物资柜类型！请联系管理员！");
+        }
         item.setIssuesFlag(0L);
         List<TPsInspectionWardrobe> list = tPsInspectionWardrobeService.selectTPsInspectionWardrobeList(item);
         if (CollectionUtils.isNotEmpty(list))

master/src/main/resources/mybatis/ps/dev/TPsDevWardrobeMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="status != null  and status != ''"> and d.status = #{status}</if>
             <if test="patrolType != null  and patrolType != ''"> and patrol_type = #{patrolType}</if>
             <if test="wardrobeType != null  and wardrobeType != ''"> and wardrobe_type = #{wardrobeType}</if>
             and d.del_flag = 0

master/src/main/resources/mybatis/ps/inspection/TPsInspectionWardrobeMapper.xml

@@ -38,7 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPsInspectionWardrobeList" parameterType="TPsInspectionWardrobe" resultMap="TPsInspectionWardrobeResult">
         <include refid="selectTPsInspectionWardrobeVo"/>
-        <where>  
+        <where>
+            <if test="id != null "> and d.id = #{id}</if>
             <if test="ppeType != null  and ppeType != ''"> and ppe_type = #{ppeType}</if>
             <if test="complete != null  and complete != ''"> and complete = #{complete}</if>
             <if test="intact != null  and intact != ''"> and intact = #{intact}</if>

ui/src/views/ps/patrol/plan/index.vue

@@ -405,7 +405,7 @@ export default {
           break;
         case '19':
           this.$router.push({
-            path: '/ps-patrol/inspection/',
+            path: '/ps-patrol/inspection/wardrobe',
             query: {month: this.month.getMonth(), year: this.year.getFullYear(), planId: id}
           });
           break;