feat(inspection): 新增巡检记录查询与详情获取接口

- 在多个巡检控制器中新增 /info 接口，用于根据设备编号和计划ID获取检查记录信息
- 优化 TPsInspectionAppController 的分页参数解析逻辑，支持从 data JSON 和请求参数中获取分页信息
- 新增 getInfoByType 方法，统一处理不同类型巡检记录的详情查询请求
- 引入 CollectionUtils 工具类进行集合判空操作，提升代码可读性
- 调整 TPsInspectionAppController 请求路径前缀为 /ps/app
- 修复分页参数获取方式，兼容多种传参场景并增加异常捕获
- 完善各设备类型 getInfo 接口校验逻辑，确保必要参数非空校验及错误提示
- 统一返回格式为 AjaxResult，并增强错误信息描述准确性

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -71,6 +72,24 @@ public class TPsInspectionAlarmController extends BaseController {
         return AjaxResult.success(tPsInspectionAlarmService.selectTPsInspectionAlarmById(id));
     }
 
+    /**
+     * 根据设备编号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByDevNo(TPsInspectionAlarm tPsInspectionAlarm) {
+        if (StringUtils.isNull(tPsInspectionAlarm.getDevNo()) || StringUtils.isNull(tPsInspectionAlarm.getPlanId())) {
+            return AjaxResult.error("位号或计划id不能为空！");
+        }
+        TPsInspectionAlarm item = new TPsInspectionAlarm();
+        item.setPlanId(tPsInspectionAlarm.getPlanId());
+        item.setDevNo(tPsInspectionAlarm.getDevNo());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionAlarm> list = tPsInspectionAlarmService.selectTPsInspectionAlarmList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
+
     /**
      * 新增手动启动火灾报警器检查记录
      */

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

@@ -1,6 +1,9 @@
 package com.ruoyi.project.ps.inspection.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -19,7 +22,7 @@ import java.util.Map;
  * @date 2025-01-XX
  */
 @RestController
