修改获取区域逻辑

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/sync/remote/DefaultLjZfjgSyncDataService.java

@@ -339,10 +339,6 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
 
             //发送数据到IRS交互应用
             String address = Optional.of(enforceObj).map(EnforceObj::getEnforceOrgName).orElse("");
-            if (!(address.contains("两江新区")||address.contains("沙坪坝区")))  {
-                log.info(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用不是两江新区");
-                continue;
-            }
 
             if (!stringStringMap.containsKey(enforceObj.getId())) {
                 log.info(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用找不到ID");
@@ -387,14 +383,19 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
 
             JSONObject response = GaoDeMapUtil.geoEncode(enforceJob.getStartLongitude(), enforceJob.getStartLatitude());
             String streetName = Optional.of(response).filter(it -> it.containsKey("regeocode")).map(it -> it.getJSONObject("regeocode")).filter(it -> it.containsKey("addressComponent")).map(it -> it.getJSONObject("addressComponent")).filter(it -> it.containsKey("township")).map(it -> it.getString("township")).orElse("");
+            String district = Optional.of(response).filter(it -> it.containsKey("regeocode")).map(it -> it.getJSONObject("regeocode")).filter(it -> it.containsKey("addressComponent")).map(it -> it.getJSONObject("addressComponent")).filter(it -> it.containsKey("district")).map(it -> it.getString("district")).orElse("");
             if (StringUtils.isEmpty(streetName)) {
                 log.info(enforceObj.getEnforceObjName() + "---------------发送至发送数据到IRS交互应用找不到街道");
                 continue;
             }
+            if (!(district.contains("两江新区")||district.contains("沙坪坝区")))  {
+                log.info(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用不是两江新区");
+                continue;
+            }
             log.info("-------------数据发送");
 
             StartEventDto startEventDto = new StartEventDto();
-            startEventDto.setAreaName("两江新区");
+            startEventDto.setAreaName(district);
             startEventDto.setEventCondition(eventCondition);
             startEventDto.setEventType(5);
             startEventDto.setBelongCounty("500199");