将树信息添加 到redis

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

@@ -10,7 +10,6 @@ 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;
@@ -27,7 +26,6 @@ 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;
@@ -38,6 +36,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
+import com.google.gson.JsonArray;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -172,6 +171,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 	@Autowired
 	ISourceStatistics sourceStatistics;
 	
+	@Value("${redis_car_type_count}")
+	private String carTypeAndCount;
+	
+	@Value("${redis_equip_type_count}")
+	private String equipTypeAndCount;
+	
     @Override
     public List<EquipCountBySystemVO> getEquipCountBySystemId(Long systemId) {
         return this.baseMapper.getEquipCountBySystemId(systemId);
@@ -993,12 +998,18 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     
     
     public Object getEquipmentTypeAndCount(String bizOrgCode) 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,bizOrgCode);
+    	List<EquipmentCategory>  equipmentTypeList =null;
+    	 if (redisUtils.hasKey(equipTypeAndCount)) {
+    		 equipmentTypeList = JSONArray.parseArray(JSONArray.toJSONString(redisUtils.get(equipTypeAndCount)), EquipmentCategory.class);
+         } else {
+        	 List<EquipmentCategory>  responseList = 	this.typeList();
+     		if(responseList == null || responseList.size()<1) {
+     			return null;
+     		}
+     		  equipmentTypeList =	responseList.stream().filter(i->!"20000000".equals(i.getCode())  && "2".equals(i.getIndustryCode())).collect(Collectors.toList());
+     		 redisUtils.set(equipTypeAndCount, equipmentTypeList);
+     				 }
+    	getCountToChildren(equipmentTypeList,bizOrgCode);
 		return	equipmentTypeList;
 	}
     
@@ -1015,12 +1026,18 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 		return	children;
 	}
     public Object getCarTypeAndCount(String bizOrgCode) throws Exception {
-    	List<EquipmentCategory>  responseList = 	this.typeList();
-		if(responseList == null || responseList.size()<1) {
-			return null;
-		}
-		List<EquipmentCategory>  equipmentTypeList =	responseList.stream().filter(i->"20000000".equals(i.getCode())  &&  "2".equals(i.getIndustryCode())).collect(Collectors.toList());
-		getCountToChildren(equipmentTypeList,bizOrgCode);
+    	List<EquipmentCategory>  equipmentTypeList =null;
+    	 if (redisUtils.hasKey(carTypeAndCount)) {
+    		 equipmentTypeList = JSONArray.parseArray(JSONArray.toJSONString(redisUtils.get(carTypeAndCount)), EquipmentCategory.class);
+         } else {
+        		List<EquipmentCategory>  responseList = 	this.typeList();
+        		if(responseList == null || responseList.size()<1) {
+        			return null;
+        		}
+        		  equipmentTypeList =	responseList.stream().filter(i->"20000000".equals(i.getCode())  &&  "2".equals(i.getIndustryCode())).collect(Collectors.toList());
+        		  redisUtils.set(carTypeAndCount, equipmentTypeList);
+         }
+		  getCountToChildren(equipmentTypeList,bizOrgCode);
 		return	equipmentTypeList;
 	}
     

amos-boot-system-equip/src/main/resources/application.properties

@@ -36,7 +36,7 @@ dutyMode.fegin.name=AMOS-DUTYMODE
 riskSource.feign.name=AMOS-AUTOSYS
 equipManage.name=AMOS-EQUIPMANAGE
 iot.vehicle.track=AMOS-API-IOT
-jcs.fegin.name=JCS
+jcs.fegin.name=JCS-chen
 video.fegin.name=VIDEO
 #项目初始化画布id
 morphic.projectSeq=1390314016458514433
@@ -96,4 +96,8 @@ auth-key-fire-video=fire_video_info
 # 权限标识-消防视频
 auth-key-fire-build-video=fire_build_video_info
 
-auth-key-fire-car=fire_car_info
\ No newline at end of file
+auth-key-fire-car=fire_car_info
+
+redis_car_type_count = carTypeAndCount
+
+redis_equip_type_count = equipTypeAndCount
\ No newline at end of file