feat(ps):巡检

master/src/main/java/com/ruoyi/common/jpush/JiGuangPushService.java

@@ -73,7 +73,7 @@ public class JiGuangPushService {
         // 发送
         try {
             PushSendResult result = pushApi.send(param);
-            System.out.println("Push result: " + result);
+            log.info("Push result: {}", result);
         } catch (Exception e) {
             e.printStackTrace();
         }

master/src/main/java/com/ruoyi/project/common/CommonController.java

@@ -484,6 +484,60 @@ public class CommonController extends BaseController
         }else if( type.equals("rel_compo") ) {
             downloadname = "可靠性部件清单导入模板.xlsx";
             url = "static/template/reliability/rel_compo.xlsx";
+        }else if( type.equals("alarm") ) {
+            downloadname = "手动启动火灾报警器基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/alarm.xlsx";
+        }else if( type.equals("extinguisher") ) {
+            downloadname = "现场灭火器基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/extinguisher.xlsx";
+        }else if( type.equals("hydrant") ) {
+            downloadname = "地上消火栓和消防水带箱基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/hydrant.xlsx";
+        }else if( type.equals("firedoor") ) {
+            downloadname = "安全防火门防爆门基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/firedoor.xlsx";
+        }else if( type.equals("cabinet") ) {
+            downloadname = "玻璃门消火栓箱和泡沫栓箱基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/cabinet.xlsx";
+        }else if( type.equals("lift") ) {
+            downloadname = "电梯基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/lift.xlsx";
+        }else if( type.equals("callsystem") ) {
+            downloadname = "消防广播系统基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/callsystem.xlsx";
+        }else if( type.equals("fgs") ) {
+            downloadname = "可燃气体检测器基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/fgs.xlsx";
+        }else if( type.equals("curtain") ) {
+            downloadname = "防火卷帘基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/curtain.xlsx";
+        }else if( type.equals("steam") ) {
+            downloadname = "蒸汽灭火系统基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/steam.xlsx";
+        }else if( type.equals("monitor") ) {
+            downloadname = "消防炮基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/monitor.xlsx";
+        }else if( type.equals("coffer") ) {
+            downloadname = "消防沙箱基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/coffer.xlsx";
+        }else if( type.equals("eyewash") ) {
+            downloadname = "洗眼器基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/eyewash.xlsx";
+        }else if( type.equals("sump") ) {
+            downloadname = "集水井基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/sump.xlsx";
+        }else if( type.equals("pit") ) {
+            downloadname = "污水坑基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/pit.xlsx";
+        }else if( type.equals("rainvalve") ) {
+            downloadname = "雨水阀基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/rainvalve.xlsx";
+        }else if( type.equals("ventvalve") ) {
+            downloadname = "通风阀基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/ventvalve.xlsx";
+        }else if( type.equals("utilitystation") ) {
+            downloadname = "公用站基础信息导入模板.xlsx";
+            url = "static/template/ps/dev/utilitystation.xlsx";
         }
 
         InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(url);

master/src/main/java/com/ruoyi/project/ps/dev/domain/TPsDevExtinguisher.java

