事件管理-火警告警处置/隐患报警处理-火灾报警处置/故障告警处置

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

@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("alarm_video");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("base_user_company");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 用户单位关联 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Controller
+@RequestMapping("/baseUserCompany")
+public class BaseUserCompanyController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseUserCompany.java

@@ -0,0 +1,51 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 用户单位关联
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseUserCompany implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 用户主键ID
+     */
+    private Integer userId;
+
+    /**
+     * 单位主键ID
+     */
+    private Integer companyId;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/BaseUserCompanyMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.BaseUserCompany;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 用户单位关联 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+public interface BaseUserCompanyMapper extends CrudMapper<BaseUserCompany> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.BaseUserCompany;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 用户单位关联 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+public interface BaseUserCompanyService extends CrudService<BaseUserCompany> {
+
+}

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

@@ -8,12 +8,14 @@ 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.domain.BaseUserCompany;
 import com.usky.fire.mapper.AlarmFireMapper;
 import com.usky.fire.service.AlarmFireService;
+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.system.model.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -34,6 +36,9 @@ import java.util.Map;
 @Service
 public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, AlarmFire> implements AlarmFireService {
 
+    @Autowired
+    private BaseUserCompanyService baseUserCompanyService;
+
     @Override
     public CommonPage<AlarmFireVo> alarmFireLowerList(String companyName, Integer handlingStatus, String startDate, String endDate,
                                                       Integer pageNum, Integer pageSize, String alarmType) {
@@ -45,44 +50,48 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
                 alarmTypeList.add(alarmTypeArray[i]);
             }
         }
-        String userType = null;
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser != null && !"".equals(loginUser)) {
-            userType = loginUser.getUserType();
-        }
-        //缺少单位ID部分代码
-        List<Integer> companyIdList = new ArrayList<>();
-        CommonPage<AlarmFire> alarmFireList = this.alarmFireList(companyIdList, companyName, handlingStatus, startDate, endDate, pageNum, pageSize, alarmTypeList);
+        LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
+        QueryWrapper.select(BaseUserCompany::getCompanyId)
+                .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
+        List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         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.setDeviceCode(alarmFireList.getRecords().get(i).getDeviceCode());
-            alarmFireVo.setCompanyName(alarmFireList.getRecords().get(i).getCompanyName());
-            alarmFireVo.setCompanyId(alarmFireList.getRecords().get(i).getCompanyId());
-            alarmFireVo.setAlarmTime(df.format(alarmFireList.getRecords().get(i).getAlarmTime()));
-            alarmFireVo.setAlarmType(alarmFireList.getRecords().get(i).getAlarmType());
-            alarmFireVo.setConten(alarmFireList.getRecords().get(i).getDeviceName() + "," + alarmFireList.getRecords().get(i).getAttributeValue4());
-            alarmFireVo.setHandlingStatus(alarmFireList.getRecords().get(i).getHandlingStatus());
-            alarmFireVo.setHandler(alarmFireList.getRecords().get(i).getHandler());
-            if (alarmFireList.getRecords().get(i).getHandlingTime() != null) {
-                alarmFireVo.setHandlingTime(df.format(alarmFireList.getRecords().get(i).getHandlingTime()));
-            } else {
-                alarmFireVo.setHandlingTime(null);
+        CommonPage<AlarmFire> alarmFireList = new CommonPage<>();
+        if (CollectionUtils.isNotEmpty(comoanyList)) {
+            List<Integer> companyIdList = new ArrayList<>();
+            for (int i = 0; i < comoanyList.size(); i++) {
+                companyIdList.add(comoanyList.get(i).getCompanyId());
             }
-            alarmFireVo.setFalseAlarm(alarmFireList.getRecords().get(i).getFalseAlarm());
-            alarmFireVo.setHandlingContent(alarmFireList.getRecords().get(i).getHandlingContent());
-            alarmFireVo.setSitePhoto(alarmFireList.getRecords().get(i).getSitePhoto());
-            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());
+            alarmFireList = this.alarmFireList(companyIdList, companyName, handlingStatus, startDate, endDate, pageNum, pageSize, alarmTypeList);
+            for (int i = 0; i < alarmFireList.getRecords().size(); i++) {
+                AlarmFireVo alarmFireVo = new AlarmFireVo();
+                alarmFireVo.setId(alarmFireList.getRecords().get(i).getId());
+                alarmFireVo.setDeviceCode(alarmFireList.getRecords().get(i).getDeviceCode());
+                alarmFireVo.setCompanyName(alarmFireList.getRecords().get(i).getCompanyName());
+                alarmFireVo.setCompanyId(alarmFireList.getRecords().get(i).getCompanyId());
+                alarmFireVo.setAlarmTime(df.format(alarmFireList.getRecords().get(i).getAlarmTime()));
+                alarmFireVo.setAlarmType(alarmFireList.getRecords().get(i).getAlarmType());
+                alarmFireVo.setConten(alarmFireList.getRecords().get(i).getDeviceName() + "," + alarmFireList.getRecords().get(i).getAttributeValue4());
+                alarmFireVo.setHandlingStatus(alarmFireList.getRecords().get(i).getHandlingStatus());
+                alarmFireVo.setHandler(alarmFireList.getRecords().get(i).getHandler());
+                if (alarmFireList.getRecords().get(i).getHandlingTime() != null) {
+                    alarmFireVo.setHandlingTime(df.format(alarmFireList.getRecords().get(i).getHandlingTime()));
+                } else {
+                    alarmFireVo.setHandlingTime(null);
+                }
+                alarmFireVo.setFalseAlarm(alarmFireList.getRecords().get(i).getFalseAlarm());
+                alarmFireVo.setHandlingContent(alarmFireList.getRecords().get(i).getHandlingContent());
+                alarmFireVo.setSitePhoto(alarmFireList.getRecords().get(i).getSitePhoto());
+                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.setSystemType(alarmFireList.getRecords().get(i).getSystemType());
 //            alarmFireVo.setAddress(alarmFireList.getRecords().get(i).getAddress());
 //            alarmFireVo.setAlarmStatus(alarmFireList.getRecords().get(i).getAlarmStatus());
 //            alarmFireVo.setPointType(alarmFireList.getRecords().get(i).getPointType());
 //            alarmFireVo.setHandlerPhone(alarmFireList.getRecords().get(i).getHandlerPhone());
-            list.add(alarmFireVo);
+                list.add(alarmFireVo);
+            }
         }
         return new CommonPage<>(list, alarmFireList.getTotal(), pageSize, pageNum);
     }
