guoenzhou 2 rokov pred
rodič
commit
54611e8647

+ 6 - 7
service-fire/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>usky-modules</artifactId>
         <groupId>com.usky</groupId>
@@ -8,12 +9,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>service-fire</artifactId>
-
-    <groupId>com.usky</groupId>
     <packaging>pom</packaging>
-    <version>service-fire</version>
 
-<modules>  <module>service-fire-biz</module>
-    <module>service-fire-api</module>
-  </modules>
+    <modules>
+        <module>service-fire-biz</module>
+        <module>service-fire-api</module>
+    </modules>
 </project>

+ 1 - 1
service-fire/service-fire-api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>service-fire</artifactId>
         <groupId>com.usky</groupId>
-        <version>service-fire</version>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 7 - 2
service-fire/service-fire-biz/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>service-fire</artifactId>
         <groupId>com.usky</groupId>
-        <version>service-fire</version>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,7 +27,6 @@
         <dependency>
             <groupId>com.usky</groupId>
             <artifactId>ruoyi-common-core</artifactId>
-            <version>0.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.usky</groupId>
@@ -35,6 +34,12 @@
             <version>0.0.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>usky-common-tenant</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
 
     </dependencies>
 

+ 120 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemoController.java

@@ -0,0 +1,120 @@
+package com.usky.fire.controller.web;
+
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.AlarmFire;
+import com.usky.fire.service.AlarmFireService;
+import com.usky.fire.service.vo.AlarmFireVo;
+import com.usky.fire.service.vo.PatrolInspectionSiteExportVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 事件管理-火警告警处置
+ *
+ * @author JCB
+ * @since 2022-07-29
+ */
+@RestController
+@RequestMapping("/alarmFire")
+public class AlarmFireController {
+
+    @Autowired
+    private AlarmFireService alarmFireService;
+
+    /**
+     * 事件管理-/火警告警处置/故障告警处置/隐患报警处理-火灾报警处置/-列表查询
+     *
+     * @param handlingStatus 处理状态(0、未处理 1、已处理)
+     * @param startDate      开始时间 格式:yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式:yyyy-MM-dd HH:mm:ss
+     * @param pageNum        当前页
+     * @param pageSize       每页条数
+     * @param alarmType      告警类型(2 火警、4 故障、16 监管等)
+     * @return
+     */
+    @GetMapping("alarmFireLowerList")
+    public ApiResult<CommonPage<AlarmFireVo>> alarmFireLowerList(@RequestParam(value = "handlingStatus", required = false) Integer handlingStatus,
+                                                                 @RequestParam(value = "alarmType", required = false) String alarmType,
+                                                                 @RequestParam(value = "startDate", required = false) String startDate,
+                                                                 @RequestParam(value = "endDate", required = false) String endDate,
+                                                                 @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                 @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(alarmFireService.alarmFireLowerList(handlingStatus, startDate, endDate, pageNum, pageSize, alarmType));
+    }
+
+
+    /**
+     * 事件管理-/火警告警处置/故障告警处置/隐患报警处理-火灾报警处置/-左侧数据统计
+     *
+     * @param alarmType 告警类型(2 火警、4 故障、16 监管等)
+     * @return
+     */
+    @GetMapping("fireStatistics")
+    public ApiResult<Map<String, Object>> fireStatistics(@RequestParam(value = "alarmType", required = false) String alarmType) {
+        return ApiResult.success(alarmFireService.fireStatistics(alarmType));
+    }
+
+
+    /**
+     * 事件管理-/火警告警处置/故障告警处置/隐患报警处理-火灾报警处置/-数据统计图
+     *
+     * @param alarmType 告警类型(2 火警、4 故障、16 监管等)
+     * @param startDate 开始时间  格式:yyyy-MM-dd HH:mm:ss
+     * @param endDate   结束时间  格式:yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    @GetMapping("fireStatisticalChart")
+    public ApiResult<Map<String, Object>> fireStatisticalChart(@RequestParam(value = "alarmType", required = false) String alarmType,
+                                                               @RequestParam(value = "startDate", required = false) String startDate,
+                                                               @RequestParam(value = "endDate", required = false) String endDate) {
+        return ApiResult.success(alarmFireService.fireStatisticalChart(alarmType, startDate, endDate));
+    }
+
+
+    /**
+     * 事件管理-/火警告警处置/故障告警处置/隐患报警处理-火灾报警处置/-告警处理
+     *
+     * @param alarmFire
+     * @return
+     */
+    @Log(title = "告警处理", businessType = BusinessType.UPDATE)
+    @PostMapping("updateAlarmFire")
+    public ApiResult<Void> updateAlarmFire(@RequestBody AlarmFire alarmFire) {
+        alarmFireService.updateAlarmFire(alarmFire);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 事件管理-/火警告警处置/故障告警处置/隐患报警处理-火灾报警处置/-导出
+     * @param response
+     * @param handlingStatus    处理状态(0、未处理 1、已处理)
+     * @param alarmType         告警类型(2 火警、4 故障、16 监管等)
+     * @param startDate         开始时间 格式:yyyy-MM-dd HH:mm:ss
+     * @param endDate           结束时间 格式:yyyy-MM-dd HH:mm:ss
+     * @param exportTitle       导出标题
+     * @throws IOException
+     */
+    @GetMapping("alarmFireLowerListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "handlingStatus", required = false) Integer handlingStatus,
+                       @RequestParam(value = "alarmType", required = false) String alarmType,
+                       @RequestParam(value = "startDate", required = false) String startDate,
+                       @RequestParam(value = "endDate", required = false) String endDate,
+                       @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
+        List<AlarmFireVo> list = alarmFireService.alarmFireLowerListExport(handlingStatus, startDate, endDate, alarmType);
+        ExcelUtil<AlarmFireVo> util = new ExcelUtil<AlarmFireVo>(AlarmFireVo.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+}
+