事件管理-火灾告警处置相关接口开发

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AlarmFireController.java

@@ -1,9 +1,14 @@
 package com.usky.fire.controller.web;
 
 
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.fire.service.AlarmFireService;
+import com.usky.fire.service.vo.AlarmFireVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -17,12 +22,16 @@ import org.springframework.web.bind.annotation.RestController;
 public class AlarmFireController {
 
     @Autowired
-    private AlarmFireService fireAlarmService;
+    private AlarmFireService alarmFireService;
 
-//    @GetMapping("fireAlarmList")
-//    public ApiResult<PageInfo<FireAlarm>> fireAlarmList() {
-//        return ApiResult.success(fireAlarmService.fireAlarmList());
-//    }
+    @GetMapping("alarmFireLowerList")
+    public ApiResult<CommonPage<AlarmFireVo>> alarmFireLowerList(@RequestParam(value = "handlingStatus", required = false) Integer handlingStatus,
+                                                                 @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));
+    }
 
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionAreaController.java

@@ -2,6 +2,7 @@ package com.usky.fire.controller.web;
 
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.fire.domain.PatrolInspectionArea;
 import com.usky.fire.service.PatrolInspectionAreaService;
 import com.usky.fire.service.vo.PatrolInspectionAreaVo;
@@ -38,6 +39,7 @@ public class PatrolInspectionAreaController {
 
     /**
      * 巡查自检-巡检区域-子区域新增
+     *
      * @param patrolInspectionArea
      * @return
      */
@@ -81,10 +83,10 @@ public class PatrolInspectionAreaController {
      * @return
      */
     @GetMapping("patrolInspectionAreaList")
-    public ApiResult<List<PatrolInspectionArea>> patrolInspectionAreaList(@RequestParam(value = "areaName", required = false) String areaName,
-                                                                          @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
-                                                                          @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                                                          @RequestParam(value = "id", required = false, defaultValue = "0") Integer id) {
+    public ApiResult<CommonPage<PatrolInspectionArea>> patrolInspectionAreaList(@RequestParam(value = "areaName", required = false) String areaName,
+                                                                                @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                                @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                                                                @RequestParam(value = "id", required = false, defaultValue = "0") Integer id) {
         return ApiResult.success(patrolInspectionAreaService.patrolInspectionAreaList(id, areaName, pageNum, pageSize));
     }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/AlarmFireService.java

@@ -1,7 +1,11 @@
 package com.usky.fire.service;
 
-import com.usky.fire.domain.AlarmFire;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.AlarmFire;
+import com.usky.fire.service.vo.AlarmFireVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,5 +17,7 @@ import com.usky.common.mybatis.core.CrudService;
  */
 public interface AlarmFireService extends CrudService<AlarmFire> {
 
-//    PageInfo<FireAlarm> fireAlarmList();
+    CommonPage<AlarmFireVo> alarmFireLowerList(Integer handlingStatus, String startDate, String endDate, Integer pageNum, Integer pageSize);
+
+    CommonPage<AlarmFire> alarmFireList(List<String> deviceCodeList, Integer handlingStatus, String startDate, String endDate, Integer pageNum, Integer pageSize);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PatrolInspectionAreaService.java

@@ -25,7 +25,7 @@ public interface PatrolInspectionAreaService extends CrudService<PatrolInspectio
 
     void delPatrolInspectionArea(Integer id);
 
-    List<PatrolInspectionArea> patrolInspectionAreaList(Integer id, String areaName, Integer pageNum, Integer pageSize);
+    CommonPage<PatrolInspectionArea> patrolInspectionAreaList(Integer id, String areaName, Integer pageNum, Integer pageSize);
 
     List<PatrolInspectionArea> patrolInspectionAreaSelect(Integer areaFid);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/AlarmFireServiceImpl.java

@@ -3,13 +3,17 @@ package com.usky.fire.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.fire.domain.AlarmFire;
 import com.usky.fire.mapper.AlarmFireMapper;
 import com.usky.fire.service.AlarmFireService;
-import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.service.util.OnlineMethod;
+import com.usky.fire.service.vo.AlarmFireVo;
+import com.usky.system.model.LoginUser;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -23,25 +27,65 @@ import java.util.List;
 @Service
 public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, AlarmFire> implements AlarmFireService {
 
+    public CommonPage<AlarmFireVo> alarmFireLowerList(Integer handlingStatus, String startDate, String endDate, Integer pageNum, Integer pageSize) {
+        String userType = null;
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null && !"".equals(loginUser)) {
+            userType = loginUser.getUserType();
+        }
+        //缺少维保单位部分代码
+        List<String> devcieCodeList = new ArrayList<>();
+        CommonPage<AlarmFire> alarmFireList = this.alarmFireList(devcieCodeList, handlingStatus, startDate, endDate, pageNum, pageSize);
+        List<AlarmFireVo> list = new ArrayList<>();
+        for (int i = 0; i < alarmFireList.getRecords().size(); i++) {
+            AlarmFireVo alarmFireVo = new AlarmFireVo();
+            alarmFireVo.setId(alarmFireList.getRecords().get(i).getId());
+            alarmFireVo.setAlarmType(alarmFireList.getRecords().get(i).getAlarmType());
+            alarmFireVo.setAlarmTime(alarmFireList.getRecords().get(i).getAlarmTime());
+            alarmFireVo.setAddress(alarmFireList.getRecords().get(i).getAddress());
+            alarmFireVo.setAlarmStatus(alarmFireList.getRecords().get(i).getAlarmStatus());
+            alarmFireVo.setOriginalType(alarmFireList.getRecords().get(i).getOriginalType());
+            alarmFireVo.setAlarmName(alarmFireList.getRecords().get(i).getAlarmName());
+            alarmFireVo.setOriginalPoint(alarmFireList.getRecords().get(i).getOriginalPoint());
+            alarmFireVo.setPointType(alarmFireList.getRecords().get(i).getPointType());
+            alarmFireVo.setPointDescribe(alarmFireList.getRecords().get(i).getPointDescribe());
+            alarmFireVo.setPortNum(alarmFireList.getRecords().get(i).getPortNum());
+            alarmFireVo.setHostNum(alarmFireList.getRecords().get(i).getHostNum());
+            alarmFireVo.setLoopNum(alarmFireList.getRecords().get(i).getLoopNum());
+            alarmFireVo.setPtNum(alarmFireList.getRecords().get(i).getPtNum());
+            alarmFireVo.setHandler(alarmFireList.getRecords().get(i).getHandler());
+            alarmFireVo.setHandlingTime(alarmFireList.getRecords().get(i).getHandlingTime());
+            alarmFireVo.setHandlingContent(alarmFireList.getRecords().get(i).getHandlingContent());
+            alarmFireVo.setHandlerPhone(alarmFireList.getRecords().get(i).getHandlerPhone());
+            alarmFireVo.setHandlingStatus(alarmFireList.getRecords().get(i).getHandlingStatus());
+            alarmFireVo.setFalseAlarm(alarmFireList.getRecords().get(i).getFalseAlarm());
+            alarmFireVo.setSitePhoto(alarmFireList.getRecords().get(i).getSitePhoto());
+            alarmFireVo.setCompanyName("未定义单位表");
+            list.add(alarmFireVo);
+        }
+        return new CommonPage<>(list, alarmFireList.getTotal(), alarmFireList.getSize(), alarmFireList.getSize());
+    }
 
-//    @Override
+    @Override
     public CommonPage<AlarmFire> alarmFireList(List<String> deviceCodeList, Integer handlingStatus, String startDate, String endDate, Integer pageNum, Integer pageSize) {
         LambdaQueryWrapper<AlarmFire> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.in(AlarmFire::getDeviceCode,deviceCodeList);
-        if (handlingStatus!=null){
-            queryWrapper.eq(AlarmFire::getHandlingStatus,handlingStatus);
+        if (deviceCodeList.size() > 0) {
+            queryWrapper.in(AlarmFire::getDeviceCode, deviceCodeList);
+        }
+        if (handlingStatus != null) {
+            queryWrapper.eq(AlarmFire::getHandlingStatus, handlingStatus);
         }
 
-        if (startDate!=null&&!"".equals(startDate)&&endDate!=null&&!"".equals(endDate)){
+        if (startDate != null && !"".equals(startDate) && endDate != null && !"".equals(endDate)) {
             queryWrapper.between(AlarmFire::getAlarmTime, startDate, endDate);
         }
         int total = this.count(queryWrapper);
         queryWrapper.orderByDesc(AlarmFire::getId);
-        if (pageNum!=null&&pageNum!=0&&pageSize!=null&&pageSize!=0){
-            Integer startFate = OnlineMethod.getStartFate(pageNum,pageSize);
-            queryWrapper.last("limit "+startFate+",pageSize ");
+        if (pageNum != null && pageNum != 0 && pageSize != null && pageSize != 0) {
+            Integer startFate = OnlineMethod.getStartFate(pageNum, pageSize);
+            queryWrapper.last("limit " + startFate + ","+pageSize);
         }
         List<AlarmFire> list = this.list(queryWrapper);
-        return new CommonPage<>(list, total, pageSize,pageNum);
+        return new CommonPage<>(list, total, pageSize, pageNum);
     }
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionAreaServiceImpl.java

@@ -2,12 +2,14 @@ package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.fire.domain.PatrolInspectionArea;
 import com.usky.fire.mapper.PatrolInspectionAreaMapper;
 import com.usky.fire.service.PatrolInspectionAreaService;
+import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.PatrolInspectionAreaVo;
 import com.usky.system.model.LoginUser;
 import org.springframework.stereotype.Service;
@@ -119,7 +121,7 @@ public class PatrolInspectionAreaServiceImpl extends AbstractCrudService<PatrolI
      * @param pageSize 每页条数
      * @return
      */
-    public List<PatrolInspectionArea> patrolInspectionAreaList(Integer id, String areaName, Integer pageNum, Integer pageSize) {
+    public CommonPage<PatrolInspectionArea> patrolInspectionAreaList(Integer id, String areaName, Integer pageNum, Integer pageSize) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String userType = null;
         if (loginUser!=null&&!"".equals(loginUser)){
@@ -137,8 +139,15 @@ public class PatrolInspectionAreaServiceImpl extends AbstractCrudService<PatrolI
         if (!"".equals(areaName) && areaName != null) {
             queryWrapper.like(PatrolInspectionArea::getAreaName, areaName);
         }
+        Integer total = this.count(queryWrapper);
         queryWrapper.orderByDesc(PatrolInspectionArea::getId);
-        return this.list(queryWrapper);
+        if (pageNum != null && pageNum != 0 && pageSize != null && pageSize != 0) {
+            Integer startFate = OnlineMethod.getStartFate(pageNum, pageSize);
+            queryWrapper.last("limit " + startFate + ","+pageSize);
+        }
+        List<PatrolInspectionArea> list = this.list(queryWrapper);
+
+        return new CommonPage<>(list, total, pageSize, pageNum);
     }
 
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/AlarmFireVo.java

@@ -0,0 +1,141 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 火灾报警系统报警信息表
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-07-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class AlarmFireVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 告警类型（2 火警、4 故障、16 监管等）
+     */
+    private Integer alarmType;
+
+    /**
+     * 告警时间
+     */
+    private LocalDateTime alarmTime;
+
+    /**
+     * 上报地址
+     */
+    private String address;
+
+    /**
+     * 告警状态
+     */
+    private String alarmStatus;
+
+    /**
+     * 原始告警类型
+     */
+    private String originalType;
+
+    /**
+     * 告警名称
+     */
+    private String alarmName;
+
+    /**
+     * 原始点位地址
+     */
+    private String originalPoint;
+
+    /**
+     * 点位类型（0 通用设备、1 火灾报警控制器、10 可燃气体探测器、11 点型可燃气体探测器等）
+     */
+    private Integer pointType;
+
+    /**
+     * 点位描述
+     */
+    private String pointDescribe;
+
+    /**
+     * 端口号
+     */
+    private Integer portNum;
+
+    /**
+     * 主机号
+     */
+    private Integer hostNum;
+
+    /**
+     * 回路号
+     */
+    private Integer loopNum;
+
+    /**
+     * 点位号
+     */
+    private Integer ptNum;
+
+    /**
+     * 处理人
+     */
+    private String handler;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handlingTime;
+
+    /**
+     * 处理内容
+     */
+    private String handlingContent;
+
+    /**
+     * 处理人电话
+     */
+    private String handlerPhone;
+
+    /**
+     * 处理状态（0、未处理 1、已处理）
+     */
+    private Integer handlingStatus;
+
+    /**
+     * 是否误报（0、非误报 1、误报）
+     */
+    private Integer falseAlarm;
+
+    /**
+     * 现场照片
+     */
+    private String sitePhoto;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+
+}