@@ -97,32 +106,29 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
                 alarmTypeList.add(alarmTypeArray[i]);
             }
         }
-
-        String userType = null;
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser != null && !"".equals(loginUser)) {
-            userType = loginUser.getUserType();
+        LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
+        QueryWrapper.select(BaseUserCompany::getCompanyId)
+                .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
+        List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
+        int untreated = 0;
+        int processed = 0;
+        Integer count = 0;
+        String disposalRate = "0.00%";
+        if (CollectionUtils.isNotEmpty(comoanyList)) {
+            List<Integer> companyIdList = new ArrayList<>();
+            for (int i = 0; i < comoanyList.size(); i++) {
+                companyIdList.add(comoanyList.get(i).getCompanyId());
+            }
+            untreated = this.fireCount(companyIdList, 0, alarmTypeList);
+            processed = this.fireCount(companyIdList, 1, alarmTypeList);
+            count = untreated + processed;
+            disposalRate = OnlineMethod.myPercent(processed, count);
         }
-        //缺少维保单位部分代码
-        List<Integer> companyIdList = new ArrayList<>();
-
-        int untreated = this.fireCount(companyIdList, 0, alarmTypeList);
-        int processed = this.fireCount(companyIdList, 1, alarmTypeList);
-//        String disposalRate =  processed / (untreated + processed) + "%";
-        Integer count = untreated + processed;
-        String disposalRate = OnlineMethod.myPercent(processed, count);
         Map<String, Object> map = new HashMap<>();
         map.put("untreated", untreated);//告警未处理数
         map.put("processed", processed);//告警未处理数
         map.put("disposalRate", disposalRate);//告警处理率
         map.put("alarmCount", count);//告警总数
-//        map.put("deviceCount", 0);//设备总数
-//        map.put("deviceOfflineCount", 0);//设备离线数
-//        map.put("deviceAlarmCount", 0);//设备告警数
-//        map.put("deviceNormalCount", 0);//设备正常数
-//        map.put("deviceOfflineRate", 0);//设备离线率
-//        map.put("deviceAlarmRate", 0);//设备告警率
-//        map.put("deviceOfflineRate", 0);//设备正常率
         return map;
     }
 
