Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java

@@ -47,7 +47,7 @@ public interface WaterResourceMapper extends BaseMapper<WaterResource> {
      */
     Page<WaterResourceDto> getWaterResourcePageByParams(Page<WaterResourceDto> page, String name, String resourceType,
                                                         ArrayList<Long> belongBuildingId, Long belongFightingSystemId,
-                                                        Long sequenceNbr, String equipId,String bizOrgCode);
-    
-    Map<String, Object> getWaterTypeByBizOrgCode(String bizOrgCode);
+                                                        Long sequenceNbr, String equipId,String bizOrgCode, String equipCateGoryCode);
+
+    List<Map<String, Object>> getWaterTypeByBizOrgCode(String bizOrgCode);
  }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -134,6 +134,7 @@
         select * from cb_water_resource where is_delete = 1
         <if test="sequenceNbr != null and sequenceNbr != ''">and sequence_nbr = #{sequenceNbr}</if>
         <if test="resourceType != null and resourceType != ''">and resource_type = #{resourceType}</if>
+        <if test="equipCateGoryCode != null and equipCateGoryCode != ''">and equip_category_code = #{equipCateGoryCode}</if>
         <if test="equipId != null and equipId != ''">and equip_id = #{equipId}</if>
         <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
         <if test="belongFightingSystemId != null">
@@ -152,15 +153,15 @@
     </select>
 	<select id="getWaterTypeByBizOrgCode" resultType="map">
      SELECT
-		equip_category_code,
+        equip_category_code type,
 		COUNT(sequence_nbr) as num
 	FROM
 		cb_water_resource
 	WHERE
