事件管理相关接口开发

service-fire/service-fire-biz/pom.xml

@@ -27,6 +27,12 @@
         <dependency>
             <groupId>com.usky</groupId>
             <artifactId>ruoyi-common-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.pagehelper</groupId>
+                    <artifactId>pagehelper-spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.usky</groupId>

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

@@ -113,8 +113,8 @@ public class AlarmDetectorController {
      * @throws IOException
      * @return
      */
-    @GetMapping("alarmDetectorLowerListExport")
-    public ApiResult<Void> export(HttpServletResponse response,
+    @PostMapping("alarmDetectorLowerListExport")
+    public void export(HttpServletResponse response,
                                   @RequestParam(value = "handlingStatus", required = false) Integer handlingStatus,
                                   @RequestParam(value = "systemType", required = false) String systemType,
                                   @RequestParam(value = "startDate", required = false) String startDate,
@@ -123,7 +123,6 @@ public class AlarmDetectorController {
         List<AlarmDetectorVo> list = alarmDetectorService.alarmDetectorLowerListExport(handlingStatus, startDate, endDate, systemType);
         ExcelUtil<AlarmDetectorVo> util = new ExcelUtil<AlarmDetectorVo>(AlarmDetectorVo.class);
         util.exportExcel(response, list, exportTitle, exportTitle);
-        return ApiResult.success();
     }
 
     @GetMapping("getData")

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

@@ -1,6 +1,7 @@
 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;
@@ -10,6 +11,9 @@ import com.usky.fire.service.vo.AlarmHiddenDangerVo;
 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;
 
 /**
@@ -84,6 +88,7 @@ public class AlarmElectricalFireController {
     }
 
     /**
+     * 事件管理-隐患管理-不同类型隐患-告警处理
      *
      * @param alarmHiddenDangerVo
      * @return
@@ -94,5 +99,30 @@ public class AlarmElectricalFireController {
         alarmElectricalFireService.updateHiddenDanger(alarmHiddenDangerVo);
         return ApiResult.success();
     }
+
+    /**
+     * 事件管理-隐患管理-不同类型隐患-导出
+     *
+     * @param response
+     * @param systemType     系统类型(2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统 6.消防视频监控系统)
+     * @param companyName    单位名称
+     * @param handlingStatus 处理状态（0、未处理 1、已处理）
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param exportTitle    标题
+     * @throws IOException
+     */
+    @PostMapping("alarmHiddenDangerListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "systemType") Integer systemType,
+                       @RequestParam(value = "companyName", required = false) String companyName,
+                       @RequestParam(value = "handlingStatus", required = false) Integer handlingStatus,
+                       @RequestParam(value = "startDate", required = false) String startDate,
+                       @RequestParam(value = "endDate", required = false) String endDate,
+                       @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
+        List<AlarmHiddenDangerVo> list = alarmElectricalFireService.alarmHiddenDangerListOne(systemType, companyName, handlingStatus, startDate, endDate);
+        ExcelUtil<AlarmHiddenDangerVo> util = new ExcelUtil<AlarmHiddenDangerVo>(AlarmHiddenDangerVo.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
 }
 

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

@@ -119,7 +119,7 @@ public class AlarmFireController {
 //                                    @RequestParam(value = "exportTitle", required = false) String exportTitle) {
 //        return ApiResult.success(alarmFireService.alarmFireExport(companyName, handlingStatus, startDate, endDate, alarmType, exportTitle));
 //    }
-    @GetMapping("alarmFireLowerListExport")
+    @PostMapping("alarmFireLowerListExport")
     public void export(HttpServletResponse response,
                        @RequestParam(value = "companyName", required = false) String companyName,
                        @RequestParam(value = "handlingStatus", required = false) Integer handlingStatus,

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

@@ -1,80 +0,0 @@
-package com.usky.fire.controller.web;
-
-
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.common.core.util.DateUtils;
-import com.usky.fire.controller.web.page.PageDomain;
-import com.usky.fire.controller.web.page.TableDataInfo;
-import com.usky.fire.controller.web.page.TableSupport;
-import com.usky.fire.service.util.SqlUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-
-import java.beans.PropertyEditorSupport;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * web层通用数据处理
- */
-public class BaseController {
-    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
-
-    /**
-     * 将前台传递过来的日期格式的字符串，自动转化为Date类型
-     */
-    @InitBinder
-    public void initBinder(WebDataBinder binder) {
-        // Date 类型转换
-        binder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
-            @Override
-            public void setAsText(String text) {
-                setValue(DateUtils.parseDate(text));
-            }
-        });
-    }
-
-    /**
-     * 设置请求分页数据
-     */
-    protected void startPage() {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        if (Objects.nonNull(pageNum) && Objects.nonNull(pageSize)) {
-            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
-            PageHelper.startPage(pageNum, pageSize, orderBy);
-        }
-    }
-
-    /**
-     * 响应请求分页数据
-     */
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    protected TableDataInfo getDataTable(List<?> list) {
-        TableDataInfo rspData = new TableDataInfo();
-        rspData.setCode(HttpStatus.OK.value());
-        rspData.setRows(list);
-        rspData.setMsg("查询成功");
-        rspData.setTotal(new PageInfo(list).getTotal());
-        return rspData;
-    }
-
-    /**
-     * 响应返回结果
-     *
-     * @param rows 影响行数
-     * @return 操作结果
-     */
-    protected ApiResult<Void> toAjax(int rows) {
-        return rows > 0 ? ApiResult.success() : ApiResult.error(BusinessErrorCode.BIZ_MODIFY_FAIL.getCode(), BusinessErrorCode.BIZ_MODIFY_FAIL.getDefaultMessage());
-    }
-}

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

@@ -87,16 +87,17 @@ public class PatrolInspectionContentController {
 
     /**
      * 巡查自检-巡检内容-导出
+     *
      * @param response
      * @param contentTitle 内容标题
-     * @param idList 巡检内容ID
-     * @throws IOException
+     * @param idList       巡检内容ID
      * @return
+     * @throws IOException
      */
-    @GetMapping("/contentListExport")
+    @PostMapping("/contentListExport")
     public void export(HttpServletResponse response,
-                                  @RequestParam(value = "contentTitle",required = false) String contentTitle,
-                                  @RequestParam(value = "id",required = false) String idList) throws IOException {
+                       @RequestParam(value = "contentTitle", required = false) String contentTitle,
+                       @RequestParam(value = "id", required = false) String idList) throws IOException {
         List<PatrolInspectionContentExportVo> list = patrolInspectionContentService.contentListExport(contentTitle, idList);
         ExcelUtil<PatrolInspectionContentExportVo> util = new ExcelUtil<PatrolInspectionContentExportVo>(PatrolInspectionContentExportVo.class);
         util.exportExcel(response, list, "巡检内容列表", "巡检内容列表");

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

@@ -10,10 +10,7 @@ import com.usky.fire.service.vo.PatrolInspectionRecordExportVo;
 import com.usky.fire.service.vo.PatrolInspectionRecordVo;
 import com.usky.fire.service.vo.RecordStatisticsVo;
 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;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -95,7 +92,7 @@ public class PatrolInspectionRecordController {
      * @param idList        记录ID
      * @throws IOException
      */
-    @GetMapping("/recordLsitExport")
+    @PostMapping("/recordLsitExport")
     public void export(HttpServletResponse response,
                        @RequestParam(value = "areaName", required = false) String areaName,
                        @RequestParam(value = "siteName", required = false) String siteName,

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

@@ -146,8 +146,9 @@ public class PatrolInspectionSiteController {
      * @param idList   地点ID
      * @return
      */
-    @GetMapping("/patrolInspectionSiteListExport")
-    public void export(HttpServletResponse response, @RequestParam(required = false) Integer areaId,
+    @PostMapping("/patrolInspectionSiteListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(required = false) Integer areaId,
                        @RequestParam(value = "siteName", required = false) String siteName,
                        @RequestParam(value = "idList", required = false) String idList) throws IOException {
         List<PatrolInspectionSiteExportVo> list = patrolInspectionSiteService.patrolInspectionSiteListExport(areaId, siteName, idList);

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

@@ -1,68 +0,0 @@
-package com.usky.fire.controller.web.page;
-
-
-import com.usky.common.core.util.StringUtils;
-
-/**
- * 分页数据
- */
-public class PageDomain {
-    /**
-     * 当前记录起始索引
-     */
-    private Integer pageNum;
-
-    /**
-     * 每页显示记录数
-     */
-    private Integer pageSize;
-
-    /**
-     * 排序列
-     */
-    private String orderByColumn;
-    /**
-     * 排序的方向 "desc" 或者 "asc".
-     */
-
-    private String isAsc;
-
-    public String getOrderBy() {
-        if (StringUtils.isBlank(orderByColumn)) {
-            return "";
-        }
-        return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
-    }
-
-    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;
-    }
-
-    public String getOrderByColumn() {
-        return orderByColumn;
-    }
-
-    public void setOrderByColumn(String orderByColumn) {
-        this.orderByColumn = orderByColumn;
-    }
-
-    public String getIsAsc() {
-        return isAsc;
-    }
-
-    public void setIsAsc(String isAsc) {
-        this.isAsc = isAsc;
-    }
-}

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

@@ -1,80 +0,0 @@
-package com.usky.fire.controller.web.page;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 表格分页数据对象
- */
-public class TableDataInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 总记录数
-     */
-    private long total;
-
-    /**
-     * 列表数据
-     */
-    private List<?> rows;
-
-    /**
-     * 消息状态码
-     */
-    private int code;
-
-    /**
-     * 消息内容
-     */
-    private String msg;
-
-    /**
-     * 表格数据对象
-     */
-    public TableDataInfo() {
-    }
-
-    /**
-     * 分页
-     *
-     * @param list  列表数据
-     * @param total 总记录数
-     */
-    public TableDataInfo(List<?> list, int total) {
-        this.rows = list;
-        this.total = total;
-    }
-
-    public long getTotal() {
-        return total;
-    }
-
-    public void setTotal(long total) {
-        this.total = total;
-    }
-
-    public List<?> getRows() {
-        return rows;
-    }
-
-    public void setRows(List<?> rows) {
-        this.rows = rows;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-}

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

@@ -1,45 +0,0 @@
-package com.usky.fire.controller.web.page;
-
-
-import com.usky.common.core.util.ServletUtils;
-
-/**
- * 表格数据处理
- */
-public class TableSupport {
-    /**
-     * 当前记录起始索引
-     */
-    public static final String PAGE_NUM = "pageNum";
-
-    /**
-     * 每页显示记录数
-     */
-    public static final String PAGE_SIZE = "pageSize";
-
-    /**
-     * 排序列
-     */
-    public static final String ORDER_BY_COLUMN = "orderByColumn";
-
-    /**
-     * 排序的方向 "desc" 或者 "asc".
-     */
-    public static final String IS_ASC = "isAsc";
-
-    /**
-     * 封装分页对象
-     */
-    public static PageDomain getPageDomain() {
-        PageDomain pageDomain = new PageDomain();
-        pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));
-        pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
-        pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
-        pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
-        return pageDomain;
-    }
-
-    public static PageDomain buildPageRequest() {
-        return getPageDomain();
-    }
-}

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

@@ -95,4 +95,27 @@ public interface AlarmElectricalFireService extends CrudService<AlarmElectricalF
      * @param alarmHiddenDangerVo
      */
     void updateHiddenDanger(AlarmHiddenDangerVo alarmHiddenDangerVo);
+
+    /**
+     * 事件管理-隐患管理-电气火灾-导出数据查询
+     *
+     * @param companyName    单位名称
+     * @param handlingStatus 处理状态（0、未处理 1、已处理）
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    List<AlarmElectricalFire> alarmElectricalFireListOne(String companyName, Integer handlingStatus, String startDate, String endDate);
+
+    /**
+     * 事件管理-隐患管理-不同类型隐患-导出数据查询
+     *
+     * @param systemType     系统类型(2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统 6.消防视频监控系统)
+     * @param companyName    单位名称
+     * @param handlingStatus 处理状态（0、未处理 1、已处理）
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    List<AlarmHiddenDangerVo> alarmHiddenDangerListOne(Integer systemType, String companyName, Integer handlingStatus, String startDate, String endDate);
 }

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

@@ -45,7 +45,19 @@ public interface AlarmHydrantWaterService extends CrudService<AlarmHydrantWater>
 
     /**
      * 事件管理-隐患管理-消防给水及消火栓-告警处置
+     *
      * @param alarmHydrantWater
      */
     void updateAlarmHydrantWater(AlarmHydrantWater alarmHydrantWater);
+
+    /**
+     * 事件管理-隐患管理-消防给水及消火栓-导出数据查询
+     *
+     * @param companyName    单位名称
+     * @param handlingStatus 处理状态（0、未处理 1、已处理）
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    List<AlarmHydrantWater> alarmHydrantWaterListOne(String companyName, Integer handlingStatus, String startDate, String endDate);
 }

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

@@ -49,4 +49,15 @@ public interface AlarmSmokeControlService extends CrudService<AlarmSmokeControl>
      * @param alarmSmokeControl
      */
     void updateAlarmSmokeControl(AlarmSmokeControl alarmSmokeControl);
+
+    /**
+     * 事件管理-隐患管理-防排烟-导出数据查询
+     *
+     * @param companyName    单位名称
+     * @param handlingStatus 处理状态（0、未处理 1、已处理）
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    List<AlarmSmokeControl> alarmSmokeListOne(String companyName, Integer handlingStatus, String startDate, String endDate);
 }

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

@@ -48,4 +48,15 @@ public interface AlarmSprayWaterService extends CrudService<AlarmSprayWater> {
      * @param alarmSprayWater
      */
     void updateAlarmSmokeControl(AlarmSprayWater alarmSprayWater);
+
+    /**
+     * 事件管理-隐患管理-自动喷水灭火-导出数据查询
+     *
+     * @param companyName    单位名称
+     * @param handlingStatus 处理状态（0、未处理 1、已处理）
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    List<AlarmSprayWater> alarmSprayWaterListOne(String companyName, Integer handlingStatus, String startDate, String endDate);
 }

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

@@ -21,8 +21,8 @@ public interface AlarmVideoService extends CrudService<AlarmVideo> {
      *
      * @param companyName    单位名称
      * @param handlingStatus 处理状态（0、未处理 1、已处理）
-     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:
-     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
      * @param pageNum        当前页
      * @param pageSize       每页条数
      * @return
@@ -48,4 +48,15 @@ public interface AlarmVideoService extends CrudService<AlarmVideo> {
      * @param alarmVideo
      */
     void updateAlarmVideo(AlarmVideo alarmVideo);
+
+    /**
+     * 事件管理-隐患管理-视频监控-导出数据查询
+     *
+     * @param companyName    单位名称
+     * @param handlingStatus 处理状态（0、未处理 1、已处理）
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    List<AlarmVideo> alarmVideoListOne(String companyName, Integer handlingStatus, String startDate, String endDate);
 }

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

@@ -1,9 +1,11 @@
 package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.util.BeanMapperUtils;
 import com.usky.common.mybatis.core.AbstractCrudService;
@@ -52,7 +54,7 @@ public class AlarmElectricalFireServiceImpl extends AbstractCrudService<AlarmEle
     @Override
     public CommonPage<AlarmElectricalFire> alarmElectricalFireList(String companyName, Integer handlingStatus, String startDate, String endDate,
                                                                    Integer pageNum, Integer pageSize) {
-        int total = 0;
+        IPage<AlarmElectricalFire> page = new Page<>(pageNum, pageSize);
         List<AlarmElectricalFire> list = new ArrayList<>();
         LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
         QueryWrapper.select(BaseUserCompany::getCompanyId)
@@ -73,13 +75,9 @@ public class AlarmElectricalFireServiceImpl extends AbstractCrudService<AlarmEle
                     .like(StringUtils.isNotBlank(companyName), AlarmElectricalFire::getCompanyName, companyName)
                     .eq(handlingStatus != null, AlarmElectricalFire::getHandlingStatus, handlingStatus)
                     .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmElectricalFire::getAlarmTime, startDate, endDate);
-            total = this.count(queryWrapperOne);
             queryWrapperOne.orderByDesc(AlarmElectricalFire::getId);
-            if (pageNum != null && pageNum != 0 && pageSize != null && pageSize != 0) {
-                Integer startFate = OnlineMethod.getStartFate(pageNum, pageSize);
-                queryWrapperOne.last("limit " + startFate + "," + pageSize);
-            }
-            list = this.list(queryWrapperOne);
+            page = this.page(page, queryWrapperOne);
+            list = page.getRecords();
             if (CollectionUtils.isNotEmpty(list)) {
                 for (int i = 0; i < list.size(); i++) {
                     list.get(i).setAlarmTypeName(OnlineMethod.alarmName(list.get(i).getAlarmType()));
@@ -87,7 +85,7 @@ public class AlarmElectricalFireServiceImpl extends AbstractCrudService<AlarmEle
                 }
             }
         }
-        return new CommonPage<>(list, total, pageSize, pageNum);
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
     public CommonPage<AlarmHiddenDangerVo> alarmHiddenDangerList(Integer systemType, String companyName, Integer handlingStatus, String startDate, String endDate,
@@ -290,5 +288,68 @@ public class AlarmElectricalFireServiceImpl extends AbstractCrudService<AlarmEle
         }
     }
 
+    @Override
+    public List<AlarmElectricalFire> alarmElectricalFireListOne(String companyName, Integer handlingStatus, String startDate, String endDate) {
+        List<AlarmElectricalFire> list = new ArrayList<>();
+        LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
+        QueryWrapper.select(BaseUserCompany::getCompanyId)
+                .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
+        List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
+        if (CollectionUtils.isNotEmpty(comoanyList)) {
+            List<Integer> companyIdList = new ArrayList<>();
+            for (int i = 0; i < comoanyList.size(); i++) {
+                companyIdList.add(comoanyList.get(i).getCompanyId());
+            }
+            LambdaQueryWrapper<AlarmElectricalFire> queryWrapperOne = Wrappers.lambdaQuery();
+            queryWrapperOne.select(AlarmElectricalFire::getId, AlarmElectricalFire::getDeviceCode,
+                    AlarmElectricalFire::getDeviceName, AlarmElectricalFire::getAlarmType, AlarmElectricalFire::getAlarmTime,
+                    AlarmElectricalFire::getCompanyId, AlarmElectricalFire::getCompanyName, AlarmElectricalFire::getHandlingStatus,
+                    AlarmElectricalFire::getHandler, AlarmElectricalFire::getHandlingTime, AlarmElectricalFire::getHandlingContent,
+                    AlarmElectricalFire::getFalseAlarm, AlarmElectricalFire::getSitePhoto, AlarmElectricalFire::getAttributeValue4)
+                    .in(AlarmElectricalFire::getCompanyId, companyIdList)
+                    .like(StringUtils.isNotBlank(companyName), AlarmElectricalFire::getCompanyName, companyName)
+                    .eq(handlingStatus != null, AlarmElectricalFire::getHandlingStatus, handlingStatus)
+                    .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmElectricalFire::getAlarmTime, startDate, endDate);
+            queryWrapperOne.orderByDesc(AlarmElectricalFire::getId);
+            list = this.list(queryWrapperOne);
+            if (CollectionUtils.isNotEmpty(list)) {
+                for (int i = 0; i < list.size(); i++) {
+                    list.get(i).setAlarmTypeName(OnlineMethod.alarmName(list.get(i).getAlarmType()));
+                    list.get(i).setReportContent(list.get(i).getDeviceName() + "," + OnlineMethod.alarmName(list.get(i).getAlarmType()) + ",高警值：" + list.get(i).getAttributeValue4() + "" + OnlineMethod.company(list.get(i).getAlarmType()));
+                }
+            }
+        }
+        return list;
+    }
+
+
+    @Override
+    public List<AlarmHiddenDangerVo> alarmHiddenDangerListOne(Integer systemType, String companyName, Integer handlingStatus, String startDate, String endDate) {
+        List<AlarmHiddenDangerVo> list = new ArrayList<>();
+        switch (systemType) {
+            case 2:
+                List<AlarmSprayWater> list2 = alarmSprayWaterService.alarmSprayWaterListOne(companyName, handlingStatus, startDate, endDate);
+                list = BeanMapperUtils.mapList(list2, AlarmSprayWater.class, AlarmHiddenDangerVo.class);
+                break;
+            case 3:
+                List<AlarmHydrantWater> list3 = alarmHydrantWaterService.alarmHydrantWaterListOne(companyName, handlingStatus, startDate, endDate);
+                list = BeanMapperUtils.mapList(list3, AlarmHydrantWater.class, AlarmHiddenDangerVo.class);
+                break;
+            case 4:
+                List<AlarmSmokeControl> list4 = alarmSmokeControlService.alarmSmokeListOne(companyName, handlingStatus, startDate, endDate);
+                list = BeanMapperUtils.mapList(list4, AlarmSmokeControl.class, AlarmHiddenDangerVo.class);
+                break;
+            case 5:
+                List<AlarmElectricalFire> list5 = this.alarmElectricalFireListOne(companyName, handlingStatus, startDate, endDate);
+                list = BeanMapperUtils.mapList(list5, AlarmElectricalFire.class, AlarmHiddenDangerVo.class);
+                break;
+            case 6:
+                List<AlarmVideo> list6 = alarmVideoService.alarmVideoListOne(companyName, handlingStatus, startDate, endDate);
+                list = BeanMapperUtils.mapList(list6, AlarmVideo.class, AlarmHiddenDangerVo.class);
+                break;
+        }
+        return list;
+    }
+
 
 }

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

@@ -1,9 +1,11 @@
 package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
@@ -37,7 +39,7 @@ public class AlarmHydrantWaterServiceImpl extends AbstractCrudService<AlarmHydra
     @Override
     public CommonPage<AlarmHydrantWater> alarmHydrantWaterList(String companyName, Integer handlingStatus, String startDate, String endDate,
                                                                Integer pageNum, Integer pageSize) {
-        int total = 0;
+        IPage<AlarmHydrantWater> page = new Page<>(pageNum, pageSize);
         List<AlarmHydrantWater> list = new ArrayList<>();
         LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
         QueryWrapper.select(BaseUserCompany::getCompanyId)
@@ -58,13 +60,9 @@ public class AlarmHydrantWaterServiceImpl extends AbstractCrudService<AlarmHydra
                     .like(StringUtils.isNotBlank(companyName), AlarmHydrantWater::getCompanyName, companyName)
                     .eq(handlingStatus != null, AlarmHydrantWater::getHandlingStatus, handlingStatus)
                     .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmHydrantWater::getAlarmTime, startDate, endDate);
-            total = this.count(queryWrapperOne);
             queryWrapperOne.orderByDesc(AlarmHydrantWater::getId);
-            if (pageNum != null && pageNum != 0 && pageSize != null && pageSize != 0) {
-                Integer startFate = OnlineMethod.getStartFate(pageNum, pageSize);
-                queryWrapperOne.last("limit " + startFate + "," + pageSize);
-            }
-            list = this.list(queryWrapperOne);
+            page = this.page(page, queryWrapperOne);
+            list = page.getRecords();
             if (CollectionUtils.isNotEmpty(list)) {
                 for (int i = 0; i < list.size(); i++) {
                     list.get(i).setAlarmTypeName(OnlineMethod.alarmName(list.get(i).getAlarmType()));
@@ -72,7 +70,7 @@ public class AlarmHydrantWaterServiceImpl extends AbstractCrudService<AlarmHydra
                 }
             }
         }
-        return new CommonPage<>(list, total, pageSize, pageNum);
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
     @Override
@@ -112,4 +110,38 @@ public class AlarmHydrantWaterServiceImpl extends AbstractCrudService<AlarmHydra
             this.updateById(alarmHydrantWater);
         }
     }
+
+    @Override
+    public List<AlarmHydrantWater> alarmHydrantWaterListOne(String companyName, Integer handlingStatus, String startDate, String endDate) {
+        List<AlarmHydrantWater> list = new ArrayList<>();
+        LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
+        QueryWrapper.select(BaseUserCompany::getCompanyId)
+                .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
+        List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
+        if (CollectionUtils.isNotEmpty(comoanyList)) {
+            List<Integer> companyIdList = new ArrayList<>();
+            for (int i = 0; i < comoanyList.size(); i++) {
+                companyIdList.add(comoanyList.get(i).getCompanyId());
+            }
+            LambdaQueryWrapper<AlarmHydrantWater> queryWrapperOne = Wrappers.lambdaQuery();
+            queryWrapperOne.select(AlarmHydrantWater::getId, AlarmHydrantWater::getDeviceCode,
+                    AlarmHydrantWater::getDeviceName, AlarmHydrantWater::getAlarmType, AlarmHydrantWater::getAlarmTime,
+                    AlarmHydrantWater::getCompanyId, AlarmHydrantWater::getCompanyName, AlarmHydrantWater::getHandlingStatus,
+                    AlarmHydrantWater::getHandler, AlarmHydrantWater::getHandlingTime, AlarmHydrantWater::getHandlingContent,
+                    AlarmHydrantWater::getFalseAlarm, AlarmHydrantWater::getSitePhoto, AlarmHydrantWater::getAttributeValue4)
+                    .in(AlarmHydrantWater::getCompanyId, companyIdList)
+                    .like(StringUtils.isNotBlank(companyName), AlarmHydrantWater::getCompanyName, companyName)
+                    .eq(handlingStatus != null, AlarmHydrantWater::getHandlingStatus, handlingStatus)
+                    .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmHydrantWater::getAlarmTime, startDate, endDate);
+            queryWrapperOne.orderByDesc(AlarmHydrantWater::getId);
+            list = this.list(queryWrapperOne);
+            if (CollectionUtils.isNotEmpty(list)) {
+                for (int i = 0; i < list.size(); i++) {
+                    list.get(i).setAlarmTypeName(OnlineMethod.alarmName(list.get(i).getAlarmType()));
+                    list.get(i).setReportContent(list.get(i).getDeviceName() + "," + OnlineMethod.alarmName(list.get(i).getAlarmType()) + ",高警值：" + list.get(i).getAttributeValue4() + "" + OnlineMethod.company(list.get(i).getAlarmType()));
+                }
+            }
+        }
+        return list;
+    }
 }

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

@@ -1,13 +1,14 @@
 package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.AlarmHydrantWater;
 import com.usky.fire.domain.AlarmSmokeControl;
 import com.usky.fire.domain.BaseUserCompany;
 import com.usky.fire.mapper.AlarmSmokeControlMapper;
@@ -38,7 +39,7 @@ public class AlarmSmokeControlServiceImpl extends AbstractCrudService<AlarmSmoke
     @Override
     public CommonPage<AlarmSmokeControl> alarmSmokeList(String companyName, Integer handlingStatus, String startDate, String endDate,
                                                         Integer pageNum, Integer pageSize) {
-        int total = 0;
+        IPage<AlarmSmokeControl> page = new Page<>(pageNum, pageSize);
         List<AlarmSmokeControl> list = new ArrayList<>();
         LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
         QueryWrapper.select(BaseUserCompany::getCompanyId)
@@ -59,13 +60,9 @@ public class AlarmSmokeControlServiceImpl extends AbstractCrudService<AlarmSmoke
                     .like(StringUtils.isNotBlank(companyName), AlarmSmokeControl::getCompanyName, companyName)
                     .eq(handlingStatus != null, AlarmSmokeControl::getHandlingStatus, handlingStatus)
                     .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmSmokeControl::getAlarmTime, startDate, endDate);
-            total = this.count(queryWrapperOne);
             queryWrapperOne.orderByDesc(AlarmSmokeControl::getId);
-            if (pageNum != null && pageNum != 0 && pageSize != null && pageSize != 0) {
-                Integer startFate = OnlineMethod.getStartFate(pageNum, pageSize);
-                queryWrapperOne.last("limit " + startFate + "," + pageSize);
-            }
-            list = this.list(queryWrapperOne);
+            page = this.page(page, queryWrapperOne);
+            list = page.getRecords();
             if (CollectionUtils.isNotEmpty(list)) {
                 for (int i = 0; i < list.size(); i++) {
                     list.get(i).setAlarmTypeName(OnlineMethod.alarmName(list.get(i).getAlarmType()));
@@ -73,7 +70,7 @@ public class AlarmSmokeControlServiceImpl extends AbstractCrudService<AlarmSmoke
                 }
             }
         }
-        return new CommonPage<>(list, total, pageSize, pageNum);
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
 
@@ -114,4 +111,38 @@ public class AlarmSmokeControlServiceImpl extends AbstractCrudService<AlarmSmoke
             this.updateById(alarmSmokeControl);
         }
     }
+
+    @Override
+    public List<AlarmSmokeControl> alarmSmokeListOne(String companyName, Integer handlingStatus, String startDate, String endDate) {
+        List<AlarmSmokeControl> list = new ArrayList<>();
+        LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
+        QueryWrapper.select(BaseUserCompany::getCompanyId)
+                .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
+        List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
+        if (CollectionUtils.isNotEmpty(comoanyList)) {
+            List<Integer> companyIdList = new ArrayList<>();
+            for (int i = 0; i < comoanyList.size(); i++) {
+                companyIdList.add(comoanyList.get(i).getCompanyId());
+            }
+            LambdaQueryWrapper<AlarmSmokeControl> queryWrapperOne = Wrappers.lambdaQuery();
+            queryWrapperOne.select(AlarmSmokeControl::getId, AlarmSmokeControl::getDeviceCode,
+                    AlarmSmokeControl::getDeviceName, AlarmSmokeControl::getAlarmType, AlarmSmokeControl::getAlarmTime,
+                    AlarmSmokeControl::getCompanyId, AlarmSmokeControl::getCompanyName, AlarmSmokeControl::getHandlingStatus,
+                    AlarmSmokeControl::getHandler, AlarmSmokeControl::getHandlingTime, AlarmSmokeControl::getHandlingContent,
+                    AlarmSmokeControl::getFalseAlarm, AlarmSmokeControl::getSitePhoto)
+                    .in(AlarmSmokeControl::getCompanyId, companyIdList)
+                    .like(StringUtils.isNotBlank(companyName), AlarmSmokeControl::getCompanyName, companyName)
+                    .eq(handlingStatus != null, AlarmSmokeControl::getHandlingStatus, handlingStatus)
+                    .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmSmokeControl::getAlarmTime, startDate, endDate);
+            queryWrapperOne.orderByDesc(AlarmSmokeControl::getId);
+            list = this.list(queryWrapperOne);
+            if (CollectionUtils.isNotEmpty(list)) {
+                for (int i = 0; i < list.size(); i++) {
+                    list.get(i).setAlarmTypeName(OnlineMethod.alarmName(list.get(i).getAlarmType()));
+                    list.get(i).setReportContent(list.get(i).getDeviceName() + "," + OnlineMethod.alarmName(list.get(i).getAlarmType()));
+                }
+            }
+        }
+        return list;
+    }
 }

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

@@ -1,14 +1,14 @@
 package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.AlarmElectricalFire;
-import com.usky.fire.domain.AlarmSmokeControl;
 import com.usky.fire.domain.AlarmSprayWater;
 import com.usky.fire.domain.BaseUserCompany;
 import com.usky.fire.mapper.AlarmSprayWaterMapper;
@@ -38,7 +38,8 @@ public class AlarmSprayWaterServiceImpl extends AbstractCrudService<AlarmSprayWa
     @Override
     public CommonPage<AlarmSprayWater> alarmSprayWaterList(String companyName, Integer handlingStatus, String startDate, String endDate,
                                                            Integer pageNum, Integer pageSize) {
-        int total = 0;
+
+        IPage<AlarmSprayWater> page = new Page<>(pageNum, pageSize);
         List<AlarmSprayWater> list = new ArrayList<>();
         LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
         QueryWrapper.select(BaseUserCompany::getCompanyId)
@@ -55,17 +56,13 @@ public class AlarmSprayWaterServiceImpl extends AbstractCrudService<AlarmSprayWa
                     AlarmSprayWater::getCompanyId, AlarmSprayWater::getCompanyName, AlarmSprayWater::getHandlingStatus,
                     AlarmSprayWater::getHandler, AlarmSprayWater::getHandlingTime, AlarmSprayWater::getHandlingContent,
                     AlarmSprayWater::getFalseAlarm, AlarmSprayWater::getSitePhoto, AlarmSprayWater::getAttributeValue4)
-                    .in(AlarmSprayWater::getCompanyId, companyIdList)
+                    .in(CollectionUtils.isNotEmpty(companyIdList), AlarmSprayWater::getCompanyId, companyIdList)
                     .like(StringUtils.isNotBlank(companyName), AlarmSprayWater::getCompanyName, companyName)
                     .eq(handlingStatus != null, AlarmSprayWater::getHandlingStatus, handlingStatus)
                     .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmSprayWater::getAlarmTime, startDate, endDate);
-            total = this.count(queryWrapperOne);
             queryWrapperOne.orderByDesc(AlarmSprayWater::getId);
-            if (pageNum != null && pageNum != 0 && pageSize != null && pageSize != 0) {
-                Integer startFate = OnlineMethod.getStartFate(pageNum, pageSize);
-                queryWrapperOne.last("limit " + startFate + "," + pageSize);
-            }
-            list = this.list(queryWrapperOne);
+            page = this.page(page, queryWrapperOne);
+            list = page.getRecords();
             if (CollectionUtils.isNotEmpty(list)) {
                 for (int i = 0; i < list.size(); i++) {
                     list.get(i).setAlarmTypeName(OnlineMethod.alarmName(list.get(i).getAlarmType()));
@@ -73,7 +70,7 @@ public class AlarmSprayWaterServiceImpl extends AbstractCrudService<AlarmSprayWa
                 }
             }
         }
-        return new CommonPage<>(list, total, pageSize, pageNum);
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
     @Override
@@ -113,4 +110,39 @@ public class AlarmSprayWaterServiceImpl extends AbstractCrudService<AlarmSprayWa
             this.updateById(alarmSprayWater);
         }
     }
+
+
+    @Override
+    public List<AlarmSprayWater> alarmSprayWaterListOne(String companyName, Integer handlingStatus, String startDate, String endDate) {
+        List<AlarmSprayWater> list = new ArrayList<>();
+        LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
+        QueryWrapper.select(BaseUserCompany::getCompanyId)
+                .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
+        List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
+        if (CollectionUtils.isNotEmpty(comoanyList)) {
+            List<Integer> companyIdList = new ArrayList<>();
+            for (int i = 0; i < comoanyList.size(); i++) {
+                companyIdList.add(comoanyList.get(i).getCompanyId());
+            }
+            LambdaQueryWrapper<AlarmSprayWater> queryWrapperOne = Wrappers.lambdaQuery();
+            queryWrapperOne.select(AlarmSprayWater::getId, AlarmSprayWater::getDeviceCode,
+                    AlarmSprayWater::getDeviceName, AlarmSprayWater::getAlarmType, AlarmSprayWater::getAlarmTime,
+                    AlarmSprayWater::getCompanyId, AlarmSprayWater::getCompanyName, AlarmSprayWater::getHandlingStatus,
+                    AlarmSprayWater::getHandler, AlarmSprayWater::getHandlingTime, AlarmSprayWater::getHandlingContent,
+                    AlarmSprayWater::getFalseAlarm, AlarmSprayWater::getSitePhoto, AlarmSprayWater::getAttributeValue4)
+                    .in(CollectionUtils.isNotEmpty(companyIdList), AlarmSprayWater::getCompanyId, companyIdList)
+                    .like(StringUtils.isNotBlank(companyName), AlarmSprayWater::getCompanyName, companyName)
+                    .eq(handlingStatus != null, AlarmSprayWater::getHandlingStatus, handlingStatus)
+                    .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmSprayWater::getAlarmTime, startDate, endDate);
+            queryWrapperOne.orderByDesc(AlarmSprayWater::getId);
+            list = this.list(queryWrapperOne);
+            if (CollectionUtils.isNotEmpty(list)) {
+                for (int i = 0; i < list.size(); i++) {
+                    list.get(i).setAlarmTypeName(OnlineMethod.alarmName(list.get(i).getAlarmType()));
+                    list.get(i).setReportContent(list.get(i).getDeviceName() + "," + OnlineMethod.alarmName(list.get(i).getAlarmType()) + ",高警值：" + list.get(i).getAttributeValue4() + "" + OnlineMethod.company(list.get(i).getAlarmType()));
+                }
+            }
+        }
+        return list;
+    }
 }

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

@@ -1,9 +1,11 @@
 package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
@@ -37,7 +39,7 @@ public class AlarmVideoServiceImpl extends AbstractCrudService<AlarmVideoMapper,
     @Override
     public CommonPage<AlarmVideo> alarmVideoList(String companyName, Integer handlingStatus, String startDate, String endDate,
                                                  Integer pageNum, Integer pageSize) {
-        int total = 0;
+        IPage<AlarmVideo> page = new Page<>(pageNum, pageSize);
         List<AlarmVideo> list = new ArrayList<>();
         LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
         QueryWrapper.select(BaseUserCompany::getCompanyId)
@@ -58,13 +60,9 @@ public class AlarmVideoServiceImpl extends AbstractCrudService<AlarmVideoMapper,
                     .like(StringUtils.isNotBlank(companyName), AlarmVideo::getCompanyName, companyName)
                     .eq(handlingStatus != null, AlarmVideo::getHandlingStatus, handlingStatus)
                     .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmVideo::getAlarmTime, startDate, endDate);
-            total = this.count(queryWrapperOne);
             queryWrapperOne.orderByDesc(AlarmVideo::getId);
-            if (pageNum != null && pageNum != 0 && pageSize != null && pageSize != 0) {
-                Integer startFate = OnlineMethod.getStartFate(pageNum, pageSize);
-                queryWrapperOne.last("limit " + startFate + "," + pageSize);
-            }
-            list = this.list(queryWrapperOne);
+            page = this.page(page, queryWrapperOne);
+            list = page.getRecords();
             if (CollectionUtils.isNotEmpty(list)) {
                 for (int i = 0; i < list.size(); i++) {
                     list.get(i).setAlarmTypeName(OnlineMethod.alarmName(list.get(i).getAlarmType()));
@@ -72,7 +70,7 @@ public class AlarmVideoServiceImpl extends AbstractCrudService<AlarmVideoMapper,
                 }
             }
         }
-        return new CommonPage<>(list, total, pageSize, pageNum);
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
 
@@ -114,4 +112,38 @@ public class AlarmVideoServiceImpl extends AbstractCrudService<AlarmVideoMapper,
             this.updateById(alarmVideo);
         }
     }
+
+    @Override
+    public List<AlarmVideo> alarmVideoListOne(String companyName, Integer handlingStatus, String startDate, String endDate) {
+        List<AlarmVideo> list = new ArrayList<>();
+        LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
+        QueryWrapper.select(BaseUserCompany::getCompanyId)
+                .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
+        List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
+        if (CollectionUtils.isNotEmpty(comoanyList)) {
+            List<Integer> companyIdList = new ArrayList<>();
+            for (int i = 0; i < comoanyList.size(); i++) {
+                companyIdList.add(comoanyList.get(i).getCompanyId());
+            }
+            LambdaQueryWrapper<AlarmVideo> queryWrapperOne = Wrappers.lambdaQuery();
+            queryWrapperOne.select(AlarmVideo::getId, AlarmVideo::getDeviceCode,
+                    AlarmVideo::getDeviceName, AlarmVideo::getAlarmType, AlarmVideo::getAlarmTime,
+                    AlarmVideo::getCompanyId, AlarmVideo::getCompanyName, AlarmVideo::getHandlingStatus,
+                    AlarmVideo::getHandler, AlarmVideo::getHandlingTime, AlarmVideo::getHandlingContent,
+                    AlarmVideo::getFalseAlarm, AlarmVideo::getSitePhoto, AlarmVideo::getPortNum)
+                    .in(AlarmVideo::getCompanyId, companyIdList)
+                    .like(StringUtils.isNotBlank(companyName), AlarmVideo::getCompanyName, companyName)
+                    .eq(handlingStatus != null, AlarmVideo::getHandlingStatus, handlingStatus)
+                    .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmVideo::getAlarmTime, startDate, endDate);
+            queryWrapperOne.orderByDesc(AlarmVideo::getId);
+            list = this.list(queryWrapperOne);
+            if (CollectionUtils.isNotEmpty(list)) {
+                for (int i = 0; i < list.size(); i++) {
+                    list.get(i).setAlarmTypeName(OnlineMethod.alarmName(list.get(i).getAlarmType()));
+                    list.get(i).setReportContent(list.get(i).getDeviceName() + ",端口号：" + OnlineMethod.alarmName(list.get(i).getPortNum()));
+                }
+            }
+        }
+        return list;
+    }
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/util/OnlineMethod.java

@@ -80,6 +80,40 @@ public class OnlineMethod {
             case "LL2":
                 alarmName = "高湿度";
                 break;
+            case "y01":
+                alarmName = "报警";
+                break;
+            case "y02":
+                alarmName = "报警静音";
+                break;
+            case "y03":
+            case "y06":
+                alarmName = "保留";
+                break;
+            case "y04":
+                alarmName = "低压";
+                break;
+            case "y05":
+                alarmName = "故障";
+                break;
+            case "y07":
+                alarmName = "火灾报警";
+                break;
+            case "y08":
+                alarmName = "温度报警";
+                break;
+            case "y09":
+                alarmName = "烟感电量低";
+                break;
+            case "y10":
+                alarmName = "防拆报警";
+                break;
+            case "y11":
+                alarmName = "发射电路故障";
+                break;
+            case "y12":
+                alarmName = "设备自检";
+                break;
         }
         return alarmName;
     }

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

@@ -3,6 +3,7 @@ package com.usky.fire.service.vo;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -32,8 +33,53 @@ public class AlarmHiddenDangerVo implements Serializable {
     /**
      * 设备编号
      */
+    @Excel(name = "设备编号")
     private String deviceCode;
 
+    /**
+     * 单位名称
+     */
+    @Excel(name = "单位名称")
+    private String companyName;
+
+    /**
+     * 告警时间
+     */
+    @Excel(name = "报告事件",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime alarmTime;
+
+    /**
+     * 告警类型名称
+     */
+    @TableField(exist = false)
+    @Excel(name = "报告数据")
+    private String alarmTypeName;
+
+    /**
+     * 报告内容
+     */
+    @TableField(exist = false)
+    @Excel(name = "报告内容")
+    private String reportContent;
+
+    /**
+     * 处理状态（0、未处理 1、已处理）
+     */
+    @Excel(name = "处理状态", readConverterExp = "0=未处理,1=已处理")
+    private Integer handlingStatus;
+
+    /**
+     * 处理人
+     */
+    @Excel(name = "处理人")
+    private String handler;
+
+    /**
+     * 处理时间
+     */
+    @Excel(name = "处理时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime handlingTime;
+
     /**
      * 设备名称
      */
@@ -44,11 +90,6 @@ public class AlarmHiddenDangerVo implements Serializable {
      */
     private String alarmType;
 
-    /**
-     * 告警时间
-     */
-    private LocalDateTime alarmTime;
-
     /**
      * 上报地址
      */
@@ -74,11 +115,6 @@ public class AlarmHiddenDangerVo implements Serializable {
      */
     private Integer companyId;
 
-    /**
-     * 单位名称
-     */
-    private String companyName;
-
     /**
      * 属性值1
      */
@@ -99,16 +135,6 @@ public class AlarmHiddenDangerVo implements Serializable {
      */
     private String attributeValue4;
 
-    /**
-     * 处理人
-     */
-    private String handler;
-
-    /**
-     * 处理时间
-     */
-    private LocalDateTime handlingTime;
-
     /**
      * 处理内容
      */
@@ -119,11 +145,6 @@ public class AlarmHiddenDangerVo implements Serializable {
      */
     private String handlerPhone;
 
-    /**
-     * 处理状态（0、未处理 1、已处理）
-     */
-    private Integer handlingStatus;
-
     /**
      * 是否误报（0、非误报 1、误报）
      */
@@ -133,18 +154,4 @@ public class AlarmHiddenDangerVo implements Serializable {
      * 现场照片
      */
     private String sitePhoto;
-
-    /**
-     * 报告内容
-     */
-    @TableField(exist = false)
-    private String reportContent;
-
-    /**
-     * 告警类型名称
-     */
-    @TableField(exist = false)
-    private String alarmTypeName;
-
-
 }