新增消控室区域沙坪坝

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

@@ -101,9 +101,7 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
             log.info("未开启两江数据推送接口");
             return;
         }
-        if (checkParams(obj, "id", "deviceName", "cameraIndexCode", "serialNo", "deviceIndexCode", "enforceOrgName", "registerTime",
-                "deviceStatus", "bindStatus", "enforceOrgId", "isDeleted", "createTime", "updateTime"
-        )) {
+        if (checkParams(obj, "id", "deviceName", "cameraIndexCode", "serialNo", "deviceIndexCode", "enforceOrgName", "registerTime", "deviceStatus", "bindStatus", "enforceOrgId", "isDeleted", "createTime", "updateTime")) {
             request("/device", obj, checkIsLjData(MapUtil.getStr(obj, "enforceOrgId")));
         } else if (checkParams(obj, "id")) {
             Device device = Optional.ofNullable(deviceService.getById((Serializable) obj.get("id"))).orElse(new Device());
@@ -149,8 +147,7 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
             return;
         }
         if (checkParams(obj, "id")) {
-            EnforceJob enforceJob = Optional.ofNullable(enforceJobService.getRealJobById((Serializable) obj.get("id")))
-                    .orElse(new EnforceJob());
+            EnforceJob enforceJob = Optional.ofNullable(enforceJobService.getRealJobById((Serializable) obj.get("id"))).orElse(new EnforceJob());
             if (!JobTypeEnum.REPORT.getValue().equals(enforceJob.getJobType()) || !checkIsLjData(enforceJob.getEnforceOrgId())) {
                 throw new ServiceException("不是两江举报投诉任务不进行同步： " + enforceJob);
             }
@@ -210,10 +207,7 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
             log.info("未开启两江数据推送接口");
             return;
         }
-        if (checkParams(obj, "id", "enforceOrgName", "enforceObjName", "manageStatus", "enforceOrgId", "enforceObjType", "architectureType",
-                "holeResponsibility", "createUserId", "updateUserId",
-                "isDeleted", "selectTimes", "dataSources", "isLabel", "extractNum", "createTime", "updateTime"
-        )) {
+        if (checkParams(obj, "id", "enforceOrgName", "enforceObjName", "manageStatus", "enforceOrgId", "enforceObjType", "architectureType", "holeResponsibility", "createUserId", "updateUserId", "isDeleted", "selectTimes", "dataSources", "isLabel", "extractNum", "createTime", "updateTime")) {
             request("/enforce_obj", obj, checkIsLjData(MapUtil.getStr(obj, "enforceOrgId")));
         } else if (checkParams(obj, "id")) {
             EnforceObj enforceObj = Optional.ofNullable(enforceObjService.getById((Serializable) obj.get("id"))).orElse(new EnforceObj());
@@ -257,8 +251,7 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
             log.info("未开启两江数据推送接口");
             return;
         }
-        if (checkParams(obj, "id", "mediaId", "deviceId", "deviceName", "enforceOrgId", "enforceOrgName", "videoType", "videoBeginTime", "videoEndTime",
-                "isDeleted", "fileId", "duration", "timeOut", "createTime")) {
+        if (checkParams(obj, "id", "mediaId", "deviceId", "deviceName", "enforceOrgId", "enforceOrgName", "videoType", "videoBeginTime", "videoEndTime", "isDeleted", "fileId", "duration", "timeOut", "createTime")) {
             obj.put("timeOut", 0);
             request("/device_video", obj, checkIsLjData(MapUtil.getStr(obj, "enforceOrgId")));
         } else if (checkParams(obj, "id")) {
@@ -346,7 +339,7 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
 
             //发送数据到IRS交互应用
             String address = Optional.of(enforceObj).map(EnforceObj::getEnforceOrgName).orElse("");
-            if (!address.contains("两江新区")) {
+            if (!address.contains("两江新区") || !address.contains("沙坪坝区")) {
                 log.info(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用不是两江新区");
                 continue;
             }
@@ -392,12 +385,7 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
             EnforceJob enforceJob = enforceJobService.getById(jobId);
 
             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 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("");
             if (StringUtils.isEmpty(streetName)) {
                 log.info(enforceObj.getEnforceObjName() + "---------------发送至发送数据到IRS交互应用找不到街道");
                 continue;
@@ -421,11 +409,7 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
 
             Map<String, Object> param = BeanUtil.beanToMap(startEventDto, false, true);
             log.error("单位发送至发送数据到IRS交互应用参数: {}", JSON.toJSONString(param));
-            String startEventString = HttpUtil.createPost("http://183.66.101.165:9408/api/event/start/v1")
-                    .body(JSON.toJSONString(param))
-                    .execute()
-                    .sync()
-                    .body();
+            String startEventString = HttpUtil.createPost("http://183.66.101.165:9408/api/event/start/v1").body(JSON.toJSONString(param)).execute().sync().body();
             log.error("单位发送至发送数据到IRS交互应用: {}", startEventString);
 
         }