巡检模块单位添加

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

@@ -35,7 +35,7 @@ public class BaseUserCompany implements Serializable {
     /**
      * 单位主键ID
      */
-    private Integer companyId;
+    private String companyId;
 
     /**
      * 创建人

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

@@ -46,7 +46,7 @@ public class PatrolInspectionArea implements Serializable {
     /**
      * 单位ID
      */
-    private Integer companyId;
+    private String companyId;
 
     /**
      * 租户ID
@@ -72,5 +72,12 @@ public class PatrolInspectionArea implements Serializable {
     @TableField(exist = false)
     private List<PatrolInspectionArea> children = new ArrayList<PatrolInspectionArea>();
 
+    /**
+     * 单位名称
+     */
+    @TableField(exist = false)
+    private String companyName;
+
+
 
 }

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

@@ -19,7 +19,7 @@ import java.util.List;
 @Repository
 public interface AlarmElectricalFireMapper extends CrudMapper<AlarmElectricalFire> {
     List<AlarmFireStatisticalVo> selectElectricalFireStatistical(@Param("table") String table,
-                                                                 @Param("companyIdList") List<Integer> companyIdList,
+                                                                 @Param("companyIdList") List<String> companyIdList,
                                                                  @Param("startDate") String startDate,
                                                                  @Param("endDate") String endDate);
 }

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

@@ -20,7 +20,7 @@ import java.util.List;
 @Repository
 public interface AlarmFireMapper extends CrudMapper<AlarmFire> {
 
-    List<AlarmFireStatisticalVo> selectAlarmFireStatistical(@Param("companyIdList") List<Integer> companyIdList,
+    List<AlarmFireStatisticalVo> selectAlarmFireStatistical(@Param("companyIdList") List<String> companyIdList,
                                                             @Param("alarmTypeList") List<String> alarmTypeList,
                                                             @Param("startDate") String startDate,
                                                             @Param("endDate") String endDate,

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

@@ -59,7 +59,7 @@ public interface AlarmElectricalFireService extends CrudService<AlarmElectricalF
      * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
      * @return
      */
-    Integer electricalFireCount(List<Integer> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate);
+    Integer electricalFireCount(List<String> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate);
 
     /**
      * 事件管理-隐患管理-不同类型隐患-左侧数据统计

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

@@ -39,7 +39,7 @@ public interface AlarmFireService extends CrudService<AlarmFire> {
      * @param alarmTypeList  告警类型（2 火警、4 故障、16 监管等）
      * @return
      */
-    Integer fireCount(List<Integer> companyIdList, Integer handlingStatus, List<String> alarmTypeList,String companyName,String startDate,String endDate);
+    Integer fireCount(List<String> companyIdList, Integer handlingStatus, List<String> alarmTypeList,String companyName,String startDate,String endDate);
 
     /**
      * 火警告警处置/故障告警处置-列表数据查询
@@ -54,6 +54,6 @@ public interface AlarmFireService extends CrudService<AlarmFire> {
      * @param alarmTypeList  告警类型（2 火警、4 故障、16 监管等、100隐患）
      * @return
      */
-    CommonPage<AlarmFire> alarmFireList(List<Integer> companyIdList, String companyName, Integer handlingStatus, String startDate,
+    CommonPage<AlarmFire> alarmFireList(List<String> companyIdList, String companyName, Integer handlingStatus, String startDate,
                                         String endDate, Integer pageNum, Integer pageSize, List<String> alarmTypeList);
 }

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

@@ -41,7 +41,7 @@ public interface AlarmHydrantWaterService extends CrudService<AlarmHydrantWater>
      * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
      * @return
      */
-    Integer hydrantWaterCount(List<Integer> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate);
+    Integer hydrantWaterCount(List<String> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate);
 
     /**
      * 事件管理-隐患管理-消防给水及消火栓-告警处置

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

@@ -41,7 +41,7 @@ public interface AlarmSmokeControlService extends CrudService<AlarmSmokeControl>
      * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
      * @return
      */
-    Integer smokeCount(List<Integer> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate);
+    Integer smokeCount(List<String> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate);
 
     /**
      * 事件管理-隐患管理-防排烟-告警处置

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

@@ -40,7 +40,7 @@ public interface AlarmSprayWaterService extends CrudService<AlarmSprayWater> {
      * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
      * @return
      */
-    Integer sprayWaterCount(List<Integer> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate);
+    Integer sprayWaterCount(List<String> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate);
 
     /**
      * 事件管理-隐患管理-自动喷水灭火-告警处置

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

@@ -40,7 +40,7 @@ public interface AlarmVideoService extends CrudService<AlarmVideo> {
      * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
      * @return
      */
-    Integer videoCount(List<Integer> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate);
+    Integer videoCount(List<String> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate);
 
     /**
      * 事件管理-隐患管理-视频监控-告警处置

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

@@ -28,5 +28,5 @@ public interface BaseCompanyService extends CrudService<BaseCompany> {
      * @param companyIdList 单位ID
      * @return
      */
-    List<BaseCompany> companySelect(List<Integer> companyIdList);
+    List<BaseCompany> companySelect(List<String> companyIdList);
 }

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

@@ -20,5 +20,5 @@ public interface BaseUserCompanyService extends CrudService<BaseUserCompany> {
      *
      * @return
      */
-    List<Integer> companyIdList();
+    List<String> companyIdList();
 }

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

@@ -61,7 +61,7 @@ public class AlarmElectricalFireServiceImpl extends AbstractCrudService<AlarmEle
                 .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
         List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }
@@ -125,7 +125,7 @@ public class AlarmElectricalFireServiceImpl extends AbstractCrudService<AlarmEle
     }
 
     @Override