@@ -136,32 +142,35 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
             }
         }
 
-        String userType = null;
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser != null && !"".equals(loginUser)) {
-            userType = loginUser.getUserType();
-        }
-        //缺少维保单位部分代码
-        List<Integer> companyIdList = new ArrayList<>();
-        List<String> alarmTypeListOne = new ArrayList<>();
-        Integer selectStatus = 0;
-        if (alarmTypeList.contains("100")) {
-            selectStatus = 1;
-            alarmTypeListOne.add("2");
-            alarmTypeListOne.add("4");
-        } else {
-            alarmTypeListOne = alarmTypeList;
-        }
-        List<AlarmFireStatisticalVo> list = baseMapper.selectAlarmFireStatistical(companyIdList, alarmTypeListOne, startDate, endDate, selectStatus);
+        LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
+        QueryWrapper.select(BaseUserCompany::getCompanyId)
+                .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
+        List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         List<Integer> alarmCountList = new ArrayList<>();
         List<Integer> handleCountList = new ArrayList<>();
         List<String> alarmTimeList = new ArrayList<>();
         List<String> handleRateList = new ArrayList<>();
-        for (int i = 0; i < list.size(); i++) {
-            alarmCountList.add(list.get(i).getCount());
-            handleCountList.add(list.get(i).getSum());
-            alarmTimeList.add(list.get(i).getAlarmTime());
-            handleRateList.add(OnlineMethod.myPercent(list.get(i).getSum(), list.get(i).getCount()));
+        if (CollectionUtils.isNotEmpty(comoanyList)) {
+            List<Integer> companyIdList = new ArrayList<>();
+            for (int i = 0; i < comoanyList.size(); i++) {
+                companyIdList.add(comoanyList.get(i).getCompanyId());
+            }
+            List<String> alarmTypeListOne = new ArrayList<>();
+            Integer selectStatus = 0;
+            if (alarmTypeList.contains("100")) {
+                selectStatus = 1;
+                alarmTypeListOne.add("2");
+                alarmTypeListOne.add("4");
+            } else {
+                alarmTypeListOne = alarmTypeList;
+            }
+            List<AlarmFireStatisticalVo> list = baseMapper.selectAlarmFireStatistical(companyIdList, alarmTypeListOne, startDate, endDate, selectStatus);
+            for (int i = 0; i < list.size(); i++) {
+                alarmCountList.add(list.get(i).getCount());
+                handleCountList.add(list.get(i).getSum());
+                alarmTimeList.add(list.get(i).getAlarmTime());
+                handleRateList.add(OnlineMethod.myPercent(list.get(i).getSum(), list.get(i).getCount()));
+            }
         }
         Map<String, Object> map = new HashMap<>();
         map.put("alarmCountList", alarmCountList);
@@ -214,44 +223,37 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
                 alarmTypeList.add(alarmTypeArray[i]);
             }
         }
