diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sync/SyncController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sync/SyncController.java index e85044c..f61e846 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/sync/SyncController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sync/SyncController.java @@ -40,6 +40,7 @@ public class SyncController extends BaseController { } else { data.setData(ParamsAdpter.builder().push(handResult).toJsonString()); } + data.setSuccess(true); return data; } diff --git a/parent/core.sdk/src/main/java/com/lyms/sync/channel/ChannelData.java b/parent/core.sdk/src/main/java/com/lyms/sync/channel/ChannelData.java index 3245ff6..b0b67a8 100644 --- a/parent/core.sdk/src/main/java/com/lyms/sync/channel/ChannelData.java +++ b/parent/core.sdk/src/main/java/com/lyms/sync/channel/ChannelData.java @@ -69,6 +69,11 @@ public class ChannelData implements Serializable { * 出错重试次数 */ private int errorRetryCount; + + /** + * 是否成功 + */ + private boolean success; public ChannelData(String remote, String remoteClazz, String remoteMethod, String data, boolean loop) { this.id = StrUtils.uuid(); @@ -179,6 +184,14 @@ public class ChannelData implements Serializable { public void setErrorRetryCount(int errorRetryCount) { this.errorRetryCount = errorRetryCount; } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/job/SyncPushToCenterJob.java b/parent/hospital.web/src/main/java/com/lyms/hospital/job/SyncPushToCenterJob.java index c2341a3..63fae61 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/job/SyncPushToCenterJob.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/job/SyncPushToCenterJob.java @@ -34,11 +34,10 @@ public class SyncPushToCenterJob { @Autowired private SyncDataBasicService syncDataBasicService; - @SuppressWarnings("unused") public void excute() { if(null != CENTER_SYNCPUSH_URL && CENTER_SYNCPUSH_URL.startsWith("http")){ List dataList = syncDataBasicService.selectList(new EntityWrapper().where("IFSUC=0").and("ERROR_COUNT < {0}", ERROR_COUNT_MAX)); - if(dataList != null ){ + if(dataList != null && dataList.size() > 0){ log.debug("=======开始进行 SYNC_DATA_BASIC 表格数据的推送到中心======="); for(SyncDataBasic entity : dataList){ try{ @@ -51,9 +50,10 @@ public class SyncPushToCenterJob { return; } ChannelData model = JsonUtils.jsonToBean(result, ChannelData.class); - entity.setIfsuc(1); - syncDataBasicService.updateById(entity); - log.debug("中心处后数据:"+result); + if(model.isSuccess()){ + entity.setIfsuc(1); + syncDataBasicService.updateById(entity); + } }catch (Exception e) { syncDataBasicService.errorCountAdd(entity.getId()); log.error("【SYNC_DATA_BASIC】表格数据的的推送到中心错误:SyncDataBasic = {} {}",JSONObject.toJSON(entity),e);