@@ -26,7 +26,7 @@ public class TPsDevExtinguisher extends BaseEntity {
      * 现场编号
      */
     @Excel(name = "现场编号")
-    private Long fireExtinguisherNo;
+    private String fireExtinguisherNo;
 
     /**
      * 现场位置
@@ -120,11 +120,11 @@ public class TPsDevExtinguisher extends BaseEntity {
         return id;
     }
 
-    public void setFireExtinguisherNo(Long fireExtinguisherNo) {
+    public void setFireExtinguisherNo(String fireExtinguisherNo) {
         this.fireExtinguisherNo = fireExtinguisherNo;
     }
 
-    public Long getFireExtinguisherNo() {
+    public String getFireExtinguisherNo() {
         return fireExtinguisherNo;
     }
 

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

@@ -17,7 +17,7 @@ import java.util.Date;
 public class TPsInspectionExtinguisher extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    public TPsInspectionExtinguisher(Long fireExtinguisherNo, String position, String fireExtinguisherModel, Long month, Long year, String createrCode, Long planId, String devType) {
+    public TPsInspectionExtinguisher(String fireExtinguisherNo, String position, String fireExtinguisherModel, Long month, Long year, String createrCode, Long planId, String devType) {
         this.fireExtinguisherNo = fireExtinguisherNo;
         this.position = position;
         this.fireExtinguisherModel = fireExtinguisherModel;
@@ -43,7 +43,7 @@ public class TPsInspectionExtinguisher extends BaseEntity {
      * 现场编号
      */
     @Excel(name = "现场编号")
-    private Long fireExtinguisherNo;
+    private String fireExtinguisherNo;
 
     /**
      * 现场位置
@@ -235,11 +235,11 @@ public class TPsInspectionExtinguisher extends BaseEntity {
         return id;
     }
 
-    public void setFireExtinguisherNo(Long fireExtinguisherNo) {
+    public void setFireExtinguisherNo(String fireExtinguisherNo) {
         this.fireExtinguisherNo = fireExtinguisherNo;
     }
 
-    public Long getFireExtinguisherNo() {
+    public String getFireExtinguisherNo() {
         return fireExtinguisherNo;
     }
 

master/src/main/java/com/ruoyi/project/ps/patrol/controller/TPsPatrolIssuesController.java

@@ -29,7 +29,7 @@ public class TPsPatrolIssuesController extends BaseController {
     /**
      * 查询检查问题记录列表
      */
-    @PreAuthorize("@ss.hasPermi('patrol:issues:list')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPsPatrolIssues tPsPatrolIssues) {
         startPage();
@@ -40,7 +40,7 @@ public class TPsPatrolIssuesController extends BaseController {
     /**
      * 导出检查问题记录列表
      */
-    @PreAuthorize("@ss.hasPermi('patrol:issues:list')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:list')")
     @Log(title = "检查问题记录", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TPsPatrolIssues tPsPatrolIssues) {
@@ -52,7 +52,7 @@ public class TPsPatrolIssuesController extends BaseController {
     /**
      * 获取检查问题记录详细信息
      */
-    @PreAuthorize("@ss.hasPermi('patrol:issues:query')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsPatrolIssuesService.selectTPsPatrolIssuesById(id));
@@ -61,7 +61,7 @@ public class TPsPatrolIssuesController extends BaseController {
     /**
      * 新增检查问题记录
      */
-    @PreAuthorize("@ss.hasPermi('patrol:issues:add')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:add')")
     @Log(title = "检查问题记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPsPatrolIssues tPsPatrolIssues) {
@@ -71,7 +71,7 @@ public class TPsPatrolIssuesController extends BaseController {
     /**
      * 修改检查问题记录
      */
-    @PreAuthorize("@ss.hasPermi('patrol:issues:edit')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:edit')")
     @Log(title = "检查问题记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPsPatrolIssues tPsPatrolIssues) {
@@ -81,7 +81,7 @@ public class TPsPatrolIssuesController extends BaseController {
     /**
      * 删除检查问题记录
      */
-    @PreAuthorize("@ss.hasPermi('patrol:issues:remove')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:remove')")
     @Log(title = "检查问题记录", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

master/src/main/java/com/ruoyi/project/ps/patrol/controller/TPsPatrolMainController.java

@@ -29,7 +29,7 @@ public class TPsPatrolMainController extends BaseController {
     /**
      * 查询检查策略列表
      */
-    @PreAuthorize("@ss.hasPermi('patrol:main:list')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPsPatrolMain tPsPatrolMain) {
         startPage();
@@ -37,7 +37,7 @@ public class TPsPatrolMainController extends BaseController {
         return getDataTable(list);
     }
 
-    @PreAuthorize("@ss.hasPermi('patrol:main:list')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:list')")
     @GetMapping("/listAll")
     public AjaxResult listAll(TPsPatrolMain tPsPatrolMain) {
         List<TPsPatrolMain> list = tPsPatrolMainService.selectTPsPatrolMainList(tPsPatrolMain);
@@ -47,7 +47,7 @@ public class TPsPatrolMainController extends BaseController {
     /**
      * 导出检查策略列表
      */
-    @PreAuthorize("@ss.hasPermi('patrol:main:list')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:list')")
     @Log(title = "检查策略", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TPsPatrolMain tPsPatrolMain) {
@@ -59,7 +59,7 @@ public class TPsPatrolMainController extends BaseController {
     /**
      * 获取检查策略详细信息
      */
-    @PreAuthorize("@ss.hasPermi('patrol:main:query')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsPatrolMainService.selectTPsPatrolMainById(id));
@@ -74,7 +74,7 @@ public class TPsPatrolMainController extends BaseController {
      *                      用于决定各月份字段的初始化方式
      * @return 返回操作结果，包含是否新增成功的信息
      */
-    @PreAuthorize("@ss.hasPermi('patrol:main:add')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:add')")
     @Log(title = "检查策略", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPsPatrolMain tPsPatrolMain) {
@@ -158,7 +158,7 @@ public class TPsPatrolMainController extends BaseController {
     /**
      * 修改检查策略
      */
-    @PreAuthorize("@ss.hasPermi('patrol:main:edit')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:edit')")
     @Log(title = "检查策略", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPsPatrolMain tPsPatrolMain) {
@@ -168,7 +168,7 @@ public class TPsPatrolMainController extends BaseController {
     /**
      * 删除检查策略
      */
-    @PreAuthorize("@ss.hasPermi('patrol:main:remove')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:remove')")
     @Log(title = "检查策略", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

master/src/main/java/com/ruoyi/project/ps/patrol/controller/TPsPatrolPlanController.java

@@ -153,7 +153,7 @@ public class TPsPatrolPlanController extends BaseController {
     /**
      * 查询检查计划列表
      */
-    @PreAuthorize("@ss.hasPermi('patrol:plan:list')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPsPatrolPlan tPsPatrolPlan) {
         startPage();
@@ -164,7 +164,7 @@ public class TPsPatrolPlanController extends BaseController {
     /**
      * 导出检查计划列表
      */
-    @PreAuthorize("@ss.hasPermi('patrol:plan:list')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:list')")
     @Log(title = "检查计划", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TPsPatrolPlan tPsPatrolPlan) {
@@ -176,7 +176,7 @@ public class TPsPatrolPlanController extends BaseController {
     /**
      * 获取检查计划详细信息
      */
-    @PreAuthorize("@ss.hasPermi('patrol:plan:query')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPsPatrolPlanService.selectTPsPatrolPlanById(id));
@@ -188,7 +188,7 @@ public class TPsPatrolPlanController extends BaseController {
      * @param tPsPatrolPlan 检查计划对象，包含计划的基本信息如年份、月份、巡检类型等
      * @return AjaxResult 返回操作结果，成功或失败提示信息
      */
-    @PreAuthorize("@ss.hasPermi('patrol:plan:add')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:add')")
     @Log(title = "检查计划", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPsPatrolPlan tPsPatrolPlan) {
@@ -415,7 +415,7 @@ public class TPsPatrolPlanController extends BaseController {
     /**
      * 修改检查计划
      */
-    @PreAuthorize("@ss.hasPermi('patrol:plan:edit')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:edit')")
     @Log(title = "检查计划", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPsPatrolPlan tPsPatrolPlan) {
@@ -425,7 +425,7 @@ public class TPsPatrolPlanController extends BaseController {
     /**
      * 删除检查计划
      */
-    @PreAuthorize("@ss.hasPermi('patrol:plan:remove')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:remove')")
     @Log(title = "检查计划", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
@@ -439,7 +439,7 @@ public class TPsPatrolPlanController extends BaseController {
      * @return AjaxResult 确认结果，成功或失败信息
      */
     @PutMapping("/confirm")
-    @PreAuthorize("@ss.hasPermi('patrol:plan:edit')")
+    @PreAuthorize("@ss.hasPermi('ps:patrol:edit')")
     @Log(title = "检查计划", businessType = BusinessType.UPDATE)
     public AjaxResult confirm(@RequestBody TPsPatrolPlan plan) {
         // 查询当前计划信息