-    public Integer electricalFireCount(List<Integer> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate) {
+    public Integer electricalFireCount(List<String> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate) {
         LambdaQueryWrapper<AlarmElectricalFire> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.in(AlarmElectricalFire::getCompanyId, companyIdList)
                 .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmElectricalFire::getAlarmTime, startDate, endDate)
@@ -147,7 +147,7 @@ public class AlarmElectricalFireServiceImpl extends AbstractCrudService<AlarmEle
         Integer count = 0;
         String disposalRate = "0.00%";
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }
@@ -196,7 +196,7 @@ public class AlarmElectricalFireServiceImpl extends AbstractCrudService<AlarmEle
         List<String> alarmTimeList = new ArrayList<>();
         List<String> handleRateList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }
@@ -297,7 +297,7 @@ public class AlarmElectricalFireServiceImpl extends AbstractCrudService<AlarmEle
                 .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
         List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }

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

@@ -69,7 +69,7 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
         List<AlarmFireVo> list = new ArrayList<>();
         CommonPage<AlarmFire> alarmFireList = new CommonPage<>();
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }
@@ -128,7 +128,7 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
         Integer count = 0;
         String disposalRate = "0.00%";
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }
@@ -164,7 +164,7 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
         List<String> alarmTimeList = new ArrayList<>();
         List<String> handleRateList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }
@@ -243,7 +243,7 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
         List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         List<AlarmFireVo> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }
@@ -275,7 +275,7 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
 
 
     @Override