-@RequestMapping("/ps/dev")
+@RequestMapping("/ps/app")
 public class TPsInspectionAppController extends BaseController {
 
     // 注入各个Controller
@@ -68,12 +71,66 @@ public class TPsInspectionAppController extends BaseController {
      */
     @GetMapping("/list")
     public AjaxResult list(InspectionQueryRequest request) {
-        if (request.getType() == null || request.getType().isEmpty()) {
+        if (StringUtils.isEmpty(request.getType())) {
             return AjaxResult.error("巡检记录类型不能为空");
         }
 
+        if (StringUtils.isEmpty(request.getData())) {
+            request.setData("{}");
+        }
+
         try {
-            TableDataInfo dataTable = queryByType(request.getType(), JSON.toJSONString(request));
+            // 解析分页参数
+            Integer pageNum = null;
+            Integer pageSize = null;
+            
+            // 先从 data JSON 中尝试获取分页参数
+            try {
+                JSONObject dataJson = JSON.parseObject(request.getData());
+                if (dataJson != null) {
+                    Object pageNumObj = dataJson.get("pageNum");
+                    Object pageSizeObj = dataJson.get("pageSize");
+                    if (pageNumObj != null) {
+                        pageNum = Integer.valueOf(pageNumObj.toString());
+                    }
+                    if (pageSizeObj != null) {
+                        pageSize = Integer.valueOf(pageSizeObj.toString());
+                    }
+                }
+            } catch (Exception e) {
+                logger.debug("解析 data JSON 中的分页参数失败", e);
+            }
+            
+            // 如果 data 中没有分页参数，尝试从请求参数中获取
+            if (pageNum == null || pageSize == null) {
+                try {
+                    com.ruoyi.common.utils.ServletUtils.getRequest();
+                    if (pageNum == null) {
+                        Integer paramPageNum = com.ruoyi.common.utils.ServletUtils.getParameterToInt("pageNum");
+                        if (paramPageNum != null) {
+                            pageNum = paramPageNum;
+                        }
+                    }
+                    if (pageSize == null) {
+                        Integer paramPageSize = com.ruoyi.common.utils.ServletUtils.getParameterToInt("pageSize");
+                        if (paramPageSize != null) {
+                            pageSize = paramPageSize;
+                        }
+                    }
+                } catch (Exception e) {
+                    logger.debug("从请求参数中获取分页参数失败", e);
+                }
+            }
+            
+            // 设置分页（必须在调用 queryByType 之前设置，因为 PageHelper 使用 ThreadLocal）
+            if (pageNum != null && pageSize != null) {
+                PageHelper.startPage(pageNum, pageSize);
+            } else {
+                // 如果没有分页参数，使用默认分页或调用 startPage() 从请求参数中获取
+                startPage();
+            }
+            
+            TableDataInfo dataTable = queryByType(request.getType(), request.getData());
             return AjaxResult.success(dataTable);
         } catch (Exception e) {
             logger.error("查询巡检记录失败", e);
@@ -81,6 +138,31 @@ public class TPsInspectionAppController extends BaseController {
         }
     }
 
+    /**
+     * 获取巡检记录详细信息（App接口）
+     * 根据设备编号/位号和计划ID获取检查记录信息
+     *
+     * @param request 查询请求参数（包含type、devNo/boxNo/equipId等和planId）
+     * @return 查询结果
+     */
+    @GetMapping("/info")
+    public AjaxResult getInfo(InspectionQueryRequest request) {
+        if (StringUtils.isEmpty(request.getType())) {
+            return AjaxResult.error("巡检记录类型不能为空");
+        }
+
+        if (StringUtils.isEmpty(request.getData())) {
+            request.setData("{}");
+        }
+
+        try {
+            return getInfoByType(request.getType(), request.getData());
+        } catch (Exception e) {
+            logger.error("获取巡检记录失败", e);
+            return AjaxResult.error("获取失败：" + e.getMessage());
+        }
+    }
+
     /**
      * 修改巡检记录（App接口）
      *
@@ -186,6 +268,90 @@ public class TPsInspectionAppController extends BaseController {
         }
     }
 
+    /**
+     * 根据类型获取数据，调用对应Controller的getInfo方法
+     */
+    private AjaxResult getInfoByType(String type, String dataJson) {
+        type = type.toLowerCase();
+
+        switch (type) {
+            case "alarm":
+                TPsInspectionAlarm alarm = (TPsInspectionAlarm) setFilterFields(dataJson, TPsInspectionAlarm.class);
+                return alarmController.getInfoByDevNo(alarm);
+
+            case "extinguisher":
+                TPsInspectionExtinguisher extinguisher = (TPsInspectionExtinguisher) setFilterFields(dataJson, TPsInspectionExtinguisher.class);
+                return extinguisherController.getInfoByFireextinguisherno(extinguisher);
+
+            case "hydrant":
+                TPsInspectionHydrant hydrant = (TPsInspectionHydrant) setFilterFields(dataJson, TPsInspectionHydrant.class);
+                return hydrantController.getInfoByEquipid(hydrant);
+
+            case "firedoor":
+                TPsInspectionFiredoor firedoor = (TPsInspectionFiredoor) setFilterFields(dataJson, TPsInspectionFiredoor.class);
+                return firedoorController.getInfoByDoorno(firedoor);
+
+            case "lift":
+                TPsInspectionLift lift = (TPsInspectionLift) setFilterFields(dataJson, TPsInspectionLift.class);
+                return liftController.getInfoByDevno(lift);
+
+            case "cabinet":
+                TPsInspectionCabinet cabinet = (TPsInspectionCabinet) setFilterFields(dataJson, TPsInspectionCabinet.class);
+                return cabinetController.getInfoByBoxNo(cabinet);
+
+            case "callsystem":
+                TPsInspectionCallsystem callsystem = (TPsInspectionCallsystem) setFilterFields(dataJson, TPsInspectionCallsystem.class);
+                return callsystemController.getInfoByDevno(callsystem);
+
+            case "fgs":
+                TPsInspectionFgs fgs = (TPsInspectionFgs) setFilterFields(dataJson, TPsInspectionFgs.class);
+                return fgsController.getInfoByFgsno(fgs);
+
+            case "curtain":
+                TPsInspectionCurtain curtain = (TPsInspectionCurtain) setFilterFields(dataJson, TPsInspectionCurtain.class);
+                return curtainController.getInfoByCurtainname(curtain);
+
+            case "steam":
+                TPsInspectionSteam steam = (TPsInspectionSteam) setFilterFields(dataJson, TPsInspectionSteam.class);
+                return steamController.getInfoBySteamname(steam);
+
+            case "monitor":
+                TPsInspectionMonitor monitor = (TPsInspectionMonitor) setFilterFields(dataJson, TPsInspectionMonitor.class);
+                return monitorController.getInfoByDevno(monitor);
+
+            case "coffer":
+                TPsInspectionCoffer coffer = (TPsInspectionCoffer) setFilterFields(dataJson, TPsInspectionCoffer.class);
+                return cofferController.getInfoByCofferno(coffer);
+
+            case "sump":
+                TPsInspectionSump sump = (TPsInspectionSump) setFilterFields(dataJson, TPsInspectionSump.class);
+                return sumpController.getInfoBySumpno(sump);
+
+            case "pit":
+                TPsInspectionPit pit = (TPsInspectionPit) setFilterFields(dataJson, TPsInspectionPit.class);
+                return pitController.getInfoByDevno(pit);
+
+            case "rainvalve":
+                TPsInspectionRainvalve rainvalve = (TPsInspectionRainvalve) setFilterFields(dataJson, TPsInspectionRainvalve.class);
+                return rainvalveController.getInfoByValvename(rainvalve);
+
+            case "ventvalve":
+                TPsInspectionVentvalve ventvalve = (TPsInspectionVentvalve) setFilterFields(dataJson, TPsInspectionVentvalve.class);
+                return ventvalveController.getInfoByVentvalveno(ventvalve);
+
+            case "utilitystation":
+                TPsInspectionUtilitystation utilitystation = (TPsInspectionUtilitystation) setFilterFields(dataJson, TPsInspectionUtilitystation.class);
+                return utilitystationController.getInfoByUtilitystationname(utilitystation);
+
+            case "eyewash":
+                TPsInspectionEyewash eyewash = (TPsInspectionEyewash) setFilterFields(dataJson, TPsInspectionEyewash.class);
+                return eyewashController.getInfoByDevno(eyewash);
+
+            default:
+                throw new IllegalArgumentException("不支持的巡检记录类型：" + type);
+        }
+    }
+
     /**
      * 根据类型更新数据，调用对应Controller的edit方法
      */

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -71,6 +72,24 @@ public class TPsInspectionCabinetController extends BaseController {
         return AjaxResult.success(tPsInspectionCabinetService.selectTPsInspectionCabinetById(id));
     }
 
+    /**
+     * 根据编号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByBoxNo(TPsInspectionCabinet tPsInspectionCabinet) {
+        if (StringUtils.isNull(tPsInspectionCabinet.getBoxNo()) || StringUtils.isNull(tPsInspectionCabinet.getPlanId())) {
+            return AjaxResult.error("编号或计划id不能为空！");
+        }
+        TPsInspectionCabinet item = new TPsInspectionCabinet();
+        item.setPlanId(tPsInspectionCabinet.getPlanId());
+        item.setBoxNo(tPsInspectionCabinet.getBoxNo());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionCabinet> list = tPsInspectionCabinetService.selectTPsInspectionCabinetList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
+
     /**
      * 新增玻璃门消火栓箱和泡沫栓箱检查记录
      */

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionCallsystemController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionCallsystemService.selectTPsInspectionCallsystemById(id));
     }
+    /**
+     * 根据位号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByDevno(TPsInspectionCallsystem tPsInspectionCallsystem) {
+        if (StringUtils.isNull(tPsInspectionCallsystem.getDevNo()) || StringUtils.isNull(tPsInspectionCallsystem.getPlanId())) {
+            return AjaxResult.error("位号或计划id不能为空！");
+        }
+        TPsInspectionCallsystem item = new TPsInspectionCallsystem();
+        item.setPlanId(tPsInspectionCallsystem.getPlanId());
+        item.setDevNo(tPsInspectionCallsystem.getDevNo());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionCallsystem> list = tPsInspectionCallsystemService.selectTPsInspectionCallsystemList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增现场呼叫系统检查记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionCofferController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionCofferService.selectTPsInspectionCofferById(id));
     }
+    /**
+     * 根据编号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByCofferno(TPsInspectionCoffer tPsInspectionCoffer) {
+        if (StringUtils.isNull(tPsInspectionCoffer.getCofferNo()) || StringUtils.isNull(tPsInspectionCoffer.getPlanId())) {
+            return AjaxResult.error("编号或计划id不能为空！");
+        }
+        TPsInspectionCoffer item = new TPsInspectionCoffer();
+        item.setPlanId(tPsInspectionCoffer.getPlanId());
+        item.setCofferNo(tPsInspectionCoffer.getCofferNo());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionCoffer> list = tPsInspectionCofferService.selectTPsInspectionCofferList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增围堰检查记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionCurtainController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionCurtainService.selectTPsInspectionCurtainById(id));
     }
+    /**
+     * 根据名称和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByCurtainname(TPsInspectionCurtain tPsInspectionCurtain) {
+        if (StringUtils.isNull(tPsInspectionCurtain.getCurtainName()) || StringUtils.isNull(tPsInspectionCurtain.getPlanId())) {
+            return AjaxResult.error("名称或计划id不能为空！");
+        }
+        TPsInspectionCurtain item = new TPsInspectionCurtain();
+        item.setPlanId(tPsInspectionCurtain.getPlanId());
+        item.setCurtainName(tPsInspectionCurtain.getCurtainName());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionCurtain> list = tPsInspectionCurtainService.selectTPsInspectionCurtainList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增现场消防水幕检测记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionExtinguisherController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionExtinguisherService.selectTPsInspectionExtinguisherById(id));
     }
+    /**
+     * 根据编号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByFireextinguisherno(TPsInspectionExtinguisher tPsInspectionExtinguisher) {
+        if (StringUtils.isNull(tPsInspectionExtinguisher.getFireExtinguisherNo()) || StringUtils.isNull(tPsInspectionExtinguisher.getPlanId())) {
+            return AjaxResult.error("编号或计划id不能为空！");
+        }
+        TPsInspectionExtinguisher item = new TPsInspectionExtinguisher();
+        item.setPlanId(tPsInspectionExtinguisher.getPlanId());
+        item.setFireExtinguisherNo(tPsInspectionExtinguisher.getFireExtinguisherNo());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionExtinguisher> list = tPsInspectionExtinguisherService.selectTPsInspectionExtinguisherList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增现场灭火器检查记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionEyewashController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionEyewashService.selectTPsInspectionEyewashById(id));
     }
+    /**
+     * 根据位号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByDevno(TPsInspectionEyewash tPsInspectionEyewash) {
+        if (StringUtils.isNull(tPsInspectionEyewash.getDevNo()) || StringUtils.isNull(tPsInspectionEyewash.getPlanId())) {
+            return AjaxResult.error("位号或计划id不能为空！");
+        }
+        TPsInspectionEyewash item = new TPsInspectionEyewash();
+        item.setPlanId(tPsInspectionEyewash.getPlanId());
+        item.setDevNo(tPsInspectionEyewash.getDevNo());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionEyewash> list = tPsInspectionEyewashService.selectTPsInspectionEyewashList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增洗眼器巡检记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionFgsController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionFgsService.selectTPsInspectionFgsById(id));
     }
+    /**
+     * 根据编号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByFgsno(TPsInspectionFgs tPsInspectionFgs) {
+        if (StringUtils.isNull(tPsInspectionFgs.getFgsNo()) || StringUtils.isNull(tPsInspectionFgs.getPlanId())) {
+            return AjaxResult.error("编号或计划id不能为空！");
+        }
+        TPsInspectionFgs item = new TPsInspectionFgs();
+        item.setPlanId(tPsInspectionFgs.getPlanId());
+        item.setFgsNo(tPsInspectionFgs.getFgsNo());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionFgs> list = tPsInspectionFgsService.selectTPsInspectionFgsList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增FGS Mini板检查记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionFiredoorController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionFiredoorService.selectTPsInspectionFiredoorById(id));
     }
+    /**
+     * 根据门号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByDoorno(TPsInspectionFiredoor tPsInspectionFiredoor) {
+        if (StringUtils.isNull(tPsInspectionFiredoor.getDoorNo()) || StringUtils.isNull(tPsInspectionFiredoor.getPlanId())) {
+            return AjaxResult.error("门号或计划id不能为空！");
+        }
+        TPsInspectionFiredoor item = new TPsInspectionFiredoor();
+        item.setPlanId(tPsInspectionFiredoor.getPlanId());
+        item.setDoorNo(tPsInspectionFiredoor.getDoorNo());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionFiredoor> list = tPsInspectionFiredoorService.selectTPsInspectionFiredoorList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增安全防火门防爆门检查记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionHydrantController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionHydrantService.selectTPsInspectionHydrantById(id));
     }
+    /**
+     * 根据器材编号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByEquipid(TPsInspectionHydrant tPsInspectionHydrant) {
+        if (StringUtils.isNull(tPsInspectionHydrant.getEquipId()) || StringUtils.isNull(tPsInspectionHydrant.getPlanId())) {
+            return AjaxResult.error("器材编号或计划id不能为空！");
+        }
+        TPsInspectionHydrant item = new TPsInspectionHydrant();
+        item.setPlanId(tPsInspectionHydrant.getPlanId());
+        item.setEquipId(tPsInspectionHydrant.getEquipId());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionHydrant> list = tPsInspectionHydrantService.selectTPsInspectionHydrantList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增地上消火栓和消防水带箱检查记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionLiftController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionLiftService.selectTPsInspectionLiftById(id));
     }
+    /**
+     * 根据位号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByDevno(TPsInspectionLift tPsInspectionLift) {
+        if (StringUtils.isNull(tPsInspectionLift.getDevNo()) || StringUtils.isNull(tPsInspectionLift.getPlanId())) {
+            return AjaxResult.error("位号或计划id不能为空！");
+        }
+        TPsInspectionLift item = new TPsInspectionLift();
+        item.setPlanId(tPsInspectionLift.getPlanId());
+        item.setDevNo(tPsInspectionLift.getDevNo());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionLift> list = tPsInspectionLiftService.selectTPsInspectionLiftList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增电梯检查记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionMonitorController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionMonitorService.selectTPsInspectionMonitorById(id));
     }
+    /**
+     * 根据位号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByDevno(TPsInspectionMonitor tPsInspectionMonitor) {
+        if (StringUtils.isNull(tPsInspectionMonitor.getDevNo()) || StringUtils.isNull(tPsInspectionMonitor.getPlanId())) {
+            return AjaxResult.error("位号或计划id不能为空！");
+        }
+        TPsInspectionMonitor item = new TPsInspectionMonitor();
+        item.setPlanId(tPsInspectionMonitor.getPlanId());
+        item.setDevNo(tPsInspectionMonitor.getDevNo());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionMonitor> list = tPsInspectionMonitorService.selectTPsInspectionMonitorList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增现场消防炮检查记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionPitController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionPitService.selectTPsInspectionPitById(id));
     }
+    /**
+     * 根据位号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByDevno(TPsInspectionPit tPsInspectionPit) {
+        if (StringUtils.isNull(tPsInspectionPit.getDevNo()) || StringUtils.isNull(tPsInspectionPit.getPlanId())) {
+            return AjaxResult.error("位号或计划id不能为空！");
+        }
+        TPsInspectionPit item = new TPsInspectionPit();
+        item.setPlanId(tPsInspectionPit.getPlanId());
+        item.setDevNo(tPsInspectionPit.getDevNo());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionPit> list = tPsInspectionPitService.selectTPsInspectionPitList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增现场地井检查记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionRainvalveController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionRainvalveService.selectTPsInspectionRainvalveById(id));
     }
+    /**
+     * 根据名称和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByValvename(TPsInspectionRainvalve tPsInspectionRainvalve) {
+        if (StringUtils.isNull(tPsInspectionRainvalve.getValveName()) || StringUtils.isNull(tPsInspectionRainvalve.getPlanId())) {
+            return AjaxResult.error("名称或计划id不能为空！");
+        }
+        TPsInspectionRainvalve item = new TPsInspectionRainvalve();
+        item.setPlanId(tPsInspectionRainvalve.getPlanId());
+        item.setValveName(tPsInspectionRainvalve.getValveName());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionRainvalve> list = tPsInspectionRainvalveService.selectTPsInspectionRainvalveList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增污水/雨排切换阀门检查

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionSteamController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionSteamService.selectTPsInspectionSteamById(id));
     }
+    /**
+     * 根据名称和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoBySteamname(TPsInspectionSteam tPsInspectionSteam) {
+        if (StringUtils.isNull(tPsInspectionSteam.getSteamName()) || StringUtils.isNull(tPsInspectionSteam.getPlanId())) {
+            return AjaxResult.error("名称或计划id不能为空！");
+        }
+        TPsInspectionSteam item = new TPsInspectionSteam();
+        item.setPlanId(tPsInspectionSteam.getPlanId());
+        item.setSteamName(tPsInspectionSteam.getSteamName());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionSteam> list = tPsInspectionSteamService.selectTPsInspectionSteamList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增消防蒸汽系统检查记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionSumpController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionSumpService.selectTPsInspectionSumpById(id));
     }
+    /**
+     * 根据编号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoBySumpno(TPsInspectionSump tPsInspectionSump) {
+        if (StringUtils.isNull(tPsInspectionSump.getSumpNo()) || StringUtils.isNull(tPsInspectionSump.getPlanId())) {
+            return AjaxResult.error("编号或计划id不能为空！");
+        }
+        TPsInspectionSump item = new TPsInspectionSump();
+        item.setPlanId(tPsInspectionSump.getPlanId());
+        item.setSumpNo(tPsInspectionSump.getSumpNo());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionSump> list = tPsInspectionSumpService.selectTPsInspectionSumpList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增雨排井检查记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionUtilitystationController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionUtilitystationService.selectTPsInspectionUtilitystationById(id));
     }
+    /**
+     * 根据编号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByUtilitystationname(TPsInspectionUtilitystation tPsInspectionUtilitystation) {
+        if (StringUtils.isNull(tPsInspectionUtilitystation.getUtilityStationName()) || StringUtils.isNull(tPsInspectionUtilitystation.getPlanId())) {
+            return AjaxResult.error("编号或计划id不能为空！");
+        }
+        TPsInspectionUtilitystation item = new TPsInspectionUtilitystation();
+        item.setPlanId(tPsInspectionUtilitystation.getPlanId());
+        item.setUtilityStationName(tPsInspectionUtilitystation.getUtilityStationName());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionUtilitystation> list = tPsInspectionUtilitystationService.selectTPsInspectionUtilitystationList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增公用站检查记录

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolIssues;
 import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,23 @@ public class TPsInspectionVentvalveController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsInspectionVentvalveService.selectTPsInspectionVentvalveById(id));
     }
+    /**
+     * 根据编号和计划ID获取检查记录信息（App接口）
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfoByVentvalveno(TPsInspectionVentvalve tPsInspectionVentvalve) {
+        if (StringUtils.isNull(tPsInspectionVentvalve.getVentvalveNo()) || StringUtils.isNull(tPsInspectionVentvalve.getPlanId())) {
+            return AjaxResult.error("编号或计划id不能为空！");
+        }
+        TPsInspectionVentvalve item = new TPsInspectionVentvalve();
+        item.setPlanId(tPsInspectionVentvalve.getPlanId());
+        item.setVentvalveNo(tPsInspectionVentvalve.getVentvalveNo());
+        item.setIssuesFlag(0L);
+        List<TPsInspectionVentvalve> list = tPsInspectionVentvalveService.selectTPsInspectionVentvalveList(item);
+        if (CollectionUtils.isNotEmpty(list))
+            return AjaxResult.success(list.get(0));
+        return AjaxResult.error("此设备不在当前巡检计划中!");
+    }
 
     /**
      * 新增余压阀检查记录

master/src/main/java/com/ruoyi/project/ps/inspection/dto/InspectionQueryRequest.java

@@ -16,65 +16,15 @@ public class InspectionQueryRequest extends BaseEntity {
      */
     private String type;
 
-    /**
-     * 记录ID
-     */
-    private Long id;
-
-    /**
-     * 设备编号/位号
-     */
-    private String devNo;
-
-    /**
-     * 位置
-     */
-    private String position;
-
-    /**
-     * 月份
-     */
-    private Long month;
-
-    /**
-     * 年份
-     */
-    private Long year;
-
-    /**
-     * 计划ID
-     */
-    private Long planId;
-
-    /**
-     * 部门ID
-     */
-    private Long deptId;
-
-    /**
-     * 检查状态
-     */
-    private String checkStatus;
-
-    /**
-     * 问题状态
-     */
-    private Long issuesStatus;
+    private String data;
 
-    /**
-     * 问题标志
-     */
-    private Long issuesFlag;
-
-    /**
-     * 页码
-     */
-    private Integer pageNum;
+    public String getData() {
+        return data;
+    }
 
-    /**
-     * 每页数量
-     */
-    private Integer pageSize;
+    public void setData(String data) {
+        this.data = data;
+    }
 
     public String getType() {
         return type;
@@ -83,101 +33,5 @@ public class InspectionQueryRequest extends BaseEntity {
     public void setType(String type) {
         this.type = type;
     }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getDevNo() {
-        return devNo;
-    }
-
-    public void setDevNo(String devNo) {
-        this.devNo = devNo;
-    }
-
-    public String getPosition() {
-        return position;
-    }
-
-    public void setPosition(String position) {
-        this.position = position;
-    }
-
-    public Long getMonth() {
-        return month;
-    }
-
-    public void setMonth(Long month) {
-        this.month = month;
-    }
-
-    public Long getYear() {
-        return year;
-    }
-
-    public void setYear(Long year) {
-        this.year = year;
-    }
-
-    public Long getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(Long planId) {
-        this.planId = planId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getCheckStatus() {
-        return checkStatus;
-    }
-
-    public void setCheckStatus(String checkStatus) {
-        this.checkStatus = checkStatus;
-    }
-
-    public Long getIssuesStatus() {
-        return issuesStatus;
-    }
-
-    public void setIssuesStatus(Long issuesStatus) {
-        this.issuesStatus = issuesStatus;
-    }
-
-    public Long getIssuesFlag() {
-        return issuesFlag;
-    }
-
-    public void setIssuesFlag(Long issuesFlag) {
-        this.issuesFlag = issuesFlag;
-    }
-
-    public Integer getPageNum() {
-        return pageNum;
-    }
-
-    public void setPageNum(Integer pageNum) {
-        this.pageNum = pageNum;
-    }
-
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
 }
 

ui/src/views/ps/inspection/extinguisher/index.vue

@@ -85,14 +85,18 @@
       <el-table-column label="现场编号" align="center" prop="fireExtinguisherNo" :show-overflow-tooltip="true"/>
       <el-table-column label="现场位置" align="center" prop="position" :show-overflow-tooltip="true"/>
       <el-table-column label="灭火器型号" align="center" prop="fireExtinguisherModel" :show-overflow-tooltip="true"/>
-      <el-table-column label="No.1" align="center" prop="check1" :show-overflow-tooltip="true"/>
-      <el-table-column label="No.2" align="center" prop="check2" :show-overflow-tooltip="true"/>
-      <el-table-column label="No.3" align="center" prop="check3" :show-overflow-tooltip="true"/>
-      <el-table-column label="No.4" align="center" prop="check4" :show-overflow-tooltip="true"/>
-      <el-table-column label="No.1" align="center" prop="weight1" :show-overflow-tooltip="true"/>
-      <el-table-column label="No.2" align="center" prop="weight2" :show-overflow-tooltip="true"/>
-      <el-table-column label="No.3" align="center" prop="weight3" :show-overflow-tooltip="true"/>
-      <el-table-column label="No.4" align="center" prop="weight4" :show-overflow-tooltip="true"/>
+      <el-table-column label="检查结果正常打√异常打×，并在备注栏写明具体情况" align="center">
+        <el-table-column label="No.1" align="center" prop="check1" :show-overflow-tooltip="true"/>
+        <el-table-column label="No.2" align="center" prop="check2" :show-overflow-tooltip="true"/>
+        <el-table-column label="No.3" align="center" prop="check3" :show-overflow-tooltip="true"/>
+        <el-table-column label="No.4" align="center" prop="check4" :show-overflow-tooltip="true"/>
+      </el-table-column>
+      <el-table-column label="称重重量（kg）" align="center">
+        <el-table-column label="No.1" align="center" prop="weight1" :show-overflow-tooltip="true"/>
+        <el-table-column label="No.2" align="center" prop="weight2" :show-overflow-tooltip="true"/>
+        <el-table-column label="No.3" align="center" prop="weight3" :show-overflow-tooltip="true"/>
+        <el-table-column label="No.4" align="center" prop="weight4" :show-overflow-tooltip="true"/>
+      </el-table-column>
       <el-table-column label="灭火器类型" align="center" prop="devType" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.devType === '1' ? '常规' : scope.row.devType === '2' ? '二氧化碳' : '' }}</span>