修复bug

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/MaintenanceServiceImpl.java

@@ -74,7 +74,7 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
 
     @Autowired
     RedisUtils redisUtil;
-    private static final String regionRedis="app_region_redis";
+    private static final String regionRedis="app_region_redis_data";
 
     private static final Integer isSignAnAgreement = 1;
 
@@ -146,47 +146,47 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
         model.setDealerId(unitInfo!=null?unitInfo.getSequenceNbr():null);
         model.setDealerName(unitInfo!=null?unitInfo.getName():null);
         //运维区域 name
-        JSONArray regionName = getRegionName();
-        List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
-        if(model.getMaintenanceAreaCode()!=null){
-            String ConsigneeRegion="";
-            List<Integer>  da=model.getMaintenanceAreaCode();
-            if(da!=null&&!da.isEmpty()){
-                for (int i = 0; i < da.size(); i++) {
-                    for (RegionModel re : list) {
-                        if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) {
-                            if(da.size()-1==i){
-                                ConsigneeRegion = ConsigneeRegion + re.getRegionName();
-                            }else{
-                                ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-";
-                            }
-                            break;
-                        }
-                    }
-                }
-                model.setMaintenanceArea(ConsigneeRegion);
-            }
-        }
+//        JSONArray regionName = getRegionName();
+//        List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
+//        if(model.getMaintenanceAreaCode()!=null){
+//            String ConsigneeRegion="";
+//            List<Integer>  da=model.getMaintenanceAreaCode();
+//            if(da!=null&&!da.isEmpty()){
+//                for (int i = 0; i < da.size(); i++) {
+//                    for (RegionModel re : list) {
+//                        if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) {
+//                            if(da.size()-1==i){
+//                                ConsigneeRegion = ConsigneeRegion + re.getRegionName();
+//                            }else{
+//                                ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-";
+//                            }
+//                            break;
+//                        }
+//                    }
+//                }
+//                model.setMaintenanceArea(ConsigneeRegion);
+//            }
+//        }
         //设置常住地址
-        if(model.getPermanentAddressCode()!=null){
-            String ConsigneeRegion="";
-            List<Integer>  da=model.getPermanentAddressCode();
-            if(da!=null&&!da.isEmpty()){
-                for (int i = 0; i < da.size(); i++) {
-                    for (RegionModel re : list) {
-                        if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) {
-                            if(da.size()-1==i){
-                                ConsigneeRegion = ConsigneeRegion + re.getRegionName();
-                            }else{
-                                ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-";
-                            }
-                            break;
-                        }
-                    }
-                }
-                model.setPermanentAddressName(ConsigneeRegion);
-            }
-        }
+//        if(model.getPermanentAddressCode()!=null){
+//            String ConsigneeRegion="";
+//            List<Integer>  da=model.getPermanentAddressCode();
+//            if(da!=null&&!da.isEmpty()){
+//                for (int i = 0; i < da.size(); i++) {
+//                    for (RegionModel re : list) {
+//                        if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) {
+//                            if(da.size()-1==i){
+//                                ConsigneeRegion = ConsigneeRegion + re.getRegionName();
+//                            }else{
+//                                ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-";
+//                            }
+//                            break;
+//                        }
+//                    }
+//                }
+//                model.setPermanentAddressName(ConsigneeRegion);
+//            }
+//        }
         //存储std
         //新增人员基础信息表
         PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
@@ -232,7 +232,7 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
             Collection<RegionModel> regionChild = new ArrayList<>();
             RegionModel regionModel1 = new RegionModel();
             regionChild.add(regionModel1);
-            FeignClientResult<Collection<RegionModel>> collectionFeignClientResult = Systemctl.regionClient.queryForTreeParent(610000L);
+            FeignClientResult<Collection<RegionModel>> collectionFeignClientResult = Systemctl.regionClient.queryForTreeParent(null);
             Collection<RegionModel> result = collectionFeignClientResult.getResult();
             for (RegionModel regionModel : result) {
                 if (null != regionModel && null != regionModel.getChildren()) {