提交代码，解决冲突

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

@@ -622,7 +622,7 @@ public class FireFightingSystemController extends AbstractBaseController {
     }
 
     /**
-     * 获取人员部门树
+     * 获取人员部门树7		
      *
      * @return list
      */

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

 package com.yeejoin.equipmanage.service.impl;
 
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,35 +50,47 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem;
 import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
-import com.yeejoin.equipmanage.common.entity.*;
+import com.yeejoin.equipmanage.common.entity.DynamicFormGroup;
+import com.yeejoin.equipmanage.common.entity.DynamicFormInstance;
+import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
+import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
+import com.yeejoin.equipmanage.common.entity.SourceScene;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
-import com.yeejoin.equipmanage.common.entity.vo.*;
+import com.yeejoin.equipmanage.common.entity.vo.EquipCountBySystemVO;
+import com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO;
+import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
+import com.yeejoin.equipmanage.common.entity.vo.EquipmentAlarmBySystemIdOrSourceIdVO;
+import com.yeejoin.equipmanage.common.entity.vo.PointTreeVo;
 import com.yeejoin.equipmanage.common.enums.EquipmentRiskTypeEnum;
 import com.yeejoin.equipmanage.common.enums.EquipmentSpeIndexEnum;
 import com.yeejoin.equipmanage.common.enums.SystemTypeEnum;
 import com.yeejoin.equipmanage.common.enums.TrueOrFalseEnum;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
-import com.yeejoin.equipmanage.common.vo.*;
-import com.yeejoin.equipmanage.mapper.*;
+import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
+import com.yeejoin.equipmanage.common.vo.EquipmentManageVo;
+import com.yeejoin.equipmanage.common.vo.FileUploadVo;
+import com.yeejoin.equipmanage.common.vo.FireFightingSystem3dVo;
+import com.yeejoin.equipmanage.common.vo.FireFightingSystemTreeVo;
+import com.yeejoin.equipmanage.common.vo.FireFightingSystemTypeTreeVo;
+import com.yeejoin.equipmanage.common.vo.FireFightingSystemVo;
+import com.yeejoin.equipmanage.common.vo.SpeIndexVo;
+import com.yeejoin.equipmanage.mapper.BuildingMapper;
+import com.yeejoin.equipmanage.mapper.EquipmentManageMapper;
+import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
+import com.yeejoin.equipmanage.mapper.FormInstanceMapper;
+import com.yeejoin.equipmanage.mapper.SourceSceneMapper;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
-import com.yeejoin.equipmanage.service.*;
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.*;
-import java.util.stream.Collectors;
+import com.yeejoin.equipmanage.service.EquipmentManageService;
+import com.yeejoin.equipmanage.service.IEqDynamicFormGroupService;
+import com.yeejoin.equipmanage.service.IEqDynamicFormInstanceService;
+import com.yeejoin.equipmanage.service.IEquipmentCategoryService;
+import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
+import com.yeejoin.equipmanage.service.IFireFightingSystemService;
+import com.yeejoin.equipmanage.service.IRiskSourceSceneService;
+import com.yeejoin.equipmanage.service.ISourceSceneService;
+import com.yeejoin.equipmanage.service.ISyncDataService;
+import com.yeejoin.equipmanage.service.MqttSendGateway;
 
 
 @Service
@@ -118,7 +160,13 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 
     @Value("${auth-key-fire-system:fire_system_info}")
     private String authKey;
-
+ 
+	@Value("${equipment.type}")
+	String equipmentCategoryLeftTypeCode;
+	
+	@Autowired
+	IEquipmentCategoryService iEquipmentCategoryService;
+	
     @Override
     public List<EquipCountBySystemVO> getEquipCountBySystemId(Long systemId) {
         return this.baseMapper.getEquipCountBySystemId(systemId);
@@ -931,5 +979,69 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         parentNode.setChildren(childrenList);
         return Collections.singletonList(parentNode);
     }
+    
+    
+    
+    public Object getwaterResourceType() throws Exception {
+    	List<EquipmentCategory>  responseList = 	this.typeList();
+		if(responseList == null || responseList.size()<1) {
+			return null;
+		}
+		List<EquipmentCategory>  equipmentTypeList =	responseList.stream().filter(i->"2".equals(i.getIndustryCode())).collect(Collectors.toList());
+		getCountToChildren(equipmentTypeList);
+		
+		return	responseList;
+	}
+    
+    
+    public Object getCountToChildren(List<EquipmentCategory> children) throws Exception {
+    	for (EquipmentCategory equipmentCategory : children) {
+    		equipmentCategory.getCode();
+			
+    		List<EquipmentCategory> childrenList =equipmentCategory.getChildren();
+    		if(childrenList!=null && childrenList.size()>0) {
+    			 getCountToChildren(childrenList);
+    		}
+		}
+		return	children;
+	}
+    
+    
+    
+    
+    public List<EquipmentCategory> typeList() {
+		List<EquipmentCategory> equipmentCategorys = this.iEquipmentCategoryService
+				.getEquipmentCategoryList(Integer.valueOf(equipmentCategoryLeftTypeCode));
+		List<EquipmentCategory> list = new ArrayList<>();
+		Map<String, List<EquipmentCategory>> tmpMap = new HashMap<String, List<EquipmentCategory>>();
+		equipmentCategorys.forEach(action -> {
+			if (action.getParentId() == null) {
+				list.add(action);
+			} else {
+				if (tmpMap.get(action.getParentId().toString()) == null) {
+					ArrayList<EquipmentCategory> tmplist = new ArrayList<EquipmentCategory>();
+					tmplist.add(action);
+					tmpMap.put(action.getParentId().toString(), tmplist);
+				} else {
+					if (!tmpMap.get(action.getParentId().toString()).contains(action)) {
+						tmpMap.get(action.getParentId().toString()).add(action);
+					}
+				}
+			}
+		});
+		getChildren(list, tmpMap);
+		return list;
+	}
+    private void getChildren(List<EquipmentCategory> list, Map<String, List<EquipmentCategory>> tmpMap) {
+		for (EquipmentCategory equipmentCategory : list) {
+			if (tmpMap.get(equipmentCategory.getId().toString()) != null
+					&& tmpMap.get(equipmentCategory.getId().toString()).size() > 0) {
+				List<EquipmentCategory> equipcliss = tmpMap.get(equipmentCategory.getId().toString());
+				equipmentCategory.setHasLowerClassification(true);
+				equipmentCategory.setChildren(equipcliss);
+				getChildren(equipcliss, tmpMap);
+			}
+		}
+	}
 
 }