-    public String alarmFireExport(String companyName, Integer handlingStatus, String startDate, String endDate, String alarmType,String exportTitle) {
+    public String alarmFireExport(String companyName, Integer handlingStatus, String startDate, String endDate, String alarmType, String exportTitle) {
         DateFormat dFormat = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒");
         Workbook workbook = null;
         File file = null;
@@ -311,7 +311,7 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
 
 
     @Override
-    public Integer fireCount(List<Integer> companyIdList, Integer handlingStatus, List<String> alarmTypeList, String companyName, String startDate, String endDate) {
+    public Integer fireCount(List<String> companyIdList, Integer handlingStatus, List<String> alarmTypeList, String companyName, String startDate, String endDate) {
         LambdaQueryWrapper<AlarmFire> queryWrapper = Wrappers.lambdaQuery();
         if (companyIdList.size() > 0) {
             queryWrapper.in(AlarmFire::getCompanyId, companyIdList);
@@ -335,7 +335,7 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
 
 
     @Override
-    public CommonPage<AlarmFire> alarmFireList(List<Integer> companyIdList, String companyName, Integer handlingStatus, String startDate,
+    public CommonPage<AlarmFire> alarmFireList(List<String> companyIdList, String companyName, Integer handlingStatus, String startDate,
                                                String endDate, Integer pageNum, Integer pageSize, List<String> alarmTypeList) {
         LambdaQueryWrapper<AlarmFire> queryWrapper = Wrappers.lambdaQuery();
         if (companyIdList.size() > 0) {

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

@@ -47,7 +47,7 @@ public class AlarmHydrantWaterServiceImpl extends AbstractCrudService<AlarmHydra
                 .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
         List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }
@@ -76,7 +76,7 @@ public class AlarmHydrantWaterServiceImpl extends AbstractCrudService<AlarmHydra
     }
 
     @Override
-    public Integer hydrantWaterCount(List<Integer> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate) {
+    public Integer hydrantWaterCount(List<String> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate) {
         LambdaQueryWrapper<AlarmHydrantWater> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.in(AlarmHydrantWater::getCompanyId, companyIdList)
                 .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmHydrantWater::getAlarmTime, startDate, endDate)
@@ -121,7 +121,7 @@ public class AlarmHydrantWaterServiceImpl extends AbstractCrudService<AlarmHydra
                 .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
         List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }

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

@@ -47,7 +47,7 @@ public class AlarmSmokeControlServiceImpl extends AbstractCrudService<AlarmSmoke
                 .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
         List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }
@@ -76,7 +76,7 @@ public class AlarmSmokeControlServiceImpl extends AbstractCrudService<AlarmSmoke
 
 
     @Override
-    public Integer smokeCount(List<Integer> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate) {
+    public Integer smokeCount(List<String> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate) {
         LambdaQueryWrapper<AlarmSmokeControl> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.in(AlarmSmokeControl::getCompanyId, companyIdList)
                 .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmSmokeControl::getAlarmTime, startDate, endDate)
@@ -121,7 +121,7 @@ public class AlarmSmokeControlServiceImpl extends AbstractCrudService<AlarmSmoke
                 .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
         List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }

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

@@ -47,7 +47,7 @@ public class AlarmSprayWaterServiceImpl extends AbstractCrudService<AlarmSprayWa
                 .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
         List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }
@@ -76,7 +76,7 @@ public class AlarmSprayWaterServiceImpl extends AbstractCrudService<AlarmSprayWa
     }
 
     @Override
-    public Integer sprayWaterCount(List<Integer> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate) {
+    public Integer sprayWaterCount(List<String> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate) {
         LambdaQueryWrapper<AlarmSprayWater> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.in(AlarmSprayWater::getCompanyId, companyIdList)
                 .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmSprayWater::getAlarmTime, startDate, endDate)
@@ -122,7 +122,7 @@ public class AlarmSprayWaterServiceImpl extends AbstractCrudService<AlarmSprayWa
                 .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
         List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }

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

@@ -47,7 +47,7 @@ public class AlarmVideoServiceImpl extends AbstractCrudService<AlarmVideoMapper,
                 .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
         List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }
@@ -76,7 +76,7 @@ public class AlarmVideoServiceImpl extends AbstractCrudService<AlarmVideoMapper,
 
 
     @Override
-    public Integer videoCount(List<Integer> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate) {
+    public Integer videoCount(List<String> companyIdList, Integer handlingStatus, String companyName, String startDate, String endDate) {
         LambdaQueryWrapper<AlarmVideo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.in(AlarmVideo::getCompanyId, companyIdList)
                 .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmVideo::getAlarmTime, startDate, endDate)
@@ -122,7 +122,7 @@ public class AlarmVideoServiceImpl extends AbstractCrudService<AlarmVideoMapper,
                 .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
         List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
         if (CollectionUtils.isNotEmpty(comoanyList)) {
-            List<Integer> companyIdList = new ArrayList<>();
+            List<String> companyIdList = new ArrayList<>();
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());
             }

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

@@ -30,7 +30,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
 
     @Override
     public List<BaseCompany> userCompanySelect() {
-        List<Integer> companyIdList = baseUserCompanyService.companyIdList();
+        List<String> companyIdList = baseUserCompanyService.companyIdList();
         List<BaseCompany> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(companyIdList)) {
             list = this.companySelect(companyIdList);
@@ -40,7 +40,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
 
 
     @Override
-    public List<BaseCompany> companySelect(List<Integer> companyIdList) {
+    public List<BaseCompany> companySelect(List<String> companyIdList) {
         LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(BaseCompany::getCompanyId, BaseCompany::getCompanyName)
                 .in(BaseCompany::getCompanyId, companyIdList)

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

@@ -25,12 +25,12 @@ import java.util.List;
 public class BaseUserCompanyServiceImpl extends AbstractCrudService<BaseUserCompanyMapper, BaseUserCompany> implements BaseUserCompanyService {
 
     @Override
-    public List<Integer> companyIdList() {
+    public List<String> companyIdList() {
         LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
         QueryWrapper.select(BaseUserCompany::getCompanyId)
                 .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
         List<BaseUserCompany> comoanyList = this.list(QueryWrapper);
-        List<Integer> companyIdList = new ArrayList<>();
+        List<String> companyIdList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(comoanyList)) {
             for (int i = 0; i < comoanyList.size(); i++) {
                 companyIdList.add(comoanyList.get(i).getCompanyId());

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

@@ -1,16 +1,19 @@
 package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.BaseCompany;
 import com.usky.fire.domain.PatrolInspectionArea;
 import com.usky.fire.mapper.PatrolInspectionAreaMapper;
+import com.usky.fire.service.BaseCompanyService;
 import com.usky.fire.service.PatrolInspectionAreaService;
-import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.PatrolInspectionAreaVo;
 import com.usky.system.model.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -28,6 +31,9 @@ import java.util.List;
 @Service
 public class PatrolInspectionAreaServiceImpl extends AbstractCrudService<PatrolInspectionAreaMapper, PatrolInspectionArea> implements PatrolInspectionAreaService {
 
+    @Autowired
+    private BaseCompanyService baseCompanyService;
+
     /**
      * 巡查自检-巡检区域-新增
      *
@@ -97,8 +103,19 @@ public class PatrolInspectionAreaServiceImpl extends AbstractCrudService<PatrolI
      * @param patrolInspectionArea
      */
     @Override
+    @Transactional
     public void updatePatrolInspectionArea(PatrolInspectionArea patrolInspectionArea) {
         this.updateById(patrolInspectionArea);
+        LambdaQueryWrapper<PatrolInspectionArea> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(PatrolInspectionArea::getAreaFid, patrolInspectionArea.getId())
+                .eq(PatrolInspectionArea::getEnable, 1);
+        List<PatrolInspectionArea> list = this.list(queryWrapper);
+        for (int i = 0; i < list.size(); i++) {
+            PatrolInspectionArea patrolInspectionAreaSon = new PatrolInspectionArea();
+            patrolInspectionAreaSon.setId(list.get(i).getId());
+            patrolInspectionAreaSon.setCompanyId(patrolInspectionArea.getCompanyId());
+            this.updateById(patrolInspectionAreaSon);
+        }
     }
 
     /**
@@ -154,6 +171,16 @@ public class PatrolInspectionAreaServiceImpl extends AbstractCrudService<PatrolI
         }
         queryWrapper.orderByDesc(PatrolInspectionArea::getId);
         List<PatrolInspectionArea> list = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<BaseCompany> companyList = baseCompanyService.userCompanySelect();
+            for (int i = 0; i < list.size(); i++) {
+                for (int j = 0; j < companyList.size(); j++) {
+                    if (list.get(i).getCompanyId().equals(companyList.get(j).getCompanyId())) {
+                        list.get(i).setCompanyName(companyList.get(j).getCompanyName());
+                    }
+                }
+            }
+        }
         return list;
     }
 

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

@@ -52,7 +52,7 @@ public class PatrolInspectionAreaVo implements Serializable {
     /**
      * 单位ID
      */
-    private Integer companyId;
+    private String companyId;
 
     /**
      * 租户ID