管辖分局API修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -242,7 +242,7 @@ public class CommonController extends BaseController {
 	@GetMapping(value = "/getCreatTreeByInstallation")
 	@ApiOperation(httpMethod = "GET", value = "获取管辖分局树安装告知使用", notes = "获取管辖分局树安装告知使用")
 	public ResponseModel<Object> getCreatTreeByInstallation(String county) {
-		List<LinkedHashMap> creatTree = commonService.getCreatTree();
+		List<LinkedHashMap> creatTree = commonService.getCreatTreeByInstallation();
 		String code = county.split("_")[0];
 		List<LinkedHashMap> infoByCounty = getInfoByCounty(code, creatTree);
 		return ResponseHelper.buildResponse(infoByCounty);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -49,4 +49,8 @@ public interface ICommonService {
     Object transfer(Map<String, Object> obj);
 
     List<LinkedHashMap> getCreatTree();
+
+    List<LinkedHashMap> getCreatTreeByInstallation();
+
+    List<LinkedHashMap> getCreatTreeByInstallationTree();
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -284,6 +284,25 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
+    public List<LinkedHashMap> getCreatTreeByInstallation() {
+        List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
+        //判断redis是否存在管辖机构树
+        return !ObjectUtils.isEmpty(result) ? result : getCreatTreeByInstallationTree();
+    }
+
+    @Override
+    public List<LinkedHashMap> getCreatTreeByInstallationTree() {
+        FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
+        List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
+        List<LinkedHashMap> treeData = deleteTreeData(result, REGULATOR_UNIT);
+        List<LinkedHashMap> supervisionTree = treeData.stream().filter(e -> code.equals(e.get("orgCode"))).collect(Collectors.toList());
+        List<LinkedHashMap> resultTree = updateNullChildren(supervisionTree);
+        redisUtils.set(REGULATOR_UNIT_TREE, resultTree);
+        return resultTree;
+    }
+
+
+    @Override
     public List<LinkedHashMap> getTree(ReginParams reginParams) {
         // 企业逻辑
         if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {