From 536e5b887a206908ae2edeb093f564ba2dc1362d Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Wed, 5 Dec 2018 17:11:12 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9getMaatTableName?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=AD=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E8=A1=A8=E5=90=8D=E7=9A=84=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=9B=202=E3=80=81=E5=A6=82=E6=9E=9C=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E7=9A=84service=E6=B2=A1=E6=9C=89=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E8=AE=BA=E6=98=AFmaat=E7=B1=BB=E8=BF=98=E6=98=AF?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E7=B1=BB=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=83=BD?= =?UTF-8?q?=E4=BC=9A=E4=BC=A0{}+lastCompletedTag(finished)=E6=9D=A5?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=95=B0=E6=8D=AE=E4=BC=A0=E8=BE=93=EF=BC=9B?= =?UTF-8?q?=203=E3=80=81=E6=89=BE=E4=B8=8D=E5=88=B0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=BA=8F=E5=8F=B7=E6=97=B6=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E7=A4=BAXX=E4=B8=9A=E5=8A=A1=E5=86=99=E5=85=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=BA=8F=E5=8F=B7=E6=98=A0=E5=B0=84=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E4=B8=8D=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/ServiceAndRDBIndexReal.java | 2 +- .../controller/restful/ConfigSourcesController.java | 8 ++++++-- .../nis/web/service/restful/ConfigSourcesService.java | 10 +++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java b/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java index b7427c1..578e4e2 100644 --- a/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java +++ b/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java @@ -311,7 +311,7 @@ public class ServiceAndRDBIndexReal { return tableList.get(index); } else { logger.error("未从业务类型和表对应关系中,找到业务类型:{},配置类型:{}表名:{}对应的真实表名", service, type, tableName); - throw new ServiceRuntimeException("无法从applicationConfig-rule.properties配置文件中,找到回调类配置service为" + throw new ServiceRuntimeException("无法从applicationConfig-rule.properties配置文件中,找到service为" + service + ",配置类型:" + type + "对应的真实表名", RestBusinessCode.NotFoundTableName.getValue()); } diff --git a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java index 7b0fb1f..121d90f 100644 --- a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java +++ b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java @@ -565,7 +565,7 @@ public class ConfigSourcesController extends BaseRestController { String serviceId = request.getHeader("Service-Id"); String configTable = request.getHeader("Config-Table"); String lastCompletedTag = request.getHeader("Last-Completed-Tag"); - logger.info(new Date() + "-----------接收到json格式数据:" + jsonString + "-------:"); +// logger.info(new Date() + "-----------接收到json格式数据:" + jsonString + "-------:"); if (StringUtil.isEmpty(serviceId)) { logger.error("未在请求头中获取到serviceId"); throw new RestServiceException( @@ -590,7 +590,7 @@ public class ConfigSourcesController extends BaseRestController { logger.info("-----------开始存储到json格式数据------->>configType:" + configType + ",serviceId:" + serviceId + ",configTable:" + configTable + ",lastCompletedTag:" + lastCompletedTag); - if (jsonString != null && !jsonString.trim().equals("")) {// 张薇说body可能为空,有的service没有数据也会下发一次,譬如最后一次提交时,lastCompletedTag=finished,但是body可能是空的 + if (jsonString != null && !jsonString.trim().equals("{}")) {// 如果最后的service没有配置，不论是maat类还是回调类配置，都会传{}+lastCompletedTag(finished)来结束数据传输 String key = null; if ("1".equals(configType)) { key = "MAAT"; @@ -637,6 +637,10 @@ public class ConfigSourcesController extends BaseRestController { } logger.info("-----------配置同步指令下发:" + new Date()); // 设置配置同步状态为开始 + //在下次开始同步之前把上次记录的key删除 + if (JedisClusterUtils.exists("allConfigSyncKey")) { + JedisClusterUtils.getResource().del("allConfigSyncKey"); + } configSourcesService.setAllConfigSyncStatus("0"); } else if ("0".equals(obj.get("syncStatus").toString())) {// 取消同步指令 if (allConfigSyncStatus != null diff --git a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java index 4791ba8..eb4416d 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java +++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java @@ -299,7 +299,7 @@ public class ConfigSourcesService extends BaseService { } } else { - throw new ServiceRuntimeException(RestBusinessCode.ServiceNoFoundDBIndex.getErrorReason(), + throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在", RestBusinessCode.ServiceNoFoundDBIndex.getValue()); } } @@ -478,7 +478,7 @@ public class ConfigSourcesService extends BaseService { } } else { - throw new ServiceRuntimeException(RestBusinessCode.ServiceNoFoundDBIndex.getErrorReason(), + throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在", RestBusinessCode.ServiceNoFoundDBIndex.getValue()); } } @@ -801,7 +801,7 @@ public class ConfigSourcesService extends BaseService { } } } else { - throw new ServiceRuntimeException("service与写入数据库序号映射关系不存在", + throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在", RestBusinessCode.ServiceNoFoundDBIndex.getValue()); } @@ -891,7 +891,7 @@ public class ConfigSourcesService extends BaseService { } } } else { - throw new ServiceRuntimeException("service与写入数据库序号映射关系不存在", + throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在", RestBusinessCode.ServiceNoFoundDBIndex.getValue()); } @@ -972,7 +972,7 @@ public class ConfigSourcesService extends BaseService { } } } else { - throw new ServiceRuntimeException("service与写入数据库序号映射关系不存在", + throw new ServiceRuntimeException("service为"+service+"的业务写入数据库序号映射关系不存在", RestBusinessCode.ServiceNoFoundDBIndex.getValue()); } }