修改扫描错误

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataSourcesImpl.java

@@ -88,6 +88,14 @@ public class DataSourcesImpl implements DataSources {
     private static final  String SEQUENCENBR="sequenceNbr";
     private static final  String BIZORGNAME= "bizOrgName";
     private static final  String FIRE_WATER_INFO= "fire_water_info";
+
+    private static final  String  BIZORGCODE="bizOrgCode";
+    private static final  String  CHILDREN= "children";
+
+    private static final  String FIRE_TEAM_INFO="fire_team_info";
+
+    private static final  String ORGCODE= "OrgCode";
+
     @Value("${security.systemctl.name}")
     private String systemctl;
 
@@ -110,7 +118,7 @@ public class DataSourcesImpl implements DataSources {
                     headers.setContentType(MediaType.valueOf("application/json; charset=utf-8"));
                     // 用HttpEntity封装整个请求报文
                     HttpEntity<Object> httpEntity = new HttpEntity<>(null, headers);
-                    ResponseEntity<String> responseEntity = restTemplate.exchange(
+                    restTemplate.exchange(
                             "http://" + systemctl + "/systemctl" + "/v1" + "/region/tree/parent", HttpMethod.GET,
                             httpEntity, String.class);
                     break;
@@ -221,7 +229,7 @@ public class DataSourcesImpl implements DataSources {
         PermissionInterceptorContext.setDataAuthRule(FIRE_WATER_INFO);
 
         Map<String, Object> map = new HashMap<>();
-        map.put("OrgCode",reginParams.getPersonIdentity().getBizOrgCode());
+        map.put(ORGCODE,reginParams.getPersonIdentity().getBizOrgCode());
         IPage<Map<String, Object>> mapIPage = iOrgUsrService.pagePerson(null, null, map);
         List<Map<String, Object>> records = mapIPage.getRecords();
         List<String> carNameList = Lists.newArrayList();
@@ -238,7 +246,7 @@ public class DataSourcesImpl implements DataSources {
         PermissionInterceptorContext.setDataAuthRule("fire_station_info");
 
         Map<String, Object> map = new HashMap<>();
-        map.put("OrgCode",reginParams.getPersonIdentity().getBizOrgCode());
+        map.put(ORGCODE,reginParams.getPersonIdentity().getBizOrgCode());
         IPage<Map<String, Object>> mapIPage = iOrgUsrService.pagePerson(null, null, map);
         List<Map<String, Object>> records = mapIPage.getRecords();
         List<String> carNameList = Lists.newArrayList();
@@ -252,10 +260,10 @@ public class DataSourcesImpl implements DataSources {
     private String[] getFireTeamContactUser() {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         // 权限处理
-        PermissionInterceptorContext.setDataAuthRule("fire_team_info");
+        PermissionInterceptorContext.setDataAuthRule(FIRE_TEAM_INFO);
 
         Map<String, Object> map = new HashMap<>();
-        map.put("OrgCode",reginParams.getPersonIdentity().getBizOrgCode());
+        map.put(ORGCODE,reginParams.getPersonIdentity().getBizOrgCode());
         IPage<Map<String, Object>> mapIPage = iOrgUsrService.pagePerson(null, null, map);
         List<Map<String, Object>> records = mapIPage.getRecords();
         List<String> carNameList = Lists.newArrayList();
@@ -286,7 +294,7 @@ public class DataSourcesImpl implements DataSources {
         // 导出模板增加权限
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         // 权限处理
-        PermissionInterceptorContext.setDataAuthRule("fire_team_info");
+        PermissionInterceptorContext.setDataAuthRule(FIRE_TEAM_INFO);
         List<FireTeam> records = fireTeamService.getExcelFireTeamList(reginParams.getPersonIdentity().getBizOrgCode());
         List<String> names = records.stream().map(item -> {
             return item.getName() + "@" + item.getSequenceNbr();
@@ -296,10 +304,6 @@ public class DataSourcesImpl implements DataSources {
     }
 
     private String[] getEquipFireTeam() {
-//			Page<FireTeamCardDto> pageBean = new Page<>(0, Integer.MAX_VALUE);
-//		IPage<FireTeamCardDto> fireTeamCardDtoIPage = fireTeamService.listFireTeamByPage(pageBean,
-//				new FireTeamListDto());
-//		List<FireTeamCardDto> records = fireTeamCardDtoIPage.getRecords();
         ResponseModel<ReginParams> result = equipFeignClient.getPermissions();
         ReginParams reginParams = result.getResult();
 
@@ -397,8 +401,8 @@ public class DataSourcesImpl implements DataSources {
         String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
         ResponseModel<Object> response = equipFeignClient.getBuildingTree();
         List<Map<String, Object>> buildingMapList = (List<Map<String, Object>>) response.getResult();
-        List<Map<String, Object>> children = (List<Map<String, Object>>) buildingMapList.get(0).get("children");
-        List<String> collect = children.stream().filter(result -> result.get("bizOrgCode").toString().startsWith(bizOrgCode)).map(itme -> {
+        List<Map<String, Object>> children = (List<Map<String, Object>>) buildingMapList.get(0).get(CHILDREN);
+        List<String> collect = children.stream().filter(result -> result.get(BIZORGCODE).toString().startsWith(bizOrgCode)).map(itme -> {
             return itme.get("name") + "@" + itme.get("id");
         }).collect(Collectors.toList());
         String[] str = collect.toArray(new String[collect.size()]);
@@ -410,7 +414,7 @@ public class DataSourcesImpl implements DataSources {
 
         ResponseModel<Object> response = equipFeignClient.getBuildingTree();
         List<Map<String, Object>> buildingMapList = (List<Map<String, Object>>) response.getResult();
-        List<Map<String, Object>> children = (List<Map<String, Object>>) buildingMapList.get(0).get("children");
+        List<Map<String, Object>> children = (List<Map<String, Object>>) buildingMapList.get(0).get(CHILDREN);
         List<String> collect = children.stream().map(itme -> {
             return itme.get("name") + "@" + itme.get("id");
         }).collect(Collectors.toList());
@@ -456,10 +460,10 @@ public class DataSourcesImpl implements DataSources {
     private void initBuildTreeList(List<Object> menus, List<String> stringList,String bizOrgCode) {
         for (Object orgMenuDto : menus) {
             JSONObject detailObject = JSON.parseObject(orgMenuDto.toString());
-            if (detailObject.containsKey("id") && detailObject.get("bizOrgCode") != null && detailObject.get("bizOrgCode").toString().startsWith(bizOrgCode)) {
+            if (detailObject.containsKey("id") && detailObject.get(BIZORGCODE) != null && detailObject.get(BIZORGCODE).toString().startsWith(bizOrgCode)) {
                 stringList.add(detailObject.getString("name") + "@" + detailObject.getString("id")); // 任务3527 重点部位导出模板 id name 未正常配置 by kongfm
             }
-            JSONArray children = detailObject.getJSONArray("children");
+            JSONArray children = detailObject.getJSONArray(CHILDREN);
             if (children != null && children.size() > 0) {
                 initBuildTreeList(children, stringList,bizOrgCode);
             }
@@ -470,7 +474,7 @@ public class DataSourcesImpl implements DataSources {
         // 导出模板增加权限
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         // 权限处理
-        PermissionInterceptorContext.setDataAuthRule("fire_team_info");
+        PermissionInterceptorContext.setDataAuthRule(FIRE_TEAM_INFO);
         List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
 
 
@@ -640,19 +644,19 @@ public class DataSourcesImpl implements DataSources {
         List<String> resultList = Lists.newArrayList();
         for (LinkedHashMap<String, Object> t : categoryList) {
             if (categoryCode.equals(t.get("code").toString())) {
-                fireList = (List<LinkedHashMap<String, Object>>) t.get("children");
+                fireList = (List<LinkedHashMap<String, Object>>) t.get(CHILDREN);
             }
         }
         // 筛选第二层
         for (LinkedHashMap<String, Object> t : fireList) {
             if (fireCode.equals(t.get("code").toString())) {
-                waterList = (List<LinkedHashMap<String, Object>>) t.get("children");
+                waterList = (List<LinkedHashMap<String, Object>>) t.get(CHILDREN);
             }
         }
         // 筛选第三层
         for (LinkedHashMap<String, Object> t : waterList) {
             if (waterCode.equals(t.get("code").toString())) {
-                category = (List<LinkedHashMap<String, Object>>) t.get("children");
+                category = (List<LinkedHashMap<String, Object>>) t.get(CHILDREN);
             }
         }
         category.forEach(t -> {