大屏定时任务相关接口开发

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

@@ -3,12 +3,15 @@ package com.usky.fire.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.fire.service.BscEnterpriseScreenService;
+import com.usky.fire.service.vo.DataVo;
 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 java.util.List;
+
 /**
  * <p>
  * 企业大屏数据统计 前端控制器
@@ -49,5 +52,15 @@ public class BscEnterpriseScreenController {
         return ApiResult.success();
     }
 
+    /**
+     * 大屏实时消防告警推送
+     *
+     * @return
+     */
+    @GetMapping("Alarmlist")
+    public ApiResult<List<DataVo>> Alarmlist() {
+        return ApiResult.success(bscEnterpriseScreenService.Alarmlist());
+    }
+
 }
 

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

@@ -4,6 +4,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.AlarmElectricalFire;
 import com.usky.fire.service.vo.AlarmHiddenDangerVo;
+import com.usky.fire.service.vo.DataVo;
 
 import java.util.List;
 import java.util.Map;
@@ -143,4 +144,10 @@ public interface AlarmElectricalFireService extends CrudService<AlarmElectricalF
      * @return
      */
     Integer electricalFireCount(String companyId, String startTime, String endTime);
+
+    /**
+     * 电器火灾告警查询
+     * @return
+     */
+    List<DataVo> Alarmlist();
 }

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

@@ -4,6 +4,7 @@ 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 com.usky.fire.service.vo.DataVo;
 
 import java.util.List;
 import java.util.Map;
@@ -66,4 +67,11 @@ public interface AlarmFireService extends CrudService<AlarmFire> {
      * @return
      */
     Integer fireAlarmCount(String companyId, Integer handlingStatus, String alarmType, String startTime, String endTime);
+
+    /**
+     * 火灾自动报警列表查询
+     *
+     * @return
+     */
+    List<DataVo> Alarmlist();
 }

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

@@ -3,6 +3,7 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.AlarmHydrantWater;
+import com.usky.fire.service.vo.DataVo;
 
 import java.util.List;
 
@@ -68,4 +69,10 @@ public interface AlarmHydrantWaterService extends CrudService<AlarmHydrantWater>
      * @return
      */
     Integer hydrantWaterCount(String companyId, String startTime, String endTime);
+
+    /**
+     * 消防给水及消火栓列表查询
+     * @return
+     */
+    List<DataVo> Alarmlist();
 }

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

@@ -3,6 +3,7 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.AlarmSmokeControl;
+import com.usky.fire.service.vo.DataVo;
 
 import java.util.List;
 
@@ -68,4 +69,11 @@ public interface AlarmSmokeControlService extends CrudService<AlarmSmokeControl>
      * @return
      */
     Integer smokeControlCount(String companyId, String startTime, String endTime);
+
+    /**
+     * 防排烟列表查询
+     *
+     * @return
+     */
+    List<DataVo> Alarmlist();
 }

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

@@ -3,6 +3,7 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.AlarmSprayWater;
+import com.usky.fire.service.vo.DataVo;
 
 import java.util.List;
 
@@ -67,4 +68,11 @@ public interface AlarmSprayWaterService extends CrudService<AlarmSprayWater> {
      * @return
      */
     Integer sprayWaterCount(String companyId, String startTime, String endTime);
+
+    /**
+     * 自动喷水灭火列表查询
+     *
+     * @return
+     */
+    List<DataVo> Alarmlist();
 }

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

@@ -3,6 +3,7 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.AlarmVideo;
+import com.usky.fire.service.vo.DataVo;
 
 import java.util.List;
 
@@ -67,4 +68,11 @@ public interface AlarmVideoService extends CrudService<AlarmVideo> {
      * @return
      */
     Integer videoCount(String companyId, String startTime, String endTime);
+
+    /**
+     * 视频监控
+     *
+     * @return
+     */
+    List<DataVo> Alarmlist();
 }

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

@@ -2,6 +2,7 @@ package com.usky.fire.service;
 
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.BscEnterpriseScreen;
+import com.usky.fire.service.vo.DataVo;
 
 import java.util.List;
 
@@ -29,6 +30,13 @@ public interface BscEnterpriseScreenService extends CrudService<BscEnterpriseScr
      */
     void dataSynchro();
 
