Commit dd3d1d3db3730c971efa77f06eaae6bccdfc25b4
1 parent
d2aa74b31e
Exists in
master
修改导入错误信息
Showing 7 changed files with 27 additions and 27 deletions
- center.manager/src/main/java/com/lyms/cm/controller/sys/SysRemoteController.java
- center.manager/src/main/java/com/lyms/cm/job/SycnFixJob.java
- center.manager/src/main/java/com/lyms/cm/job/SycnTmpJob.java
- hospital.web/src/main/java/com/lyms/hospital/controller/RouterController.java
- hospital.web/src/main/java/com/lyms/hospital/entity/sys/SyncDataBasic.java
- hospital.web/src/main/java/com/lyms/hospital/service/sys/SyncDataBasicService.java
- hospital.web/src/main/java/com/lyms/hospital/service/sys/impl/SyncDataBasicServiceImpl.java
center.manager/src/main/java/com/lyms/cm/controller/sys/SysRemoteController.java
View file @
dd3d1d3
| ... | ... | @@ -9,10 +9,10 @@ |
| 9 | 9 | import org.springframework.web.bind.annotation.RequestMapping; |
| 10 | 10 | import org.springframework.web.bind.annotation.ResponseBody; |
| 11 | 11 | |
| 12 | -import com.lyms.synch.ParamsHandler; | |
| 13 | -import com.lyms.synch.SycnHandler; | |
| 14 | -import com.lyms.synch.SyncUtils; | |
| 15 | -import com.lyms.synch.entity.ChannelData; | |
| 12 | +import com.lyms.sycn.ParamsHandler; | |
| 13 | +import com.lyms.sycn.SycnHandler; | |
| 14 | +import com.lyms.sycn.SycnUtils; | |
| 15 | +import com.lyms.sycn.channel.ChannelData; | |
| 16 | 16 | import com.lyms.web.controller.BaseController; |
| 17 | 17 | |
| 18 | 18 | @Controller |
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | @RequestMapping(value = "/sycn", produces = { MediaType.APPLICATION_JSON_VALUE }) |
| 24 | 24 | @ResponseBody |
| 25 | 25 | public Object push(HttpServletRequest request) throws ClassNotFoundException, IOException { |
| 26 | - ChannelData model = SyncUtils.conver(request); | |
| 26 | + ChannelData model = SycnUtils.conver(request); | |
| 27 | 27 | Object object = SycnHandler.handler(model); |
| 28 | 28 | model.setData(ParamsHandler.builder().push(object).toJsonString()); |
| 29 | 29 | model.setAck(true); |
center.manager/src/main/java/com/lyms/cm/job/SycnFixJob.java
View file @
dd3d1d3
| ... | ... | @@ -6,12 +6,12 @@ |
| 6 | 6 | import org.slf4j.LoggerFactory; |
| 7 | 7 | import org.springframework.beans.factory.annotation.Autowired; |
| 8 | 8 | |
| 9 | -import com.lyms.synch.ParamsHandler; | |
| 10 | -import com.lyms.synch.SycnHandler; | |
| 11 | -import com.lyms.synch.SyncCallback; | |
| 12 | -import com.lyms.synch.SyncnCenter; | |
| 13 | -import com.lyms.synch.SyncnCenter.Work; | |
| 14 | -import com.lyms.synch.entity.ChannelData; | |
| 9 | +import com.lyms.sycn.ParamsHandler; | |
| 10 | +import com.lyms.sycn.SycnCallback; | |
| 11 | +import com.lyms.sycn.SycnCenter; | |
| 12 | +import com.lyms.sycn.SycnCenter.Work; | |
| 13 | +import com.lyms.sycn.SycnHandler; | |
| 14 | +import com.lyms.sycn.channel.ChannelData; | |
| 15 | 15 | import com.lyms.util.HttpUtils; |
| 16 | 16 | import com.lyms.util.JsonUtils; |
| 17 | 17 | |
| 18 | 18 | |
| ... | ... | @@ -26,14 +26,14 @@ |
| 26 | 26 | private Logger LOG = LoggerFactory.getLogger(getClass()); |
| 27 | 27 | |
| 28 | 28 | @Autowired |
| 29 | - public SyncnCenter center; | |
| 29 | + public SycnCenter center; | |
| 30 | 30 | |
| 31 | 31 | public void excute() { |
| 32 | 32 | // 拉取远端数据 |
| 33 | 33 | LOG.debug("执行拉取远程数据任务..."); |
| 34 | 34 | final Work work = center.buildWork(); |
| 35 | 35 | try { |
| 36 | - work.pullFix(new SyncCallback() { | |
| 36 | + work.pullFix(new SycnCallback() { | |
| 37 | 37 | @Override |
| 38 | 38 | public void callBack(Object object) { |
| 39 | 39 | if (object instanceof ChannelData) { |
center.manager/src/main/java/com/lyms/cm/job/SycnTmpJob.java
View file @
dd3d1d3
| ... | ... | @@ -4,10 +4,10 @@ |
| 4 | 4 | import org.slf4j.LoggerFactory; |
| 5 | 5 | import org.springframework.beans.factory.annotation.Autowired; |
| 6 | 6 | |
| 7 | -import com.lyms.synch.SyncCallback; | |
| 8 | -import com.lyms.synch.SyncnCenter; | |
| 9 | -import com.lyms.synch.SyncnCenter.Work; | |
| 10 | -import com.lyms.synch.entity.ChannelData; | |
| 7 | +import com.lyms.sycn.SycnCallback; | |
| 8 | +import com.lyms.sycn.SycnCenter; | |
| 9 | +import com.lyms.sycn.SycnCenter.Work; | |
| 10 | +import com.lyms.sycn.channel.ChannelData; | |
| 11 | 11 | import com.lyms.util.HttpUtils; |
| 12 | 12 | import com.lyms.util.JsonUtils; |
| 13 | 13 | |
| 14 | 14 | |
| ... | ... | @@ -23,14 +23,14 @@ |
| 23 | 23 | private Logger LOG = LoggerFactory.getLogger(getClass()); |
| 24 | 24 | |
| 25 | 25 | @Autowired |
| 26 | - public SyncnCenter center; | |
| 26 | + public SycnCenter center; | |
| 27 | 27 | |
| 28 | 28 | public void excute() { |
| 29 | 29 | // 拉取远端数据 |
| 30 | 30 | LOG.debug("执行推送远程数据任务..."); |
| 31 | 31 | final Work work = center.buildWork(); |
| 32 | 32 | try { |
| 33 | - work.pullTmp(new SyncCallback() { | |
| 33 | + work.pullTmp(new SycnCallback() { | |
| 34 | 34 | @Override |
| 35 | 35 | public void callBack(Object object) { |
| 36 | 36 | if (object instanceof ChannelData) { |
hospital.web/src/main/java/com/lyms/hospital/controller/RouterController.java
View file @
dd3d1d3
| ... | ... | @@ -9,10 +9,10 @@ |
| 9 | 9 | import org.springframework.web.bind.annotation.RequestMapping; |
| 10 | 10 | import org.springframework.web.bind.annotation.RestController; |
| 11 | 11 | |
| 12 | -import com.lyms.synch.ParamsHandler; | |
| 13 | -import com.lyms.synch.SycnHandler; | |
| 14 | -import com.lyms.synch.SyncUtils; | |
| 15 | -import com.lyms.synch.entity.ChannelData; | |
| 12 | +import com.lyms.sycn.ParamsHandler; | |
| 13 | +import com.lyms.sycn.SycnHandler; | |
| 14 | +import com.lyms.sycn.SycnUtils; | |
| 15 | +import com.lyms.sycn.channel.ChannelData; | |
| 16 | 16 | import com.lyms.web.controller.BaseController; |
| 17 | 17 | |
| 18 | 18 | /** |
| ... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 | |
| 29 | 29 | @RequestMapping(value = "/sycn", produces = { MediaType.APPLICATION_JSON_VALUE }) |
| 30 | 30 | public Object remote(HttpServletRequest request) throws ClassNotFoundException, IOException { |
| 31 | - ChannelData data = SyncUtils.conver(request); | |
| 31 | + ChannelData data = SycnUtils.conver(request); | |
| 32 | 32 | System.out.println("接受到数据: " + ToStringBuilder.reflectionToString(data)); |
| 33 | 33 | Object handResult = SycnHandler.handler(data); |
| 34 | 34 | if (data.getLoop()) { |
hospital.web/src/main/java/com/lyms/hospital/entity/sys/SyncDataBasic.java
View file @
dd3d1d3
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | import com.baomidou.mybatisplus.annotations.TableField; |
| 7 | 7 | import com.baomidou.mybatisplus.annotations.TableId; |
| 8 | 8 | import com.baomidou.mybatisplus.annotations.TableName; |
| 9 | -import com.lyms.synch.entity.ChannelData; | |
| 9 | +import com.lyms.sycn.channel.ChannelData; | |
| 10 | 10 | |
| 11 | 11 | /** |
| 12 | 12 | * |
hospital.web/src/main/java/com/lyms/hospital/service/sys/SyncDataBasicService.java
View file @
dd3d1d3
hospital.web/src/main/java/com/lyms/hospital/service/sys/impl/SyncDataBasicServiceImpl.java
View file @
dd3d1d3
| ... | ... | @@ -12,7 +12,7 @@ |
| 12 | 12 | import com.lyms.hospital.dao.sys.SyncDataBasicMapper; |
| 13 | 13 | import com.lyms.hospital.entity.sys.SyncDataBasic; |
| 14 | 14 | import com.lyms.hospital.service.sys.SyncDataBasicService; |
| 15 | -import com.lyms.synch.entity.ChannelData; | |
| 15 | +import com.lyms.sycn.channel.ChannelData; | |
| 16 | 16 | import com.lyms.util.JsonUtils; |
| 17 | 17 | |
| 18 | 18 | /** |