-        String userType = null;
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser != null && !"".equals(loginUser)) {
-            userType = loginUser.getUserType();
-        }
-        //缺少单位ID部分代码
-        List<Integer> companyIdList = new ArrayList<>();
-        CommonPage<AlarmFire> alarmFireList = this.alarmFireList(companyIdList, companyName, handlingStatus, startDate, endDate, 0, 0, alarmTypeList);
+        LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
+        QueryWrapper.select(BaseUserCompany::getCompanyId)
+                .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
+        List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         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.setDeviceCode(alarmFireList.getRecords().get(i).getDeviceCode());
-            alarmFireVo.setCompanyName(alarmFireList.getRecords().get(i).getCompanyName());
-            alarmFireVo.setCompanyId(alarmFireList.getRecords().get(i).getCompanyId());
-            alarmFireVo.setAlarmTime(df.format(alarmFireList.getRecords().get(i).getAlarmTime()));
-            alarmFireVo.setAlarmType(alarmFireList.getRecords().get(i).getAlarmType());
-            alarmFireVo.setConten(alarmFireList.getRecords().get(i).getDeviceName() + "," + alarmFireList.getRecords().get(i).getAttributeValue4());
-            alarmFireVo.setHandlingStatus(alarmFireList.getRecords().get(i).getHandlingStatus());
-            alarmFireVo.setHandler(alarmFireList.getRecords().get(i).getHandler());
-            if (alarmFireList.getRecords().get(i).getHandlingTime() != null) {
-                alarmFireVo.setHandlingTime(df.format(alarmFireList.getRecords().get(i).getHandlingTime()));
-            } else {
-                alarmFireVo.setHandlingTime(null);
+        if (CollectionUtils.isNotEmpty(comoanyList)) {
+            List<Integer> companyIdList = new ArrayList<>();
+            for (int i = 0; i < comoanyList.size(); i++) {
+                companyIdList.add(comoanyList.get(i).getCompanyId());
+            }
+            CommonPage<AlarmFire> alarmFireList = this.alarmFireList(companyIdList, companyName, handlingStatus, startDate, endDate, 0, 0, alarmTypeList);
+            for (int i = 0; i < alarmFireList.getRecords().size(); i++) {
+                AlarmFireVo alarmFireVo = new AlarmFireVo();
+                alarmFireVo.setId(alarmFireList.getRecords().get(i).getId());
+                alarmFireVo.setDeviceCode(alarmFireList.getRecords().get(i).getDeviceCode());
+                alarmFireVo.setCompanyName(alarmFireList.getRecords().get(i).getCompanyName());
+                alarmFireVo.setCompanyId(alarmFireList.getRecords().get(i).getCompanyId());
+                alarmFireVo.setAlarmTime(df.format(alarmFireList.getRecords().get(i).getAlarmTime()));
+                alarmFireVo.setAlarmType(alarmFireList.getRecords().get(i).getAlarmType());
+                alarmFireVo.setConten(alarmFireList.getRecords().get(i).getDeviceName() + "," + alarmFireList.getRecords().get(i).getAttributeValue4());
+                alarmFireVo.setHandlingStatus(alarmFireList.getRecords().get(i).getHandlingStatus());
+                alarmFireVo.setHandler(alarmFireList.getRecords().get(i).getHandler());
+                if (alarmFireList.getRecords().get(i).getHandlingTime() != null) {
+                    alarmFireVo.setHandlingTime(df.format(alarmFireList.getRecords().get(i).getHandlingTime()));
+                } else {
+                    alarmFireVo.setHandlingTime(null);
+                }
+                alarmFireVo.setFalseAlarm(alarmFireList.getRecords().get(i).getFalseAlarm());
+                alarmFireVo.setHandlingContent(alarmFireList.getRecords().get(i).getHandlingContent());
+                list.add(alarmFireVo);
             }
-            alarmFireVo.setFalseAlarm(alarmFireList.getRecords().get(i).getFalseAlarm());
-            alarmFireVo.setHandlingContent(alarmFireList.getRecords().get(i).getHandlingContent());
-//            alarmFireVo.setSystemType(alarmFireList.getRecords().get(i).getSystemType());
-//            alarmFireVo.setAddress(alarmFireList.getRecords().get(i).getAddress());
-//            alarmFireVo.setAlarmStatus(alarmFireList.getRecords().get(i).getAlarmStatus());
-//            alarmFireVo.setPointType(alarmFireList.getRecords().get(i).getPointType());
-//            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.setHandlerPhone(alarmFireList.getRecords().get(i).getHandlerPhone());
-//            alarmFireVo.setSitePhoto(alarmFireList.getRecords().get(i).getSitePhoto());
-            list.add(alarmFireVo);
         }
         return list;
     }

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

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.BaseUserCompany;
+import com.usky.fire.mapper.BaseUserCompanyMapper;
+import com.usky.fire.service.BaseUserCompanyService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户单位关联 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Service
+public class BaseUserCompanyServiceImpl extends AbstractCrudService<BaseUserCompanyMapper, BaseUserCompany> implements BaseUserCompanyService {
+
+}

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseUserCompanyMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.BaseUserCompanyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseUserCompany">
+        <id column="id" property="id" />
+        <result column="user_id" property="userId" />
+        <result column="company_id" property="companyId" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+</mapper>