1.消防视频及建筑自测bug修复526105265

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/AreaServiceImpl.java

 package com.yeejoin.equipmanage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.equipmanage.common.dto.AreaDto;
@@ -27,7 +25,6 @@ import com.yeejoin.equipmanage.operation.AreaSynRiskOperator;
 import com.yeejoin.equipmanage.service.IAreaService;
 import com.yeejoin.equipmanage.service.IEqSourceFileService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
-import liquibase.pro.packaged.o;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -39,7 +36,6 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -221,11 +217,12 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
 
     /**
      * 获取某个父节点下面的所有子节点
+     *
      * @param list
      * @param pid
      * @return
      */
-    public static List<UnitAreaTreeVo> treeMenuList (List<UnitAreaTreeVo> list, Long pid) {
+    public static List<UnitAreaTreeVo> treeMenuList(List<UnitAreaTreeVo> list, Long pid) {
         List<UnitAreaTreeVo> voList = new ArrayList<>();
         for (UnitAreaTreeVo vo : list) {
             //遍历出父id等于参数的id，add进子节点集合
@@ -242,7 +239,10 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
     public List<UnitAreaTreeVo> getAreaTreeListVo() {
         // 获取公司list
         List<OrgUsrDto> orgCompanyLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey, "COMPANY");
-        Map<String,Long> orgMap = orgCompanyLists.stream().collect(Collectors.toMap(OrgUsrDto::getBizOrgCode,OrgUsrDto::getSequenceNbr));
+        if (orgCompanyLists.isEmpty()) {
+            return new ArrayList<>();
+        }
+        Map<String, Long> orgMap = orgCompanyLists.stream().collect(Collectors.toMap(OrgUsrDto::getBizOrgCode, OrgUsrDto::getSequenceNbr));
         List<UnitAreaTreeVo> orgTreeList = orgCompanyLists.stream()
                 .map(orgUsrDto -> {
                     UnitAreaTreeVo vo = new UnitAreaTreeVo();
@@ -273,13 +273,13 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
                     return vo;
                 }).collect(Collectors.toList());
         orgTreeList.addAll(areaTreeVoList);
-        return orgTreeList.stream().filter(o-> orgTreeList.stream().noneMatch(a->a.getId().equals(o.getParentId()))).peek(a->{
-            a.setChildren(getChildrenFromData(a.getId(),orgTreeList));
+        return orgTreeList.stream().filter(o -> orgTreeList.stream().noneMatch(a -> a.getId().equals(o.getParentId()))).peek(a -> {
+            a.setChildren(getChildrenFromData(a.getId(), orgTreeList));
         }).collect(Collectors.toList());
     }
 
     private List<UnitAreaTreeVo> getChildrenFromData(Long parentId, List<UnitAreaTreeVo> areaTreeList) {
-        return areaTreeList.stream().filter(a->parentId.equals(a.getParentId())).peek(e-> e.setChildren(getChildrenFromData(e.getId(),areaTreeList))).collect(Collectors.toList());
+        return areaTreeList.stream().filter(a -> parentId.equals(a.getParentId())).peek(e -> e.setChildren(getChildrenFromData(e.getId(), areaTreeList))).collect(Collectors.toList());
     }
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -1128,6 +1128,9 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         List<BuildingTreeVo> buildingTreeVos = getBuildingTreeVos(false);
         // 1.获取公司list
         List<OrgUsrDto> orgUsrLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey, "COMPANY");
+        if(orgUsrLists.isEmpty()){
+            return new ArrayList<>();
+        }
         // 2.数据结构转换
         List<BuildingTreeVo> companyList = orgUsrLists.stream().map(orgUsrDto -> {
             BuildingTreeVo vo = new BuildingTreeVo();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoServiceImpl.java

@@ -148,8 +148,6 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
                 throw new RuntimeException("监控设备与楼层:" + errorMeg + ",存在绑定关系，无法删除");
             }
         }
-        ;
-
         QueryWrapper<VideoEquipmentSpecific> videoEquipmentSpecificQueryWrapper = new QueryWrapper<>();
         videoEquipmentSpecificQueryWrapper.in("video_id", ids);
         videoEquipmentSpecificService.remove(videoEquipmentSpecificQueryWrapper);

amos-boot-system-equip/src/main/resources/mapper/FormInstanceMapper.xml

@@ -502,7 +502,8 @@ WHERE
         COUNT( vs.video_id ) AS total
     FROM
         get_building_tree b
-        LEFT JOIN wl_video_source vs ON FIND_IN_SET( b.instanceId, vs.parent_source_ids )
+        JOIN wl_video_source vs ON FIND_IN_SET( b.instanceId, vs.parent_source_ids )
+        JOIN wl_video v on v.id = vs.video_id
     GROUP BY
         b.instanceId
 </select>