-		is_delete = 0
+		is_delete = 1
 		   <if test="bizOrgCode != null and bizOrgCode != ''">AND biz_org_code like concat( #{bizOrgCode}, '%')</if>
 	GROUP BY
-	equip_category_code
+    equip_category_code
 
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Video.java

 package com.yeejoin.equipmanage.common.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
@@ -130,10 +131,10 @@ public class Video extends BaseEntity {
     private String belongAreaId;
 
     @ApiModelProperty(value = "机构编码")
-    @TableField(value = "biz_org_code")
+    @TableField(value = "biz_org_code", updateStrategy = FieldStrategy.IGNORED)
     private String bizOrgCode;
 
     @ApiModelProperty(value = "机构/部门名称")
-    @TableField(value = "biz_org_name")
+    @TableField(value = "biz_org_name", updateStrategy = FieldStrategy.IGNORED)
     private String bizOrgName;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/WarehouseStructure.java

@@ -48,6 +48,19 @@ public class WarehouseStructure extends BaseEntity {
 	@ApiModelProperty(value = "仓库ID")
 	private Long warehouseId;
 
+
+	//新加
+
+	@ApiModelProperty(value = "机构/部门名称")
+	@TableField("biz_org_name")
+	private String bizOrgName;
+
+	@ApiModelProperty(value = "机构编码")
+	@TableField("biz_org_code")
+	private String bizOrgCode;
+
+
+
 	private String remark;
 	
 	@ApiModelProperty(value = "预控系统中的ID字段")

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/BuildingVideoListVO.java

@@ -63,6 +63,12 @@ public class BuildingVideoListVO {
      * id列表
      */
     @ApiModelProperty("机构编码")
+    private String bizOrgCode;
+
+    /**
+     * id列表
+     */
+    @ApiModelProperty("机构编码")
     private List<String> bizOrgCodeList;
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

@@ -471,14 +471,15 @@ public class WaterResourceController extends BaseController {
                                                               Long belongFightingSystemId, Long sequenceNbr,
                                                               String resourceType,
                                                               String classifyId,
-                                                              String bizOrgCode) {
+                                                              String bizOrgCode,
+                                                              String equipCateGoryCode) {
         Page<WaterResourceDto> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
 
         /*bug 2913 更换保存方式 存储到公共附件表 chenzhao 2021-10-18 start*/
         Page<WaterResourceDto> waterResourceDtoPage = waterResourceServiceImpl.queryForWaterResourcePage(page, name, resourceType,
-                belongBuildingId, belongFightingSystemId, sequenceNbr, classifyId,bizOrgCode);
+                belongBuildingId, belongFightingSystemId, sequenceNbr, classifyId,bizOrgCode,  equipCateGoryCode);
         List<WaterResourceDto> records = waterResourceDtoPage.getRecords();
         records.forEach(i->{
             Map<String, List<AttachmentDto>> attachments = sourceFileService.getAttachments(i.getSequenceNbr());

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import static org.hamcrest.CoreMatchers.nullValue;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import javax.annotation.Resource;
-
-import com.yeejoin.amos.boot.biz.common.utils.Menu;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -31,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
+import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
@@ -49,6 +28,24 @@ import com.yeejoin.amos.boot.module.common.api.enums.WaterResourceTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * 服务实现类
@@ -73,11 +70,12 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
     WaterResourceMapper waterResourceMapper;
     @Autowired
     WaterResourceIndexServiceImpl waterResourceIndexServiceImpl;
-    
+
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
     @Autowired
     EquipFeignClient equipFeignClient;
+
     /**
      * 分页查询
      */
@@ -88,9 +86,10 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
                                                             @Condition(Operator.eq) Long belongFightingSystemId,
                                                             @Condition(Operator.eq) Long sequenceNbr,
                                                             String equipId,
-                                                            String bizOrgCode) {
+                                                            String bizOrgCode,
+                                                            String equipCateGoryCode) {
         return this.waterResourceMapper.getWaterResourcePageByParams(page, name, resourceType, belongBuildingId,
-                belongFightingSystemId, sequenceNbr, equipId,bizOrgCode);
+                belongFightingSystemId, sequenceNbr, equipId, bizOrgCode, equipCateGoryCode);
     }
 
     /**
@@ -190,9 +189,9 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
     /**
      * 导出列表
      */
-    public List<WaterResourceDto> exportToExcel(Boolean isDelete,String name,
+    public List<WaterResourceDto> exportToExcel(Boolean isDelete, String name,
                                                 String resourceType) {
-        return waterResourceMapper.exportToExcel(isDelete,name,resourceType);
+        return waterResourceMapper.exportToExcel(isDelete, name, resourceType);
     }
 
     @Override
@@ -218,24 +217,24 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
         waterResourceDto.setRealityImgList(JSONArray.parseArray(waterResourceDto.getRealityImg(), Object.class));
         waterResourceDto.setOrientationImgList(JSONArray.parseArray(waterResourceDto.getOrientationImg()));
 
-        if(ValidationUtil.isEmpty(waterResourceDto.getContactUser())) {
+        if (ValidationUtil.isEmpty(waterResourceDto.getContactUser())) {
             waterResourceDto.setContactUser("");
         }
 
-        if(ValidationUtil.isEmpty(waterResourceDto.getContactPhone())) {
+        if (ValidationUtil.isEmpty(waterResourceDto.getContactPhone())) {
             waterResourceDto.setContactPhone("");
         }
 
-        if(ValidationUtil.isEmpty(waterResourceDto.getManagementUnit())) {
+        if (ValidationUtil.isEmpty(waterResourceDto.getManagementUnit())) {
             waterResourceDto.setManagementUnit("");
         }
 
-        if(ValidationUtil.isEmpty(waterResourceDto.getSection())) {
+        if (ValidationUtil.isEmpty(waterResourceDto.getSection())) {
             waterResourceDto.setSection("");
         }
 
 
-        if(ValidationUtil.isEmpty(waterResourceDto.getWaterSupplyName())) {
+        if (ValidationUtil.isEmpty(waterResourceDto.getWaterSupplyName())) {
             waterResourceDto.setWaterSupplyName("");
         }
 
@@ -249,7 +248,7 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
                             waterResourceHydrantService.getOne(new QueryWrapper<WaterResourceHydrant>().eq(
                                     "resource_id",
                                     sequenceNbr));
-                    if(null != waterResourceHydrant) {
+                    if (null != waterResourceHydrant) {
                         BeanUtils.copyProperties(waterResourceHydrant, waterResourceDto);
                     }
                     break;
@@ -257,7 +256,7 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
                     WaterResourceCrane waterResourceCrane =
                             waterResourceCraneService.getOne(new QueryWrapper<WaterResourceCrane>().eq("resource_id",
                                     sequenceNbr));
-                    if(null != waterResourceCrane) {
+                    if (null != waterResourceCrane) {
                         BeanUtils.copyProperties(waterResourceCrane, waterResourceDto);
                     }
                     break;
@@ -266,7 +265,7 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
                             waterResourceNaturalService.getOne(new QueryWrapper<WaterResourceNatural>().eq(
                                     "resource_id",
                                     sequenceNbr));
-                    if(null != waterResourceNatural) {
+                    if (null != waterResourceNatural) {
                         BeanUtils.copyProperties(waterResourceNatural, waterResourceDto);
                     }
 
@@ -275,7 +274,7 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
                     WaterResourcePool waterResourcePool =
                             waterResourcePoolService.getOne(new QueryWrapper<WaterResourcePool>().eq("resource_id",
                                     sequenceNbr));
-                    if(null != waterResourcePool) {
+                    if (null != waterResourcePool) {
                         BeanUtils.copyProperties(waterResourcePool, waterResourceDto);
                     }
                     break;
@@ -285,12 +284,12 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
         waterResourceDto.setIsDelete(isDelete);
         // 查询物联参数
         LambdaQueryWrapper<WaterResourceIndex> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WaterResourceIndex::getWaterId,waterResourceDto.getSequenceNbr());
+        queryWrapper.eq(WaterResourceIndex::getWaterId, waterResourceDto.getSequenceNbr());
         List<WaterResourceIndex> list = waterResourceIndexServiceImpl.list(queryWrapper);
-        if(list.size()>0) {
-            Map<String,Object> map = new HashMap<>();
-            list.stream().forEach(e->{
-                map.put(e.getNameKey(),e.getPerfValue());
+        if (list.size() > 0) {
+            Map<String, Object> map = new HashMap<>();
+            list.stream().forEach(e -> {
+                map.put(e.getNameKey(), e.getPerfValue());
             });
             waterResourceDto.setWaterResourceIotDto(map);
         }
@@ -328,69 +327,110 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
         return result;
     }
 
-	public List<Menu> getwaterResourceTypeTree(String bizOrgCode) throws Exception {
-        List<Menu> list  = new ArrayList<>();
-		ResponseModel <Object>  response= 	equipFeignClient.list();
-		if(response.getStatus() != 200) {
-			return null;
-		}
-		Object resultObject =	response.getResult();
-		JSONArray childrenArray = null;
-		JSONArray waterTypeDetailArray = null;
-		JSONObject waterTypeDetailJson=null;
-		JSONArray resultArray =	JSONArray.parseArray(JSONArray.toJSONString(resultObject));
-		for (Object obj : resultArray) {
-			JSONObject detailJsonObject=	JSONObject.parseObject(JSONObject.toJSONString(obj));
-			String codeString =	detailJsonObject.getString("code");
-			if(codeString.equals("90000000")) {
-				childrenArray = detailJsonObject.getJSONArray("children");
-				break;
-			}
-		}
-		if(childrenArray!=null && childrenArray.size()>0) {
-			for (Object childObject : childrenArray) {
-				JSONObject detailChildJsonObject=	JSONObject.parseObject(JSONObject.toJSONString(childObject));
-				String codeStr =	detailChildJsonObject.getString("code");
-				if(codeStr.equals("93000000")) {
-					waterTypeDetailArray=detailChildJsonObject.getJSONArray("children");
-					break;
-				}
-			}
-			
-		}
-		if(waterTypeDetailArray!=null && waterTypeDetailArray.size()>0) {
-			for (Object childObject : waterTypeDetailArray) {
-				JSONObject waterTypeDetail=	JSONObject.parseObject(JSONObject.toJSONString(childObject));
-				String codeStr =	waterTypeDetail.getString("code");
-				if(codeStr.equals("93060000")) {
-					waterTypeDetailJson =	waterTypeDetail;
-					break;
-				}
-			}
-		}
-		if(waterTypeDetailJson!=null) {
-			Map<String, Object>  map=	waterResourceMapper.getWaterTypeByBizOrgCode(bizOrgCode);
-			int num=0;
-			JSONArray waterTypeDetailChildrenArray = waterTypeDetailJson.getJSONArray("children");
-			JSONArray array = new JSONArray();
-			for (Object childObject : waterTypeDetailChildrenArray) {
-
-				JSONObject detail=	JSONObject.parseObject(JSONObject.toJSONString(childObject));
-				String codeStr =	detail.getString("code");
-				if(map!=null && map.containsKey(codeStr)) {
-					num=num+Integer.parseInt( map.get("codeStr").toString());
-					detail.put("num", Integer.parseInt( map.get("codeStr").toString()));
-				}else {
-					detail.put("num", 0);
-				}
-                Menu menu = new Menu(Long.valueOf(detail.get("id").toString()) ,detail.get("name").toString(),null,Integer.parseInt(detail.get("num").toString()));
+    public List<Menu> getwaterResourceTypeTree(String bizOrgCode) throws Exception {
+        List<Menu> list = new ArrayList<>();
+        ResponseModel<Object> response = equipFeignClient.list();
+        if (response.getStatus() != 200) {
+            return null;
+        }
+        Object resultObject = response.getResult();
+        JSONArray childrenArray = null;
+        JSONArray waterTypeDetailArray = null;
+        JSONObject waterTypeDetailJson = null;
+        JSONArray resultArray = JSONArray.parseArray(JSONArray.toJSONString(resultObject));
+        for (Object obj : resultArray) {
+            JSONObject detailJsonObject = JSONObject.parseObject(JSONObject.toJSONString(obj));
+            String codeString = detailJsonObject.getString("code");
+            if (codeString.equals("90000000")) {
+                childrenArray = detailJsonObject.getJSONArray("children");
+                break;
+            }
+        }
+        if (childrenArray != null && childrenArray.size() > 0) {
+            for (Object childObject : childrenArray) {
+                JSONObject detailChildJsonObject = JSONObject.parseObject(JSONObject.toJSONString(childObject));
+                String codeStr = detailChildJsonObject.getString("code");
+                if (codeStr.equals("93000000")) {
+                    waterTypeDetailArray = detailChildJsonObject.getJSONArray("children");
+                    break;
+                }
+            }
+
+        }
+        if (waterTypeDetailArray != null && waterTypeDetailArray.size() > 0) {
+            for (Object childObject : waterTypeDetailArray) {
+                JSONObject waterTypeDetail = JSONObject.parseObject(JSONObject.toJSONString(childObject));
+                String codeStr = waterTypeDetail.getString("code");
+                if (codeStr.equals("93060000")) {
+                    waterTypeDetailJson = waterTypeDetail;
+                    break;
+                }
+            }
+        }
+        if (waterTypeDetailJson != null) {
+            List<Map<String, Object>> mapList = waterResourceMapper.getWaterTypeByBizOrgCode(bizOrgCode);
+            Map<String, Object> map = new HashMap<>();
+            for (Map<String, Object> m : mapList) {
+                String key = "";
+                String value = "";
+                for(Map.Entry<String,Object> entry : m.entrySet()) {
+                    if(entry.getKey().equals("num")) {
+                        value = entry.getValue().toString();
+                    }
+                    if(entry.getKey().equals("type")) {
+                        key = entry.getValue().toString();
+                    }
+                }
+                map.put(key,value);
+            }
+            int num = 0;
+            JSONArray waterTypeDetailChildrenArray = waterTypeDetailJson.getJSONArray("children");
+            JSONArray array = new JSONArray();
+            for (Object childObject : waterTypeDetailChildrenArray) {
+
+                JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(childObject));
+                String codeStr = detail.getString("code");
+                if(map!=null && map.containsKey(codeStr)) {
+                    num=num+Integer.parseInt( map.get(codeStr).toString());
+                    detail.put("num", Integer.parseInt( map.get(codeStr).toString()));
+                }else {
+                    detail.put("num", 0);
+                }
+//                    if ("93060100".equals(codeStr) && map.containsKey("pool")
+//                           ) {
+//                        num = num + Integer.parseInt(map.get("pool").toString());
+//                        detail.put("num", Integer.parseInt(map.get("pool").toString()));
+//                    }
+//
+//                    if (
+//                          "93060200".equals(codeStr) &&  map.containsKey("crane")
+//                           ) {
+//                        num = num + Integer.parseInt(map.get("crane").toString());
+//                        detail.put("num", Integer.parseInt(map.get("crane").toString()));
+//                    }
+//
+//                    if (
+//                           "93060300".equals(codeStr) &&  map.containsKey("natural")
+//                           ) {
+//                        num = num + Integer.parseInt(map.get("natural").toString());
+//                        detail.put("num", Integer.parseInt(map.get("natural").toString()));
+//                    }
+//
+//                    if (
+//                         "93060400".equals(codeStr) &&  map.containsKey("hydrant")
+//                    ) {
+//                        num = num + Integer.parseInt(map.get("hydrant").toString());
+//                        detail.put("num", Integer.parseInt(map.get("hydrant").toString()));
+//                    }
+
+                Menu menu = new Menu(Long.valueOf(detail.get("code").toString()), detail.get("name").toString(), null, Integer.parseInt(detail.containsKey("num") ? detail.get("num").toString() : "0" ));
                 list.add(menu);
 
 //				if (detail.get("children").toString().length() == 2) {
 //                    detail.put("children",null);
 //                }
 //				array.add(detail);
-			}
+        }
 //			waterTypeDetailJson.remove("children");
 //            if(array.size() == 0) {
 //                waterTypeDetailJson.put("children", null);
@@ -398,62 +438,63 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
 //                waterTypeDetailJson.put("children", array);
 //            }
 //			waterTypeDetailJson.put("num", num);
-		}
-		return	list;
-	}
-	public Object getwaterResourceType() throws Exception {
-		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-		ResponseModel <Object>  response= 	equipFeignClient.list();
-		if(response.getStatus() != 200) {
-			return null;
-		}
-		Object resultObject =	response.getResult();
-		JSONArray childrenArray = null;
-		JSONArray waterTypeDetailArray = null;
-		JSONObject waterTypeDetailJson=null;
-		JSONArray resultArray =	JSONArray.parseArray(JSONArray.toJSONString(resultObject));
-		for (Object obj : resultArray) {
-			JSONObject detailJsonObject=	JSONObject.parseObject(JSONObject.toJSONString(obj));
-			String codeString =	detailJsonObject.getString("code");
-			if(codeString.equals("90000000")) {
-				childrenArray = detailJsonObject.getJSONArray("children");
-				break;
-			}
-		}
-		if(childrenArray!=null && childrenArray.size()>0) {
-			for (Object childObject : childrenArray) {
-				JSONObject detailChildJsonObject=	JSONObject.parseObject(JSONObject.toJSONString(childObject));
-				String codeStr =	detailChildJsonObject.getString("code");
-				if(codeStr.equals("93000000")) {
-					waterTypeDetailArray=detailChildJsonObject.getJSONArray("children");
-					break;
-				}
-			}
-			
-		}
-		if(waterTypeDetailArray!=null && waterTypeDetailArray.size()>0) {
-			for (Object childObject : waterTypeDetailArray) {
-				JSONObject waterTypeDetail=	JSONObject.parseObject(JSONObject.toJSONString(childObject));
-				String codeStr =	waterTypeDetail.getString("code");
-				if(codeStr.equals("93060000")) {
-					waterTypeDetailJson =	waterTypeDetail;
-					break;
-				}
-			}
-		}
-		if(waterTypeDetailJson!=null) {
-			JSONArray waterTypeDetailChildrenArray = waterTypeDetailJson.getJSONArray("children");
-			
-			for (Object childObject : waterTypeDetailChildrenArray) {
-				Map<String, Object> map = new LinkedHashMap<>();
-				JSONObject detail=	JSONObject.parseObject(JSONObject.toJSONString(childObject));
-				String codeStr =	detail.getString("code");
-				String name =	detail.getString("name");
-				map.put("code", codeStr);
-				map.put("name", name);
-				list.add(map);
-			}
-		}
-		return	list;
-	}
+        }
+        return list;
+    }
+
+    public Object getwaterResourceType() throws Exception {
+        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+        ResponseModel<Object> response = equipFeignClient.list();
+        if (response.getStatus() != 200) {
+            return null;
+        }
+        Object resultObject = response.getResult();
+        JSONArray childrenArray = null;
+        JSONArray waterTypeDetailArray = null;
+        JSONObject waterTypeDetailJson = null;
+        JSONArray resultArray = JSONArray.parseArray(JSONArray.toJSONString(resultObject));
+        for (Object obj : resultArray) {
+            JSONObject detailJsonObject = JSONObject.parseObject(JSONObject.toJSONString(obj));
+            String codeString = detailJsonObject.getString("code");
+            if (codeString.equals("90000000")) {
+                childrenArray = detailJsonObject.getJSONArray("children");
+                break;
+            }
+        }
+        if (childrenArray != null && childrenArray.size() > 0) {
+            for (Object childObject : childrenArray) {
+                JSONObject detailChildJsonObject = JSONObject.parseObject(JSONObject.toJSONString(childObject));
+                String codeStr = detailChildJsonObject.getString("code");
+                if (codeStr.equals("93000000")) {
+                    waterTypeDetailArray = detailChildJsonObject.getJSONArray("children");
+                    break;
+                }
+            }
+
+        }
+        if (waterTypeDetailArray != null && waterTypeDetailArray.size() > 0) {
+            for (Object childObject : waterTypeDetailArray) {
+                JSONObject waterTypeDetail = JSONObject.parseObject(JSONObject.toJSONString(childObject));
+                String codeStr = waterTypeDetail.getString("code");
+                if (codeStr.equals("93060000")) {
+                    waterTypeDetailJson = waterTypeDetail;
+                    break;
+                }
+            }
+        }
+        if (waterTypeDetailJson != null) {
+            JSONArray waterTypeDetailChildrenArray = waterTypeDetailJson.getJSONArray("children");
+
+            for (Object childObject : waterTypeDetailChildrenArray) {
+                Map<String, Object> map = new LinkedHashMap<>();
+                JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(childObject));
+                String codeStr = detail.getString("code");
+                String name = detail.getString("name");
+                map.put("code", codeStr);
+                map.put("name", name);
+                list.add(map);
+            }
+        }
+        return list;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BuildingController.java

@@ -219,8 +219,8 @@ public class BuildingController extends AbstractBaseController {
     @GetMapping(value = "/getEveryCount")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "查询建筑画布下装备")
-    public Map<String, Object> getEveryCount(@RequestParam Long id, @RequestParam String groupType) {
-        return buildService.getEveryCount(id, groupType);
+    public Map<String, Object> getEveryCount(@RequestParam Long id, @RequestParam String groupType, @RequestParam(required = false) String bizOrgCode) {
+        return buildService.getEveryCount(id, groupType, bizOrgCode);
     }
 
     @GetMapping(value = "/getChildrenNotIsRiskList")
@@ -285,8 +285,8 @@ public class BuildingController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation("公司消防建筑树")
     @GetMapping(value = "/companyBuildingTree")
-    public List<BuildingTreeVo> getCompanyBuildingTree() {
-        return buildService.getCompanyBuildingTree();
+    public List<BuildingTreeVo> getCompanyBuildingTree(@RequestParam(required = false) String authKey) {
+        return buildService.getCompanyBuildingTree(authKey);
     }
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java

@@ -251,6 +251,16 @@ public class CarController extends AbstractBaseController {
 		}
 
 	}
+	@Async
+	public void refreshCount(List<Car> list) {
+		list.forEach(i->{
+			iCarService.refreshStaData();
+			try {
+				fireFightingSystemServiceImpl.refreshCarTypeAndCount(i.getBizOrgCode());
+			} catch (Exception e) {
+			}
+		});
+	}
 
 	/**
 	 * 根据iotCode查询
@@ -310,7 +320,7 @@ public class CarController extends AbstractBaseController {
 //		carInstance = iCarService.saveCar(getUserInfo(), carInstance, carInfo, carpList);
 		// saveFile(carInstance);视频图片文件后期统一处理
 		EquipmentSpecificSerivceImpl.registerMqttTopic(car.getIotCode(), equipmentIotMqttReceiveConfig);
-	Car car1=	iCarService.updateOneById(car);
+		Car car1=	iCarService.updateOneById(car);
 		refreshCount(car.getBizOrgCode());
 		return car1;
 	}
@@ -1085,8 +1095,13 @@ public class CarController extends AbstractBaseController {
 					}
 				}
 			}
+			
 		});
-		return iCarService.removeOneByIds(idList);
+	boolean flag = iCarService.removeOneByIds(idList);
+	if(flag) {
+		refreshCount(cars) ;
+	}
+	return flag;
 	}
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -99,7 +99,6 @@ public class EquipmentDetailController extends AbstractBaseController {
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public EquipmentDetail saveEquipmentDetail(HttpServletRequest request, @RequestBody EquipmentDetail equipmentDetail) {
     	EquipmentDetail detail=	iEquipmentDetailService.saveOne(equipmentDetail);
-    	equipmentSpecificSerivce.refreshStaData();
         return detail;
     }
 
@@ -107,7 +106,7 @@ public class EquipmentDetailController extends AbstractBaseController {
     public void refreshCount(String bizOrgCode) {
         equipmentSpecificSerivce.refreshStaData();
         try {
-            fireFightingSystemServiceImpl.refreshCarTypeAndCount(bizOrgCode);
+            fireFightingSystemServiceImpl.refreshEquipmentTypeAndCount(bizOrgCode);
         } catch (Exception e) {
         }
 
@@ -156,7 +155,7 @@ public class EquipmentDetailController extends AbstractBaseController {
         if (syncSwitch) {
             equipmentSpecificSerivce.equipSpecificDataSync(equipmentId);
         }
-        equipmentSpecificSerivce.refreshStaData();
+        refreshCount(vo.getBizOrgCode());
         return date;
     }
 
@@ -264,7 +263,7 @@ public class EquipmentDetailController extends AbstractBaseController {
         if (syncSwitch) {
             equipmentSpecificSerivce.equipSpecificDataSync(bean.getEquipmentId());
         }
-        equipmentSpecificSerivce.refreshStaData();
+        refreshCount(vo.getBizOrgCode());
         return equipmentDate;
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/WarehouseStructureController.java

@@ -177,6 +177,14 @@ public class WarehouseStructureController extends AbstractBaseController {
 		return iWarehouseStructureService.tree(id);
 	}
 
+	@RequestMapping(value = "/gettree/{id}", method = RequestMethod.GET)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "树查询", notes = "树查询")
+	public List<WarehouseStructure> gettree(@PathVariable Long id,String bizOrgCode) {
+
+		return iWarehouseStructureService.gettree(id,bizOrgCode);
+	}
+
 	/**
 	 * 批量删除
 	 * 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/BuildingMapper.java

@@ -144,4 +144,20 @@ public interface BuildingMapper extends BaseMapper<Building> {
      * @return
      */
     List<BuildingTreeAndEquipVO> getSonBuildingTree2();
+
+
+    /**
+     * 获取房间楼层数量
+     * @param type 类型
+     * @param bizOrgCode code
+     * @return 数量
+     */
+    Long getCountByTypeCode(String type, String bizOrgCode);
+
+    /**
+     * 根据code获取装备数量
+     * @param bizOrgCode code
+     * @return 数量
+     */
+    Long getEquipCount(String bizOrgCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/operation/impl/BuildFloorPage.java

@@ -30,7 +30,7 @@ public class BuildFloorPage implements PageOperation {
                 Map<String, Object> instanceIdMap = (Map<String, Object>) instanceId;
                 instanceIdMap.put("equipmentTotal", builldService.getEveryCount(
                         Long.parseLong(String.valueOf(instanceIdMap.get("instanceId"))),
-                        GroupTypeEnum.FLOOR.getType()).get("equipCount"));
+                        GroupTypeEnum.FLOOR.getType(), "").get("equipCount"));
                 builldService.sourceBuild(instanceIdMap);
             });
         }

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

@@ -199,7 +199,7 @@ public interface IBuilldService extends IService<Building> {
      * @param groupType
      * @return
      */
-    Map<String ,Object> getEveryCount( Long id, String  groupType);
+    Map<String ,Object> getEveryCount( Long id, String  groupType, String bizOrgCode);
 
     /**
      * 消防建筑视屏监控统计树
@@ -304,8 +304,9 @@ public interface IBuilldService extends IService<Building> {
     /**
      * 根据登陆人获取公司部门树
      * @return list
+     * @param authKey
      */
-    List<BuildingTreeVo> getCompanyBuildingTree();
+    List<BuildingTreeVo> getCompanyBuildingTree(String authKey);
 
     List<BuildingTreeVo> getBuildingVideoTreeNew();
 }

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

@@ -221,4 +221,8 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 	 * @throws Exception
 	 */
 	Object getCarTypeAndCount(String bizOrgCode) throws Exception;
+	
+	public Object refreshEquipmentTypeAndCount(String bizOrgCode) throws Exception;
+	
+	public Object refreshCarTypeAndCount(String bizOrgCode) throws Exception;
 }

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

@@ -17,7 +17,7 @@ public interface IWarehouseStructureService extends IService<WarehouseStructure>
 	WarehouseStructure saveOne(WarehouseStructure warehouseStructure);
 
 	List<WarehouseStructure> tree(Long warehouseId);
-
+	List<WarehouseStructure> gettree(Long warehouseId,String bizOrgCode);
 	WarehouseStructure updateOneById(WarehouseStructure warehouseStructure);
 
 	boolean removeOneById(Long id) throws Exception;

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

@@ -94,9 +94,6 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Autowired
     ISourceSceneService sourceSceneService;
 
-    @Autowired
-    private IBuilldService buildService;
-
     @Value("${morphic.projectSeq}")
     private Long projectSeq;
 
@@ -124,6 +121,9 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Value("${auth-key-fire-building:fire_building_info}")
     private String authKey;
 
+    @Value("${auth-key-fire-building:auth-key-fire-build-video}")
+    private String buildVideoAuthKey;
+
     @Autowired
     private JCSRemoteService jcsRemoteService;
 
@@ -525,10 +525,15 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
     @Override
-    public Map<String, Object> getEveryCount(Long id, String groupType) {
+    public Map<String, Object> getEveryCount(Long id, String groupType, String bizOrgCode) {
         Map<String, Object> map = new HashMap<>();
-        if ("".equals(groupType) || "allBuilding".equals(groupType) || groupType == null) {
-            map.put("error", "类型填写错误");
+        if ("".equals(groupType) || "allBuilding".equals(groupType)) {
+            Long roomCount = this.baseMapper.getCountByTypeCode("room", bizOrgCode);
+            Long floorCount = this.baseMapper.getCountByTypeCode("floor", bizOrgCode);
+            Long equipCount = this.baseMapper.getEquipCount(bizOrgCode);
+            map.put("floorCount", floorCount);
+            map.put("roomCount", roomCount);
+            map.put("equipCount", equipCount);
             return map;
         }
         if ("allfloor".equals(groupType)) {
@@ -635,7 +640,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
      */
     @Override
     public Long equipmentTotal(Long instanceId, String groupType) {
-        Map<String, Object> map = getEveryCount(instanceId, groupType);
+        Map<String, Object> map = getEveryCount(instanceId, groupType,null);
         return Long.parseLong(String.valueOf(map.get("equipCount")));
     }
 
@@ -765,9 +770,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 
     @Override
     public Page<BuildingVideoVO> buildingVideoList(Page page, BuildingVideoListVO dto) {
-        String buildingId = dto.getBuildingId();
         String orgTypes = dto.getOrgTypes();
-        if ("0".equals(buildingId) && StringUtils.isNotBlank(orgTypes)) {
+        if (StringUtils.isNotBlank(orgTypes)) {
             List<OrgUsrDto> list = jcsRemoteService.getCompanyDeptListWithAuth(authKey, orgTypes);
             if (!CollectionUtils.isEmpty(list)) {
                 List<String> bizOrgCodeList = new ArrayList<>();
@@ -776,18 +780,18 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             }
         }
         Page<BuildingVideoVO> pages = videoService.pageBuildingVideo(page, dto);
-//        if (0 < pages.getRecords().size()) {
-//            pages.getRecords().forEach(x -> {
-//                if (StringUtil.isNotEmpty(x.getLocation()) && StringUtil.isNotEmpty(x.getAddress())) {
-//                    x.setLocation(x.getLocation() + '-' + x.getAddress());
-//                } else {
-//                    if (!StringUtil.isNotEmpty(x.getLocation())) {
-//                        x.setLocation(x.getAddress());
-//                    }
-//                }
-//                x.setUrl(videoService.getVideoUrl(x.getName(), x.getPresetPosition(), x.getUrl(), x.getCode()));
-//            });
-//        }
+        if (0 < pages.getRecords().size()) {
+            pages.getRecords().forEach(x -> {
+                if (StringUtil.isNotEmpty(x.getLocation()) && StringUtil.isNotEmpty(x.getAddress())) {
+                    x.setLocation(x.getLocation() + '-' + x.getAddress());
+                } else {
+                    if (!StringUtil.isNotEmpty(x.getLocation())) {
+                        x.setLocation(x.getAddress());
+                    }
+                }
+                x.setUrl(videoService.getVideoUrl(x.getName(), x.getPresetPosition(), x.getUrl(), x.getCode()));
+            });
+        }
         return pages;
     }
 
@@ -1120,7 +1124,10 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
     @Override
-    public List<BuildingTreeVo> getCompanyBuildingTree() {
+    public List<BuildingTreeVo> getCompanyBuildingTree(String authKey) {
+        if (StringUtils.isEmpty(authKey)) {
+            authKey = this.authKey;
+        }
         List<BuildingTreeVo> allListVo = getBuildingTreeVos();
         // 获取公司部门list
         List<OrgUsrDto> orgUsrLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey,"COMPANY");
@@ -1150,7 +1157,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 
     @Override
     public List<BuildingTreeVo> getBuildingVideoTreeNew() {
-        List<BuildingTreeVo> list = buildService.getCompanyBuildingTree();
+        List<BuildingTreeVo> list = getCompanyBuildingTree(buildVideoAuthKey);
         if (!CollectionUtils.isEmpty(list)) {
             List<Map<String, Long>> countList = iFormInstanceService.getBuildVideoCount();
             if (!CollectionUtils.isEmpty(countList)) {
@@ -1172,7 +1179,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     public List<BuildingTreeVo> getBuildingVideoTotal(List<BuildingTreeVo> children, Map<Long, Long> map) {
         for (BuildingTreeVo treeVo : children) {
             List<BuildingTreeVo> childrenList = treeVo.getChildren();
-            if (!CollectionUtils.isEmpty(children)) {
+            if (!CollectionUtils.isEmpty(childrenList)) {
                 getBuildingVideoTotal (childrenList, map);
             }
             treeVo.setTotal(map.get(treeVo.getInstanceId()));

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

@@ -395,7 +395,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 
             }
             equipmentSpecificMapper.insert(equipmentSpecific);
-
+            refreshCount(equipmentSpecific.getBizOrgCode());//添加对于装备类型统计数据的刷新
             //位置编码不为空入库
             if (equipmentDetailDownloadVOS.get(i) != null && equipmentDetailDownloadVOS.get(i).getWarehouseStructCode() != null) {
                 QueryWrapper<WarehouseStructure> warehouseStructureQueryWrapper = new QueryWrapper<>();
@@ -467,10 +467,18 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             this.equipmentSpecificIndexSave(equipmentDetail, equipmentSpecific);
         }
         relationRedisUtil.delSysRedisKey(fireFightSysIdsBuffer.toString());
-        equipmentSpecificSerivce.refreshStaData();//添加对于装备类型统计数据的刷新
+        
         return list;
     }
+    @Async
+    public void refreshCount(String bizOrgCode) {
+    	equipmentSpecificSerivce.refreshStaData();
+        try {
+        	fireFightingSystemService.refreshEquipmentTypeAndCount(bizOrgCode);
+        } catch (Exception e) {
+        }
 
+    }
     private void equipmentSpecificIndexSave(EquipmentDetail equipmentDetail, EquipmentSpecific equipmentSpecific) {
         List<EquipmentIndex> equipmentIndexList = iEquipmentIndexService.list(new LambdaQueryWrapper<EquipmentIndex>().eq(EquipmentIndex::getEquipmentId, equipmentDetail.getEquipmentId()));
         List<EquipmentSpecificIndex> equipmentSpecificIndices = equipmentIndexList.stream().map(index -> {

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

@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.equipmanage.common.entity.FormInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -63,6 +64,18 @@ public class WarehouseStructureServiceImpl extends ServiceImpl<WarehouseStructur
         return list;
     }
 
+    @Override
+    public List<WarehouseStructure> gettree(Long warehouseId,String bizOrgCode) {
+
+
+            QueryWrapper<WarehouseStructure> one = new QueryWrapper<>();
+            one.eq("warehouse_id",warehouseId);
+            one.likeRight("biz_org_code",bizOrgCode);
+            List<WarehouseStructure> list = warehouseStructureMapper.selectList(one);
+            list = buildByRecursive(list,warehouseId);
+            return list;
+    }
+
     /**
      * 生成code
      * 

amos-boot-system-equip/src/main/resources/changelog/sql-task-all.xml

@@ -239,4 +239,25 @@
             END#
         </sql>
     </changeSet>
+    <changeSet author="gaojianqiang" id="1641307260-20220104-01"  runAlways="true">
+        <comment>`getBuildChildIdsByRootId`</comment>
+        <sql endDelimiter="#">
+            DROP FUNCTION IF EXISTS `getBuildChildIdsByRootId`#
+            CREATE DEFINER=`root`@`%` FUNCTION `getBuildChildIdsByRootId`(`rootId` VARCHAR(100)) RETURNS varchar(4000) CHARSET utf8mb4 COLLATE utf8mb4_general_ci
+            BEGIN
+            DECLARE sTemp TEXT;
+            DECLARE sTempChd VARCHAR(4000);
+            SET group_concat_max_len=102400;
+
+            SET sTemp='$';
+            SET sTempChd = CAST(rootId AS CHAR);
+
+            WHILE sTempChd IS NOT NULL DO
+            SET sTemp= CONCAT(sTemp,',',sTempChd);
+            SELECT GROUP_CONCAT(distinct instanceId) INTO sTempChd FROM get_building_tree WHERE FIND_IN_SET(parentId,sTempChd)>0;
+            END WHILE;
+            RETURN sTemp;
+            END#
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml

@@ -2238,4 +2238,31 @@
         </sql>
     </changeSet>
 
+    <changeSet author="tw" id="20220104-5">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_warehouse_structure" columnName="biz_org_name"/>
+            </not>
+        </preConditions>
+        <comment>wl_warehouse_structure add column biz_org_name</comment>
+        <sql>
+            alter table `wl_warehouse_structure` add column `biz_org_name` varchar(128) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构/部门名称';
+        </sql>
+    </changeSet>
+    <changeSet author="tw" id="20220104-6">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_warehouse_structure" columnName="biz_org_code"/>
+            </not>
+        </preConditions>
+        <comment>wl_warehouse_structure add column biz_org_code</comment>
+        <sql>
+            alter table `wl_warehouse_structure` add column `biz_org_code` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构编码';
+        </sql>
+    </changeSet>
+
+
+
+
+
 </databaseChangeLog>
\ No newline at end of file

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

@@ -435,4 +435,29 @@
             union all
             select id,null as parentId,fei.`name`,'equipment' as type from  f_equipment fei where fei.risk_source_id=#{id}
     </select>
+    <select id="getCountByTypeCode" resultType="java.lang.Long">
+        SELECT
+            count(1)
+        FROM
+            wl_form_instance
+        WHERE
+            field_name = 'bizOrgCode'
+        AND field_value LIKE  CONCAT(#{bizOrgCode},'%')
+        AND group_type = #{type}
+    </select>
+    <select id="getEquipCount" resultType="java.lang.Long">
+        SELECT
+            IF (
+                sum(sto.amount) IS NULL,
+                0,
+                sum(sto.amount)
+            ) AS count
+        FROM
+            wl_stock_detail AS sto
+        LEFT JOIN wl_warehouse_structure AS war ON sto.warehouse_structure_id = war.id
+        LEFT JOIN wl_form_instance wfi ON wfi.instance_id = war.source_id
+        WHERE
+         wfi.field_name = 'bizOrgCode'
+         AND wfi.field_value LIKE  CONCAT(#{bizOrgCode},'%')
+    </select>
 </mapper>

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

@@ -482,13 +482,23 @@ FROM
 WHERE
 	instance_id = #{instanceId} 
 </select>
+<!--<select id="getBuildVideoCount" resultType="hashmap">-->
+<!--    SELECT-->
+<!--        wlv.source_id AS buildId,-->
+<!--        count( wlv.source_id ) AS total-->
+<!--    FROM-->
+<!--        `wl_video_source` wlv-->
+<!--    GROUP BY-->
+<!--        wlv.source_id-->
+<!--</select>-->
 <select id="getBuildVideoCount" resultType="hashmap">
     SELECT
-        wlv.source_id AS buildId,
-        count( wlv.source_id ) AS total
+        b.instanceId AS buildId,
+        COUNT( vs.video_id ) AS total
     FROM
-        `wl_video_source` wlv
+        get_building_tree b
+        LEFT JOIN wl_video_source vs ON FIND_IN_SET( vs.source_id, getBuildChildIdsByRootId ( b.instanceId ) )
     GROUP BY
-        wlv.source_id
+        b.instanceId
 </select>
 </mapper>

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

@@ -74,14 +74,21 @@
         JOIN wl_video_source vc ON vc.video_id = v.id
         <where>
             <if test="dto.buildingId!=null and dto.buildingId!=''">
-                FIND_IN_SET(vc.source_id, getChildrenIdsByRootId(#{dto.buildingId}))
-            </if>
-            <if test="dto.bizOrgCodeList != null and dto.bizOrgCodeList.size > 0">
-                AND v.biz_org_code IN
-                <foreach collection="dto.bizOrgCodeList" item="item" index="index" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
+                FIND_IN_SET(vc.source_id, getBuildChildIdsByRootId(#{dto.buildingId}))
             </if>
+            <choose>
+                <when test="dto.bizOrgCode!=null and dto.bizOrgCode!=''">
+                    OR v.biz_org_code LIKE CONCAT(#{dto.bizOrgCode}, '%')
+                </when>
+                <otherwise>
+                    <if test="dto.bizOrgCodeList != null and dto.bizOrgCodeList.size > 0">
+                        AND v.biz_org_code IN
+                        <foreach collection="dto.bizOrgCodeList" item="item" index="index" open="(" close=")" separator=",">
+                            #{item}
+                        </foreach>
+                    </if>
+                </otherwise>
+            </choose>
             <if test="dto.equipmentName!=null and dto.equipmentName!=''">
                 and v.name like concat('%',#{dto.equipmentName},'%')
             </if>