From dd3d1d3db3730c971efa77f06eaae6bccdfc25b4 Mon Sep 17 00:00:00 2001 From: maliang Date: Thu, 16 Mar 2017 09:57:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/cm/controller/sys/SysRemoteController.java | 10 +++++----- .../src/main/java/com/lyms/cm/job/SycnFixJob.java | 16 ++++++++-------- .../src/main/java/com/lyms/cm/job/SycnTmpJob.java | 12 ++++++------ .../com/lyms/hospital/controller/RouterController.java | 10 +++++----- .../java/com/lyms/hospital/entity/sys/SyncDataBasic.java | 2 +- .../lyms/hospital/service/sys/SyncDataBasicService.java | 2 +- .../service/sys/impl/SyncDataBasicServiceImpl.java | 2 +- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRemoteController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRemoteController.java index bfbbd35..b07d9d8 100644 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRemoteController.java +++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRemoteController.java @@ -9,10 +9,10 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.lyms.synch.ParamsHandler; -import com.lyms.synch.SycnHandler; -import com.lyms.synch.SyncUtils; -import com.lyms.synch.entity.ChannelData; +import com.lyms.sycn.ParamsHandler; +import com.lyms.sycn.SycnHandler; +import com.lyms.sycn.SycnUtils; +import com.lyms.sycn.channel.ChannelData; import com.lyms.web.controller.BaseController; @Controller @@ -23,7 +23,7 @@ public class SysRemoteController extends BaseController { @RequestMapping(value = "/sycn", produces = { MediaType.APPLICATION_JSON_VALUE }) @ResponseBody public Object push(HttpServletRequest request) throws ClassNotFoundException, IOException { - ChannelData model = SyncUtils.conver(request); + ChannelData model = SycnUtils.conver(request); Object object = SycnHandler.handler(model); model.setData(ParamsHandler.builder().push(object).toJsonString()); model.setAck(true); diff --git a/center.manager/src/main/java/com/lyms/cm/job/SycnFixJob.java b/center.manager/src/main/java/com/lyms/cm/job/SycnFixJob.java index d31c4cb..2c0ca1d 100644 --- a/center.manager/src/main/java/com/lyms/cm/job/SycnFixJob.java +++ b/center.manager/src/main/java/com/lyms/cm/job/SycnFixJob.java @@ -6,12 +6,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import com.lyms.synch.ParamsHandler; -import com.lyms.synch.SycnHandler; -import com.lyms.synch.SyncCallback; -import com.lyms.synch.SyncnCenter; -import com.lyms.synch.SyncnCenter.Work; -import com.lyms.synch.entity.ChannelData; +import com.lyms.sycn.ParamsHandler; +import com.lyms.sycn.SycnCallback; +import com.lyms.sycn.SycnCenter; +import com.lyms.sycn.SycnCenter.Work; +import com.lyms.sycn.SycnHandler; +import com.lyms.sycn.channel.ChannelData; import com.lyms.util.HttpUtils; import com.lyms.util.JsonUtils; @@ -26,14 +26,14 @@ public class SycnFixJob { private Logger LOG = LoggerFactory.getLogger(getClass()); @Autowired - public SyncnCenter center; + public SycnCenter center; public void excute() { // 拉取远端数据 LOG.debug("执行拉取远程数据任务..."); final Work work = center.buildWork(); try { - work.pullFix(new SyncCallback() { + work.pullFix(new SycnCallback() { @Override public void callBack(Object object) { if (object instanceof ChannelData) { diff --git a/center.manager/src/main/java/com/lyms/cm/job/SycnTmpJob.java b/center.manager/src/main/java/com/lyms/cm/job/SycnTmpJob.java index e36a577..07362f6 100644 --- a/center.manager/src/main/java/com/lyms/cm/job/SycnTmpJob.java +++ b/center.manager/src/main/java/com/lyms/cm/job/SycnTmpJob.java @@ -4,10 +4,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import com.lyms.synch.SyncCallback; -import com.lyms.synch.SyncnCenter; -import com.lyms.synch.SyncnCenter.Work; -import com.lyms.synch.entity.ChannelData; +import com.lyms.sycn.SycnCallback; +import com.lyms.sycn.SycnCenter; +import com.lyms.sycn.SycnCenter.Work; +import com.lyms.sycn.channel.ChannelData; import com.lyms.util.HttpUtils; import com.lyms.util.JsonUtils; @@ -23,14 +23,14 @@ public class SycnTmpJob { private Logger LOG = LoggerFactory.getLogger(getClass()); @Autowired - public SyncnCenter center; + public SycnCenter center; public void excute() { // 拉取远端数据 LOG.debug("执行推送远程数据任务..."); final Work work = center.buildWork(); try { - work.pullTmp(new SyncCallback() { + work.pullTmp(new SycnCallback() { @Override public void callBack(Object object) { if (object instanceof ChannelData) { diff --git a/hospital.web/src/main/java/com/lyms/hospital/controller/RouterController.java b/hospital.web/src/main/java/com/lyms/hospital/controller/RouterController.java index 16155f0..04c2873 100644 --- a/hospital.web/src/main/java/com/lyms/hospital/controller/RouterController.java +++ b/hospital.web/src/main/java/com/lyms/hospital/controller/RouterController.java @@ -9,10 +9,10 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.lyms.synch.ParamsHandler; -import com.lyms.synch.SycnHandler; -import com.lyms.synch.SyncUtils; -import com.lyms.synch.entity.ChannelData; +import com.lyms.sycn.ParamsHandler; +import com.lyms.sycn.SycnHandler; +import com.lyms.sycn.SycnUtils; +import com.lyms.sycn.channel.ChannelData; import com.lyms.web.controller.BaseController; /** @@ -28,7 +28,7 @@ public class RouterController extends BaseController { @RequestMapping(value = "/sycn", produces = { MediaType.APPLICATION_JSON_VALUE }) public Object remote(HttpServletRequest request) throws ClassNotFoundException, IOException { - ChannelData data = SyncUtils.conver(request); + ChannelData data = SycnUtils.conver(request); System.out.println("接受到数据: " + ToStringBuilder.reflectionToString(data)); Object handResult = SycnHandler.handler(data); if (data.getLoop()) { diff --git a/hospital.web/src/main/java/com/lyms/hospital/entity/sys/SyncDataBasic.java b/hospital.web/src/main/java/com/lyms/hospital/entity/sys/SyncDataBasic.java index c2a8183..08c0aa3 100644 --- a/hospital.web/src/main/java/com/lyms/hospital/entity/sys/SyncDataBasic.java +++ b/hospital.web/src/main/java/com/lyms/hospital/entity/sys/SyncDataBasic.java @@ -6,7 +6,7 @@ import java.util.Date; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; -import com.lyms.synch.entity.ChannelData; +import com.lyms.sycn.channel.ChannelData; /** * diff --git a/hospital.web/src/main/java/com/lyms/hospital/service/sys/SyncDataBasicService.java b/hospital.web/src/main/java/com/lyms/hospital/service/sys/SyncDataBasicService.java index 3766427..bd9a98a 100644 --- a/hospital.web/src/main/java/com/lyms/hospital/service/sys/SyncDataBasicService.java +++ b/hospital.web/src/main/java/com/lyms/hospital/service/sys/SyncDataBasicService.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.util.List; import com.lyms.hospital.entity.sys.SyncDataBasic; -import com.lyms.synch.entity.ChannelData; +import com.lyms.sycn.channel.ChannelData; import com.lyms.web.service.BaseService; /** diff --git a/hospital.web/src/main/java/com/lyms/hospital/service/sys/impl/SyncDataBasicServiceImpl.java b/hospital.web/src/main/java/com/lyms/hospital/service/sys/impl/SyncDataBasicServiceImpl.java index 05344bb..8e3fc73 100644 --- a/hospital.web/src/main/java/com/lyms/hospital/service/sys/impl/SyncDataBasicServiceImpl.java +++ b/hospital.web/src/main/java/com/lyms/hospital/service/sys/impl/SyncDataBasicServiceImpl.java @@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.hospital.dao.sys.SyncDataBasicMapper; import com.lyms.hospital.entity.sys.SyncDataBasic; import com.lyms.hospital.service.sys.SyncDataBasicService; -import com.lyms.synch.entity.ChannelData; +import com.lyms.sycn.channel.ChannelData; import com.lyms.util.JsonUtils; /** -- 1.8.3.1