feat(ps): 添加plant字段并更新二维码生成逻辑

- 在QRCodeEntity类中新增plant属性及其getter/setter方法
- 更新QRCodeEntity构造函数以支持plant参数
- 修改所有PS装置相关控制器，添加plant参数到QRCodeEntity实例化过程
- 更新导出二维码压缩包的文件名前缀为"PS装置_"
- 在巡检控制器中增加plant字段校验，防止非PS装置账号扫码巡检
- 为多个巡检实体类添加plant字段及相应访问方法

master/src/main/java/com/ruoyi/common/utils/poi/QRCodeEntity.java

@@ -11,6 +11,7 @@ public class QRCodeEntity {
     private String position;
 
     private String description;
+    private String plant;
 
     public QRCodeEntity() {
     }
@@ -24,12 +25,30 @@ public class QRCodeEntity {
                 "位号：" + getDevNo() + (StringUtils.isNotEmpty(getPosition()) ? " 位置：" + getPosition() : "");
     }
 
+    public QRCodeEntity(Long id, String devNo, String patrolType, String position,String plant) {
+        this.id = id;
+        this.devNo = devNo;
+        this.patrolType = patrolType;
+        this.position = position;
+        this.plant = plant;
+        this.description =
+                "位号：" + getDevNo() + (StringUtils.isNotEmpty(getPosition()) ? " 位置：" + getPosition() : "");
+    }
+
     public QRCodeEntity(Long id, String description, String patrolType) {
         this.id = id;
         this.description = description;
         this.patrolType = patrolType;
     }
 
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public Long getId() {
         return id;
     }

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevAlarmController.java

@@ -70,10 +70,10 @@ public class TPsDevAlarmController extends BaseController {
         List<TPsDevAlarm> list = tPsDevAlarmService.selectTPsDevAlarmList(tPsDevAlarm);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevAlarm item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDevNo(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDevNo(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "手动启动火灾报警器");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_手动启动火灾报警器");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevCabinetController.java

@@ -70,10 +70,10 @@ public class TPsDevCabinetController extends BaseController {
         List<TPsDevCabinet> list = tPsDevCabinetService.selectTPsDevCabinetList(tPsDevCabinet);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevCabinet item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getBoxNo(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getBoxNo(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "玻璃门消火栓箱和泡沫栓箱");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_玻璃门消火栓箱和泡沫栓箱");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevCallsystemController.java

@@ -70,10 +70,10 @@ public class TPsDevCallsystemController extends BaseController {
         List<TPsDevCallsystem> list = tPsDevCallsystemService.selectTPsDevCallsystemList(tPsDevCallsystem);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevCallsystem item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDevNo(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDevNo(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "现场呼叫系统");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_现场呼叫系统");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevCofferController.java

@@ -70,10 +70,10 @@ public class TPsDevCofferController extends BaseController {
         List<TPsDevCoffer> list = tPsDevCofferService.selectTPsDevCofferList(tPsDevCoffer);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevCoffer item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getCofferNo(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getCofferNo(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "围堰");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_围堰");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevCurtainController.java

@@ -70,10 +70,10 @@ public class TPsDevCurtainController extends BaseController {
         List<TPsDevCurtain> list = tPsDevCurtainService.selectTPsDevCurtainList(tPsDevCurtain);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevCurtain item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getCurtainName(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getCurtainName(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "现场消防水幕检测记录");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_现场消防水幕检测记录");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevExtinguisherController.java

@@ -70,10 +70,10 @@ public class TPsDevExtinguisherController extends BaseController {
         List<TPsDevExtinguisher> list = tPsDevExtinguisherService.selectTPsDevExtinguisherList(tPsDevExtinguisher);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevExtinguisher item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getFireExtinguisherNo() != null ? item.getFireExtinguisherNo() : "", item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getFireExtinguisherNo() != null ? item.getFireExtinguisherNo() : "", item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "现场灭火器");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_现场灭火器");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevEyewashController.java

@@ -70,10 +70,10 @@ public class TPsDevEyewashController extends BaseController {
         List<TPsDevEyewash> list = tPsDevEyewashService.selectTPsDevEyewashList(tPsDevEyewash);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevEyewash item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDevNo(), item.getPatrolType(), ""));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDevNo(), item.getPatrolType(), "","PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "洗眼器");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_洗眼器");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevFgsController.java

@@ -70,10 +70,10 @@ public class TPsDevFgsController extends BaseController {
         List<TPsDevFgs> list = tPsDevFgsService.selectTPsDevFgsList(tPsDevFgs);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevFgs item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getFgsNo(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getFgsNo(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "FGS Mini板");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_FGS Mini板");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevFiredoorController.java

@@ -70,10 +70,10 @@ public class TPsDevFiredoorController extends BaseController {
         List<TPsDevFiredoor> list = tPsDevFiredoorService.selectTPsDevFiredoorList(tPsDevFiredoor);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevFiredoor item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDoorNo(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDoorNo(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "安全防火门防爆门");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_安全防火门防爆门");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevHydrantController.java

@@ -70,10 +70,10 @@ public class TPsDevHydrantController extends BaseController {
         List<TPsDevHydrant> list = tPsDevHydrantService.selectTPsDevHydrantList(tPsDevHydrant);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevHydrant item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getEquipId(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getEquipId(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "地上消火栓和消防水带箱");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_地上消火栓和消防水带箱");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevLiftController.java

@@ -70,10 +70,10 @@ public class TPsDevLiftController extends BaseController {
         List<TPsDevLift> list = tPsDevLiftService.selectTPsDevLiftList(tPsDevLift);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevLift item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDevNo(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDevNo(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "电梯");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_电梯");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevMonitorController.java

@@ -70,10 +70,10 @@ public class TPsDevMonitorController extends BaseController {
         List<TPsDevMonitor> list = tPsDevMonitorService.selectTPsDevMonitorList(tPsDevMonitor);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevMonitor item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDevNo(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDevNo(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "现场消防炮");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_现场消防炮");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevPitController.java

@@ -70,10 +70,10 @@ public class TPsDevPitController extends BaseController {
         List<TPsDevPit> list = tPsDevPitService.selectTPsDevPitList(tPsDevPit);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevPit item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDevNo(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getDevNo(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "现场地井");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_现场地井");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevRainvalveController.java

@@ -70,10 +70,10 @@ public class TPsDevRainvalveController extends BaseController {
         List<TPsDevRainvalve> list = tPsDevRainvalveService.selectTPsDevRainvalveList(tPsDevRainvalve);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevRainvalve item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getValveName(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getValveName(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "污水/雨排切换阀门");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_污水/雨排切换阀门");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevSteamController.java

@@ -70,10 +70,10 @@ public class TPsDevSteamController extends BaseController {
         List<TPsDevSteam> list = tPsDevSteamService.selectTPsDevSteamList(tPsDevSteam);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevSteam item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getSteamName(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getSteamName(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "消防蒸汽系统");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_消防蒸汽系统");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevSumpController.java

@@ -70,10 +70,10 @@ public class TPsDevSumpController extends BaseController {
         List<TPsDevSump> list = tPsDevSumpService.selectTPsDevSumpList(tPsDevSump);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevSump item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getSumpNo(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getSumpNo(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "雨排井");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_雨排井");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevUtilitystationController.java

@@ -70,10 +70,10 @@ public class TPsDevUtilitystationController extends BaseController {
         List<TPsDevUtilitystation> list = tPsDevUtilitystationService.selectTPsDevUtilitystationList(tPsDevUtilitystation);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevUtilitystation item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getUtilityStationName(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getUtilityStationName(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "公用站");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_公用站");
     }
 
     /**

master/src/main/java/com/ruoyi/project/ps/dev/controller/TPsDevVentvalveController.java

@@ -70,10 +70,10 @@ public class TPsDevVentvalveController extends BaseController {
         List<TPsDevVentvalve> list = tPsDevVentvalveService.selectTPsDevVentvalveList(tPsDevVentvalve);
         List<QRCodeEntity> qrCodeEntities = new ArrayList<>();
         for (TPsDevVentvalve item : list) {
-            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getVentvalveNo(), item.getPatrolType(), item.getPosition()));
+            qrCodeEntities.add(new QRCodeEntity(item.getId(), item.getVentvalveNo(), item.getPatrolType(), item.getPosition(),"PS"));
         }
         QRCodeUtil<QRCodeEntity> util = new QRCodeUtil<>(QRCodeEntity.class);
-        util.exportQRCodeAsZip(response, qrCodeEntities, "余压阀");
+        util.exportQRCodeAsZip(response, qrCodeEntities, "PS装置_余压阀");
     }
 
     /**

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 ("PS".equals(tPsInspectionAlarm.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionAlarm.getDevNo()) || StringUtils.isNull(tPsInspectionAlarm.getPlanId())) {
             return AjaxResult.error("位号或计划id不能为空！");
         }

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 ("PS".equals(tPsInspectionCabinet.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionCabinet.getBoxNo()) || StringUtils.isNull(tPsInspectionCabinet.getPlanId())) {
             return AjaxResult.error("编号或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionCallsystemController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByDevno(TPsInspectionCallsystem tPsInspectionCallsystem) {
+        if ("PS".equals(tPsInspectionCallsystem.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionCallsystem.getDevNo()) || StringUtils.isNull(tPsInspectionCallsystem.getPlanId())) {
             return AjaxResult.error("位号或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionCofferController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByCofferno(TPsInspectionCoffer tPsInspectionCoffer) {
+        if ("PS".equals(tPsInspectionCoffer.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionCoffer.getCofferNo()) || StringUtils.isNull(tPsInspectionCoffer.getPlanId())) {
             return AjaxResult.error("编号或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionCurtainController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByCurtainname(TPsInspectionCurtain tPsInspectionCurtain) {
+        if ("PS".equals(tPsInspectionCurtain.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionCurtain.getCurtainName()) || StringUtils.isNull(tPsInspectionCurtain.getPlanId())) {
             return AjaxResult.error("名称或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionExtinguisherController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByFireextinguisherno(TPsInspectionExtinguisher tPsInspectionExtinguisher) {
+        if ("PS".equals(tPsInspectionExtinguisher.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionExtinguisher.getFireExtinguisherNo()) || StringUtils.isNull(tPsInspectionExtinguisher.getPlanId())) {
             return AjaxResult.error("编号或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionEyewashController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByDevno(TPsInspectionEyewash tPsInspectionEyewash) {
+        if ("PS".equals(tPsInspectionEyewash.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionEyewash.getDevNo()) || StringUtils.isNull(tPsInspectionEyewash.getPlanId())) {
             return AjaxResult.error("位号或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionFgsController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByFgsno(TPsInspectionFgs tPsInspectionFgs) {
+        if ("PS".equals(tPsInspectionFgs.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionFgs.getFgsNo()) || StringUtils.isNull(tPsInspectionFgs.getPlanId())) {
             return AjaxResult.error("编号或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionFiredoorController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByDoorno(TPsInspectionFiredoor tPsInspectionFiredoor) {
+        if ("PS".equals(tPsInspectionFiredoor.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionFiredoor.getDoorNo()) || StringUtils.isNull(tPsInspectionFiredoor.getPlanId())) {
             return AjaxResult.error("门号或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionHydrantController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByEquipid(TPsInspectionHydrant tPsInspectionHydrant) {
+        if ("PS".equals(tPsInspectionHydrant.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionHydrant.getEquipId()) || StringUtils.isNull(tPsInspectionHydrant.getPlanId())) {
             return AjaxResult.error("器材编号或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionLiftController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByDevno(TPsInspectionLift tPsInspectionLift) {
+        if ("PS".equals(tPsInspectionLift.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionLift.getDevNo()) || StringUtils.isNull(tPsInspectionLift.getPlanId())) {
             return AjaxResult.error("位号或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionMonitorController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByDevno(TPsInspectionMonitor tPsInspectionMonitor) {
+        if ("PS".equals(tPsInspectionMonitor.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionMonitor.getDevNo()) || StringUtils.isNull(tPsInspectionMonitor.getPlanId())) {
             return AjaxResult.error("位号或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionPitController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByDevno(TPsInspectionPit tPsInspectionPit) {
+        if ("PS".equals(tPsInspectionPit.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionPit.getDevNo()) || StringUtils.isNull(tPsInspectionPit.getPlanId())) {
             return AjaxResult.error("位号或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionRainvalveController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByValvename(TPsInspectionRainvalve tPsInspectionRainvalve) {
+        if ("PS".equals(tPsInspectionRainvalve.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionRainvalve.getValveName()) || StringUtils.isNull(tPsInspectionRainvalve.getPlanId())) {
             return AjaxResult.error("名称或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionSteamController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoBySteamname(TPsInspectionSteam tPsInspectionSteam) {
+        if ("PS".equals(tPsInspectionSteam.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionSteam.getSteamName()) || StringUtils.isNull(tPsInspectionSteam.getPlanId())) {
             return AjaxResult.error("名称或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionSumpController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoBySumpno(TPsInspectionSump tPsInspectionSump) {
+        if ("PS".equals(tPsInspectionSump.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionSump.getSumpNo()) || StringUtils.isNull(tPsInspectionSump.getPlanId())) {
             return AjaxResult.error("编号或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionUtilitystationController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByUtilitystationname(TPsInspectionUtilitystation tPsInspectionUtilitystation) {
+        if ("PS".equals(tPsInspectionUtilitystation.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionUtilitystation.getUtilityStationName()) || StringUtils.isNull(tPsInspectionUtilitystation.getPlanId())) {
             return AjaxResult.error("编号或计划id不能为空！");
         }

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

@@ -76,6 +76,9 @@ public class TPsInspectionVentvalveController extends BaseController {
      */
     @GetMapping(value = "/info")
     public AjaxResult getInfoByVentvalveno(TPsInspectionVentvalve tPsInspectionVentvalve) {
+        if ("PS".equals(tPsInspectionVentvalve.getPlant())){
+            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+        }
         if (StringUtils.isNull(tPsInspectionVentvalve.getVentvalveNo()) || StringUtils.isNull(tPsInspectionVentvalve.getPlanId())) {
             return AjaxResult.error("编号或计划id不能为空！");
         }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionAlarm.java

@@ -162,6 +162,16 @@ public class TPsInspectionAlarm extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionCabinet.java

@@ -222,6 +222,16 @@ public class TPsInspectionCabinet extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionCallsystem.java

@@ -168,6 +168,16 @@ public class TPsInspectionCallsystem extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionCoffer.java

@@ -168,6 +168,16 @@ public class TPsInspectionCoffer extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionCurtain.java

@@ -168,6 +168,16 @@ public class TPsInspectionCurtain extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionExtinguisher.java

@@ -220,6 +220,16 @@ public class TPsInspectionExtinguisher extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionEyewash.java

@@ -209,6 +209,16 @@ public class TPsInspectionEyewash extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionFgs.java

@@ -168,6 +168,16 @@ public class TPsInspectionFgs extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionFiredoor.java

@@ -175,6 +175,16 @@ public class TPsInspectionFiredoor extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionHydrant.java

@@ -209,6 +209,16 @@ public class TPsInspectionHydrant extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionLift.java

@@ -180,6 +180,16 @@ public class TPsInspectionLift extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionMonitor.java

@@ -174,6 +174,16 @@ public class TPsInspectionMonitor extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionPit.java

@@ -162,6 +162,16 @@ public class TPsInspectionPit extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionRainvalve.java

@@ -159,6 +159,16 @@ public class TPsInspectionRainvalve extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionSteam.java

@@ -168,6 +168,16 @@ public class TPsInspectionSteam extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionSump.java

@@ -168,6 +168,16 @@ public class TPsInspectionSump extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionUtilitystation.java

@@ -174,6 +174,16 @@ public class TPsInspectionUtilitystation extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionVentvalve.java

@@ -168,6 +168,16 @@ public class TPsInspectionVentvalve extends BaseEntity {
 
     private String deptName;
 
+    private String plant;
+
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/resources/mybatis/ps/patrol/TPsPatrolPlanMapper.xml

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deadline != null "> and deadline = #{deadline}</if>
             <if test="checkedNum != null "> and checked_num = #{checkedNum}</if>
             <if test="uncheckedNum != null "> and unchecked_num = #{uncheckedNum}</if>
-            <if test="status != null "> and status = #{status}</if>
+            <if test="status != null "> and d.status = #{status}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->