+    /**
+     * 大屏实时消防告警推送
+     *
+     * @return
+     */
+    List<DataVo> Alarmlist();
+
     /**
      * 查询该单位企业大屏数据是否统计
      *

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

@@ -17,10 +17,12 @@ import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.AlarmFireStatisticalVo;
 import com.usky.fire.service.vo.AlarmHiddenDangerVo;
 import com.usky.fire.service.vo.DataCountVo;
+import com.usky.fire.service.vo.DataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -403,4 +405,32 @@ public class AlarmElectricalFireServiceImpl extends AbstractCrudService<AlarmEle
         int count = this.count(queryWrapper);
         return count;
     }
+
+
+    @Override
+    public List<DataVo> Alarmlist() {
+        List<DataVo> list = new ArrayList<>();
+        String companyId = baseUserCompanyService.companyId();
+        LambdaQueryWrapper<AlarmElectricalFire> queryWrapperOne = Wrappers.lambdaQuery();
+        queryWrapperOne.select(AlarmElectricalFire::getAlarmTime, AlarmElectricalFire::getDeviceCode,
+                AlarmElectricalFire::getAlarmType, AlarmElectricalFire::getAddress,
+                AlarmElectricalFire::getHandlingStatus, AlarmElectricalFire::getDeviceName,
+                AlarmElectricalFire::getAttributeValue4)
+                .eq(AlarmElectricalFire::getCompanyId, companyId)
+                .orderByDesc(AlarmElectricalFire::getId)
+                .last(" limit 1");
+        List<AlarmElectricalFire> list1 = this.list(queryWrapperOne);
+        for (int i = 0; i < list1.size(); i++) {
+            DataVo dataVo = new DataVo();
+            dataVo.setType1(list1.get(i).getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            dataVo.setType2(list1.get(i).getDeviceCode());
+            dataVo.setType3(OnlineMethod.alarmName(list1.get(i).getAlarmType()));
+            dataVo.setType4(list1.get(i).getAddress());
+            dataVo.setType5("-");
+            dataVo.setType6(list1.get(i).getDeviceName() + "," + OnlineMethod.alarmName(list1.get(i).getAlarmType()) + ",高警值：" + list1.get(i).getAttributeValue4() + "" + OnlineMethod.company(list1.get(i).getAlarmType()));
+            dataVo.setType7(list1.get(i).getHandlingStatus()==1?"已处理":"未处理");
+            list.add(dataVo);
+        }
+        return list;
+    }
 }

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

@@ -21,6 +21,7 @@ import com.usky.fire.service.BaseUserCompanyService;
 import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.AlarmFireStatisticalVo;
 import com.usky.fire.service.vo.AlarmFireVo;
+import com.usky.fire.service.vo.DataVo;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -386,4 +387,31 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
         int count = this.count(queryWrapper);
         return count;
     }
+
+    @Override
+    public List<DataVo> Alarmlist() {
+        List<DataVo> list = new ArrayList<>();
+        String companyId = baseUserCompanyService.companyId();
+        LambdaQueryWrapper<AlarmFire> queryWrapperOne = Wrappers.lambdaQuery();
+        queryWrapperOne.select(AlarmFire::getAlarmTime, AlarmFire::getDeviceCode,
+                AlarmFire::getAlarmType, AlarmFire::getAddress,
+                AlarmFire::getHandlingStatus, AlarmFire::getDeviceName,
+                AlarmFire::getAttributeValue4, AlarmFire::getPortNum)
+                .eq(AlarmFire::getCompanyId, companyId)
+                .orderByDesc(AlarmFire::getId)
+                .last(" limit 2");
+        List<AlarmFire> list1 = this.list(queryWrapperOne);
+        for (int i = 0; i < list1.size(); i++) {
+            DataVo dataVo = new DataVo();
+            dataVo.setType1(list1.get(i).getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            dataVo.setType2(list1.get(i).getDeviceCode());
+            dataVo.setType3(list1.get(i).getAttributeValue2());
+            dataVo.setType4(list1.get(i).getAddress());
+            dataVo.setType5(list1.get(i).getPortNum());
+            dataVo.setType6(list1.get(i).getDeviceName() + "," + list1.get(i).getAttributeValue4());
+            dataVo.setType7(list1.get(i).getHandlingStatus() == 1 ? "已处理" : "未处理");
+            list.add(dataVo);
+        }
+        return list;
+    }
 }

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

@@ -15,10 +15,12 @@ import com.usky.fire.mapper.AlarmHydrantWaterMapper;
 import com.usky.fire.service.AlarmHydrantWaterService;
 import com.usky.fire.service.BaseUserCompanyService;
 import com.usky.fire.service.util.OnlineMethod;
+import com.usky.fire.service.vo.DataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -155,4 +157,31 @@ public class AlarmHydrantWaterServiceImpl extends AbstractCrudService<AlarmHydra
         int count = this.count(queryWrapper);
         return count;
     }
+
+    @Override
+    public List<DataVo> Alarmlist() {
+        List<DataVo> list = new ArrayList<>();
+        String companyId = baseUserCompanyService.companyId();
+        LambdaQueryWrapper<AlarmHydrantWater> queryWrapperOne = Wrappers.lambdaQuery();
+        queryWrapperOne.select(AlarmHydrantWater::getAlarmTime, AlarmHydrantWater::getDeviceCode,
+                AlarmHydrantWater::getAlarmType, AlarmHydrantWater::getAddress,
+                AlarmHydrantWater::getHandlingStatus, AlarmHydrantWater::getDeviceName,
+                AlarmHydrantWater::getAttributeValue4, AlarmHydrantWater::getPortNum)
+                .eq(AlarmHydrantWater::getCompanyId, companyId)
+                .orderByDesc(AlarmHydrantWater::getId)
+                .last(" limit 2");
+        List<AlarmHydrantWater> list1 = this.list(queryWrapperOne);
+        for (int i = 0; i < list1.size(); i++) {
+            DataVo dataVo = new DataVo();
+            dataVo.setType1(list1.get(i).getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            dataVo.setType2(list1.get(i).getDeviceCode());
+            dataVo.setType3(OnlineMethod.alarmName(list1.get(i).getAlarmType()));
+            dataVo.setType4(list1.get(i).getAddress());
+            dataVo.setType5("-");
+            dataVo.setType6(list1.get(i).getDeviceName() + "," + OnlineMethod.alarmName(list1.get(i).getAlarmType()) + ",高警值：" + list1.get(i).getAttributeValue4() + "" + OnlineMethod.company(list1.get(i).getAlarmType()));
+            dataVo.setType7(list1.get(i).getHandlingStatus() == 1 ? "已处理" : "未处理");
+            list.add(dataVo);
+        }
+        return list;
+    }
 }

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

@@ -9,18 +9,23 @@ 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;
 import com.usky.fire.service.AlarmSmokeControlService;
 import com.usky.fire.service.BaseUserCompanyService;
 import com.usky.fire.service.util.OnlineMethod;
+import com.usky.fire.service.vo.DataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -154,4 +159,31 @@ public class AlarmSmokeControlServiceImpl extends AbstractCrudService<AlarmSmoke
         int count = this.count(queryWrapper);
         return count;
     }
+
+    @Override
+    public List<DataVo> Alarmlist() {
+        List<DataVo> list = new ArrayList<>();
+        String companyId = baseUserCompanyService.companyId();
+        LambdaQueryWrapper<AlarmSmokeControl> queryWrapperOne = Wrappers.lambdaQuery();
+        queryWrapperOne.select(AlarmSmokeControl::getAlarmTime, AlarmSmokeControl::getDeviceCode,
+                AlarmSmokeControl::getAlarmType, AlarmSmokeControl::getAddress,
+                AlarmSmokeControl::getHandlingStatus, AlarmSmokeControl::getDeviceName,
+                AlarmSmokeControl::getAttributeValue4, AlarmSmokeControl::getPortNum)
+                .eq(AlarmSmokeControl::getCompanyId, companyId)
+                .orderByDesc(AlarmSmokeControl::getId)
+                .last(" limit 2");
+        List<AlarmSmokeControl> list1 = this.list(queryWrapperOne);
+        for (int i = 0; i < list1.size(); i++) {
+            DataVo dataVo = new DataVo();
+            dataVo.setType1(list1.get(i).getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            dataVo.setType2(list1.get(i).getDeviceCode());
+            dataVo.setType3(OnlineMethod.alarmName(list1.get(i).getAlarmType()));
+            dataVo.setType4(list1.get(i).getAddress());
+            dataVo.setType5(OnlineMethod.alarmName(list1.get(i).getAlarmType()));
+            dataVo.setType6(list1.get(i).getDeviceName() + "," + OnlineMethod.alarmName(list1.get(i).getAlarmType()));
+            dataVo.setType7(list1.get(i).getHandlingStatus() == 1 ? "已处理" : "未处理");
+            list.add(dataVo);
+        }
+        return list;
+    }
 }

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

@@ -15,10 +15,12 @@ import com.usky.fire.mapper.AlarmSprayWaterMapper;
 import com.usky.fire.service.AlarmSprayWaterService;
 import com.usky.fire.service.BaseUserCompanyService;
 import com.usky.fire.service.util.OnlineMethod;
+import com.usky.fire.service.vo.DataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -155,4 +157,32 @@ public class AlarmSprayWaterServiceImpl extends AbstractCrudService<AlarmSprayWa
         int count = this.count(queryWrapper);
         return count;
     }
+
+
+    @Override
+    public List<DataVo> Alarmlist() {
+        List<DataVo> list = new ArrayList<>();
+        String companyId = baseUserCompanyService.companyId();
+        LambdaQueryWrapper<AlarmSprayWater> queryWrapperOne = Wrappers.lambdaQuery();
+        queryWrapperOne.select(AlarmSprayWater::getAlarmTime, AlarmSprayWater::getDeviceCode,
+                AlarmSprayWater::getAlarmType, AlarmSprayWater::getAddress,
+                AlarmSprayWater::getHandlingStatus, AlarmSprayWater::getDeviceName,
+                AlarmSprayWater::getAttributeValue4, AlarmSprayWater::getPortNum)
+                .eq(AlarmSprayWater::getCompanyId, companyId)
+                .orderByDesc(AlarmSprayWater::getId)
+                .last(" limit 2");
+        List<AlarmSprayWater> list1 = this.list(queryWrapperOne);
+        for (int i = 0; i < list1.size(); i++) {
+            DataVo dataVo = new DataVo();
+            dataVo.setType1(list1.get(i).getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            dataVo.setType2(list1.get(i).getDeviceCode());
+            dataVo.setType3(OnlineMethod.alarmName(list1.get(i).getAlarmType()));
+            dataVo.setType4(list1.get(i).getAddress());
+            dataVo.setType5("-");
+            dataVo.setType6(list1.get(i).getDeviceName() + "," + OnlineMethod.alarmName(list1.get(i).getAlarmType()) + ",高警值：" + list1.get(i).getAttributeValue4() + "" + OnlineMethod.company(list1.get(i).getAlarmType()));
+            dataVo.setType7(list1.get(i).getHandlingStatus() == 1 ? "已处理" : "未处理");
+            list.add(dataVo);
+        }
+        return list;
+    }
 }

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

@@ -15,10 +15,12 @@ import com.usky.fire.mapper.AlarmVideoMapper;
 import com.usky.fire.service.AlarmVideoService;
 import com.usky.fire.service.BaseUserCompanyService;
 import com.usky.fire.service.util.OnlineMethod;
+import com.usky.fire.service.vo.DataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -66,7 +68,7 @@ public class AlarmVideoServiceImpl extends AbstractCrudService<AlarmVideoMapper,
             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()));
+                    list.get(i).setReportContent(list.get(i).getDeviceName() + ",端口号：" + list.get(i).getPortNum());
                 }
             }
         }
@@ -140,7 +142,7 @@ public class AlarmVideoServiceImpl extends AbstractCrudService<AlarmVideoMapper,
             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()));
+                    list.get(i).setReportContent(list.get(i).getDeviceName() + ",端口号：" + list.get(i).getPortNum());
                 }
             }
         }
@@ -155,4 +157,31 @@ public class AlarmVideoServiceImpl extends AbstractCrudService<AlarmVideoMapper,
         int count = this.count(queryWrapper);
         return count;
     }
+
+    @Override
+    public List<DataVo> Alarmlist() {
+        List<DataVo> list = new ArrayList<>();
+        String companyId = baseUserCompanyService.companyId();
+        LambdaQueryWrapper<AlarmVideo> queryWrapperOne = Wrappers.lambdaQuery();
+        queryWrapperOne.select(AlarmVideo::getAlarmTime, AlarmVideo::getDeviceCode,
+                AlarmVideo::getAlarmType, AlarmVideo::getAddress,
+                AlarmVideo::getHandlingStatus, AlarmVideo::getDeviceName,
+                AlarmVideo::getAttributeValue4, AlarmVideo::getPortNum)
+                .eq(AlarmVideo::getCompanyId, companyId)
+                .orderByDesc(AlarmVideo::getId)
+                .last(" limit 1");
+        List<AlarmVideo> list1 = this.list(queryWrapperOne);
+        for (int i = 0; i < list1.size(); i++) {
+            DataVo dataVo = new DataVo();
+            dataVo.setType1(list1.get(i).getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            dataVo.setType2(list1.get(i).getDeviceCode());
+            dataVo.setType3(list1.get(i).getAlarmType());
+            dataVo.setType4(list1.get(i).getAddress());
+            dataVo.setType5(list1.get(i).getPortNum());
+            dataVo.setType6(list1.get(i).getDeviceName() + ",端口号：" + list1.get(i).getPortNum());
+            dataVo.setType7(list1.get(i).getHandlingStatus() == 1 ? "已处理" : "未处理");
+            list.add(dataVo);
+        }
+        return list;
+    }
 }

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

@@ -50,9 +50,10 @@ public class BaseUserCompanyServiceImpl extends AbstractCrudService<BaseUserComp
 
     @Override
     public String companyId() {
+        Long userId = SecurityUtils.getUserId();
         LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
         QueryWrapper.select(BaseUserCompany::getCompanyId)
-                .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
+                .eq(BaseUserCompany::getUserId, userId);
         List<BaseUserCompany> comoanyList = this.list(QueryWrapper);
         String companyId = null;
         if (CollectionUtils.isNotEmpty(comoanyList)) {

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

@@ -18,6 +18,7 @@ import com.usky.fire.mapper.PatrolInspectionPlanSiteSonMapper;
 import com.usky.fire.service.*;
 import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.DataCountVo;
+import com.usky.fire.service.vo.DataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -67,6 +68,18 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
     @Autowired
     private BaseCompanyService baseCompanyService;
 
+    @Autowired
+    private AlarmHydrantWaterService alarmHydrantWaterService;
+
+    @Autowired
+    private AlarmSmokeControlService alarmSmokeControlService;
+
+    @Autowired
+    private AlarmSprayWaterService alarmSprayWaterService;
+
+    @Autowired
+    private AlarmVideoService alarmVideoService;
+
     @Override
     public Object screenDataStatistic(String dataType, String moduleType) {
         String companyId = baseUserCompanyService.companyId();
@@ -182,6 +195,43 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
         }
     }
 
+    @Override
+    public List<DataVo> Alarmlist(){
+        List<DataVo> list = new ArrayList<>();
+        List<DataVo> alarmlist = alarmElectricalFireService.Alarmlist();
+        List<DataVo> alarmlist1 = alarmFireService.Alarmlist();
+        List<DataVo> alarmlist2 = alarmHydrantWaterService.Alarmlist();
+        List<DataVo> alarmlist3 = alarmSmokeControlService.Alarmlist();
+        List<DataVo> alarmlist4 = alarmSprayWaterService.Alarmlist();
+        List<DataVo> alarmlist5 = alarmVideoService.Alarmlist();
+        for (int i = 0; i < alarmlist.size(); i++) {
+            list.add(alarmlist.get(i));
+        }
+        for (int i = 0; i < alarmlist1.size(); i++) {
+            list.add(alarmlist1.get(i));
+        }
+        for (int i = 0; i < alarmlist2.size(); i++) {
+            list.add(alarmlist2.get(i));
+        }
+        for (int i = 0; i < alarmlist3.size(); i++) {
+            list.add(alarmlist3.get(i));
+        }
+        for (int i = 0; i < alarmlist4.size(); i++) {
+            list.add(alarmlist4.get(i));
+        }
+        for (int i = 0; i < alarmlist5.size(); i++) {
+            list.add(alarmlist5.get(i));
+        }
+        Collections.sort(list, new Comparator<DataVo>() {
+            @Override
+            public int compare(DataVo h1, DataVo h2) {
+                return h1.getType1().compareTo(h2.getType1());
+            }
+        });
+        Collections.reverse(list);
+        return list;
+    }
+
     @Override
     public List<BscEnterpriseScreen> bscEnterpriseScreenCount(String companyId) {
         LambdaQueryWrapper<BscEnterpriseScreen> queryWrapper = Wrappers.lambdaQuery();

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

@@ -0,0 +1,36 @@
+package com.usky.fire.service.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DataVo implements Serializable {
+
+
+    private String type1;
+
+    private String type2;
+
+    private String type3;
+
+    private String type4;
+
+    private String type5;
+
+    private String type6;
+
+    private String type7;
+}