From 501e1e115bafa79fcc2c548fe5291d011e985080 Mon Sep 17 00:00:00 2001 From: fangcheng Date: Mon, 15 May 2017 14:59:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=B9=E9=94=99=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/cm/job/SyncFixJob.java | 3 ++- .../src/main/java/com/lyms/cm/job/SyncTmpJob.java | 10 ++++++++-- .../java/com/lyms/hospital/controller/RouterController.java | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/parent/center.manager/src/main/java/com/lyms/cm/job/SyncFixJob.java b/parent/center.manager/src/main/java/com/lyms/cm/job/SyncFixJob.java index 5116bb3..754cbd8 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/job/SyncFixJob.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/job/SyncFixJob.java @@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; +import com.alibaba.fastjson.JSONException; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.lyms.base.common.entity.organ.OrganGroup; import com.lyms.base.common.service.organ.OrganGroupService; @@ -92,7 +93,7 @@ public class SyncFixJob { ChannelData data = null; try{ data = JsonUtils.jsonToBean(result, ChannelData.class); - }catch(Exception e){ + }catch(JSONException e){ LOG.error("同步数据转换异常，请求结果：{} ",result); return; } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/job/SyncTmpJob.java b/parent/center.manager/src/main/java/com/lyms/cm/job/SyncTmpJob.java index fecd792..265f813 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/job/SyncTmpJob.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/job/SyncTmpJob.java @@ -3,11 +3,13 @@ package com.lyms.cm.job; import java.io.Serializable; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; +import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; import com.lyms.sync.SyncCallback; import com.lyms.sync.SyncCenter; @@ -62,11 +64,15 @@ public class SyncTmpJob { if (model != null) { // 任务发送执行 String result = HttpUtils.REMOTE.post(model); - if(result == null){//远程无法访问等情况 + if(StringUtils.isBlank(result)){//远程无法访问等情况 work.backPressure(); return; } - model = JsonUtils.jsonToBean(result, ChannelData.class); + try{ + model = JsonUtils.jsonToBean(result, ChannelData.class); + }catch(JSONException e){ + LOG.error("推送到节点数据返回异常，返回结果：{} ",result); + } if (model != null && model.getAck()) { work.backPressure(); } diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/RouterController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/RouterController.java index 2dfdd52..6ee7e94 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/RouterController.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/RouterController.java @@ -30,7 +30,7 @@ public class RouterController extends BaseController { private static final Logger log = LoggerFactory.getLogger(RouterController.class); - @RequestMapping(value = "/pull", produces = { MediaType.APPLICATION_JSON_VALUE }) + //@RequestMapping(value = "/pull", produces = { MediaType.APPLICATION_JSON_VALUE }) public Object pull(HttpServletRequest request) throws Exception { ChannelData data = SyncUtils.conver(request); log.debug("节点数据被中心拉取：" + ToStringBuilder.reflectionToString(data)); @@ -44,7 +44,7 @@ public class RouterController extends BaseController { return data; } - @RequestMapping(value = "/push", produces = { MediaType.APPLICATION_JSON_VALUE }) + //@RequestMapping(value = "/push", produces = { MediaType.APPLICATION_JSON_VALUE }) public Object push(HttpServletRequest request) throws Exception { ChannelData data = SyncUtils.conver(request); log.debug("中心推送数据到节点：" + ToStringBuilder.reflectionToString(data)); -- 1.8.3.1