From eaae10844caee35e80f4f50b107b0db177f59186 Mon Sep 17 00:00:00 2001 From: linrf Date: Fri, 9 Jun 2023 10:46:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8Arabbitmq=20listener=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=97=B6=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/http/HttpTBasicCollectorImpl.java | 2 +- .../basic/mq/RabbitMqBasicConsumer.java | 18 ++--- .../basic/ws/WsBasicCollectorImpl.java | 2 +- .../dept/http/HttpDeptCollectorImpl.java | 2 +- .../collect/dept/mq/RabbitMqDeptConsumer.java | 12 +-- .../collect/dept/ws/WsDeptCollectorImpl.java | 2 +- .../user/http/HttpUserCollectorImpl.java | 2 +- .../collect/user/mq/RabbitMqUserConsumer.java | 12 +-- .../user/mq/test/RabbitMQProducer.java | 80 +++++++++---------- .../collect/user/ws/WsUserCollectorImpl.java | 2 +- collect-sdry/src/main/resources/bootstrap.yml | 41 ++++++---- .../com/docus/server/collect/ICollector.java | 4 +- .../basic/http/TBasicHttpCollectJob.java | 4 +- .../basic/view/TBasicViewCollectJob.java | 2 +- .../collect/basic/ws/TBasicWsCollectJob.java | 4 +- .../collect/dept/http/DeptHttpCollectJob.java | 4 +- .../collect/dept/view/DeptViewCollectJob.java | 2 +- .../collect/dept/ws/DeptWsCollectJob.java | 4 +- .../collect/user/http/UserHttpCollectJob.java | 4 +- .../collect/user/view/UserViewCollectJob.java | 2 +- .../collect/user/ws/UserWsCollectJob.java | 4 +- .../server/collect/web/domain/TaskConfig.java | 2 +- .../collect/web/job/AbstractCollectJob.java | 2 +- .../server/his/infrastructure/HisSysDao.java | 7 +- .../docus/server/his/service/IHisService.java | 6 +- .../server/his/service/impl/HisService.java | 6 +- 26 files changed, 109 insertions(+), 123 deletions(-) diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java index 1d1cc58..9fa42be 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java @@ -17,7 +17,7 @@ import java.util.List; @Component("httpTBasicCollectorImpl") public class HttpTBasicCollectorImpl implements IHttpCollector { @Override - public List get(Date startDate, Date endDate, long pageNum, long pageSize) { + public List list(Date startDate, Date endDate, int pageNum, int pageSize) { TBasicDTO deptDTO = new TBasicDTO(); TBasicDTO deptDTO1 = new TBasicDTO(); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/mq/RabbitMqBasicConsumer.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/mq/RabbitMqBasicConsumer.java index 9af42fe..ac6d1fb 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/mq/RabbitMqBasicConsumer.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/mq/RabbitMqBasicConsumer.java @@ -1,10 +1,6 @@ package com.docus.server.collect.basic.mq; import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.rabbit.annotation.Exchange; -import org.springframework.amqp.rabbit.annotation.Queue; -import org.springframework.amqp.rabbit.annotation.QueueBinding; -import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -18,7 +14,7 @@ import javax.annotation.Resource; * 注：如果代码创建交换器等且配置绑定关系，注解只需监听队列即可，如：@RabbitListener(queues = "direct.queue") *

*

- * rabbitmq basic consumer + * rabbitmq basic consumer 使用时需要开启@RabbitListener注解 * * @author linruifeng * @see com.docus.server.collect.basic.mq.impl.BasicRabbitMqCollectServiceImpl#addTBasic(String) @@ -31,24 +27,24 @@ public class RabbitMqBasicConsumer { private IBasicMqCollectService basicMqCollectService; /** - * topic n:1 类型 交换器队列 消费(普通会员注册提醒) + * topic n:1 类型 交换器队列 消费 */ - @RabbitListener( + /*@RabbitListener( bindings = {@QueueBinding(value = @Queue(value = "topic.queue.01"), exchange = @Exchange(value = "topic.exchange", type = "topic"), - key = {"*.reg.msg"})}) + key = {"*.reg.msg"})})*/ public void addTBasic(String message) { log.info("rabbitmq message:{}", message); basicMqCollectService.addTBasic(message); } /** - * topic n:1 类型 交换器队列 消费(超级会员注册提醒) + * topic n:1 类型 交换器队列 消费 */ - @RabbitListener(bindings = { + /* @RabbitListener(bindings = { @QueueBinding(value = @Queue(value = "topic.queue.02"), exchange = @Exchange(value = "topic.exchange", type = "topic"), - key = {"*.*.reg.msg.#"})}) + key = {"*.*.reg.msg.#"})})*/ public void updateTBasic(String message) { log.info("rabbitmq message:{}", message); basicMqCollectService.updateTBasic(message); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java index 9b1dd0b..75234e8 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java @@ -14,7 +14,7 @@ import java.util.List; @Component("wsBasicCollectorImpl") public class WsBasicCollectorImpl implements IWsCollector { @Override - public List get(Date startDate, Date endDate, long pageNum, long pageSize) { + public List list(Date startDate, Date endDate, int pageNum, int pageSize) { TBasicDTO deptDTO = new TBasicDTO(); deptDTO.setAdmissDate("1"); deptDTO.setAdmissDays("admin"); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java index 9f06099..7ef7c13 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java @@ -12,7 +12,7 @@ import java.util.List; public class HttpDeptCollectorImpl implements IHttpCollector { @Override - public List get(Date startDate, Date endDate, long pageNum, long pageSize) { + public List list(Date startDate, Date endDate, int pageNum, int pageSize) { DeptDTO deptDTO = new DeptDTO(); deptDTO.setAuthorId("1"); deptDTO.setAuthorName("admin"); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/RabbitMqDeptConsumer.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/RabbitMqDeptConsumer.java index 4c48152..71b3797 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/RabbitMqDeptConsumer.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/RabbitMqDeptConsumer.java @@ -1,10 +1,6 @@ package com.docus.server.collect.dept.mq; import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.rabbit.annotation.Exchange; -import org.springframework.amqp.rabbit.annotation.Queue; -import org.springframework.amqp.rabbit.annotation.QueueBinding; -import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -32,10 +28,10 @@ public class RabbitMqDeptConsumer { /** * topic n:1 类型 交换器队列 消费(普通会员注册提醒) */ - @RabbitListener( + /* @RabbitListener( bindings = {@QueueBinding(value = @Queue(value = "topic.queue.01"), exchange = @Exchange(value = "topic.exchange", type = "topic"), - key = {"*.reg.msg"})}) + key = {"*.reg.msg"})})*/ public void addDept(String message) { log.info("rabbitmq message:{}", message); deptMqCollectService.addDept(message); @@ -44,10 +40,10 @@ public class RabbitMqDeptConsumer { /** * topic n:1 类型 交换器队列 消费(超级会员注册提醒) */ - @RabbitListener(bindings = { + /*@RabbitListener(bindings = { @QueueBinding(value = @Queue(value = "topic.queue.02"), exchange = @Exchange(value = "topic.exchange", type = "topic"), - key = {"*.*.reg.msg.#"})}) + key = {"*.*.reg.msg.#"})})*/ public void updateDept(String message) { log.info("rabbitmq message:{}", message); deptMqCollectService.updateDept(message); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java index aa5c5ad..1981636 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java @@ -14,7 +14,7 @@ import java.util.List; @Component("wsDeptCollectorImpl") public class WsDeptCollectorImpl implements IWsCollector { @Override - public List get(Date startDate, Date endDate, long pageNum, long pageSize) { + public List list(Date startDate, Date endDate, int pageNum, int pageSize) { DeptDTO deptDTO = new DeptDTO(); deptDTO.setAuthorId("1"); deptDTO.setAuthorName("admin"); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java index 0232eee..168e884 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java @@ -14,7 +14,7 @@ import java.util.List; @Component("httpUserCollectorImpl") public class HttpUserCollectorImpl implements IHttpCollector { @Override - public List get(Date startDate, Date endDate, long pageNum, long pageSize) { + public List list(Date startDate, Date endDate, int pageNum, int pageSize) { UserDTO deptDTO = new UserDTO(); deptDTO.setAuthorId("1"); deptDTO.setAuthorName("admin"); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/RabbitMqUserConsumer.java b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/RabbitMqUserConsumer.java index 246f6fb..cc39d76 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/RabbitMqUserConsumer.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/RabbitMqUserConsumer.java @@ -1,10 +1,6 @@ package com.docus.server.collect.user.mq; import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.rabbit.annotation.Exchange; -import org.springframework.amqp.rabbit.annotation.Queue; -import org.springframework.amqp.rabbit.annotation.QueueBinding; -import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -32,10 +28,10 @@ public class RabbitMqUserConsumer { /** * topic n:1 类型 交换器队列 消费(普通会员注册提醒) */ - @RabbitListener( + /*@RabbitListener( bindings = {@QueueBinding(value = @Queue(value = "topic.queue.01"), exchange = @Exchange(value = "topic.exchange", type = "topic"), - key = {"*.reg.msg"})}) + key = {"*.reg.msg"})})*/ public void addUser(String message) { log.info("rabbitmq message:{}", message); userMqCollectService.addUser(message); @@ -44,10 +40,10 @@ public class RabbitMqUserConsumer { /** * topic n:1 类型 交换器队列 消费(超级会员注册提醒) */ - @RabbitListener(bindings = { + /* @RabbitListener(bindings = { @QueueBinding(value = @Queue(value = "topic.queue.02"), exchange = @Exchange(value = "topic.exchange", type = "topic"), - key = {"*.*.reg.msg.#"})}) + key = {"*.*.reg.msg.#"})})*/ public void updateUser(String message) { log.info("rabbitmq message:{}", message); userMqCollectService.updateUser(message); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/test/RabbitMQProducer.java b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/test/RabbitMQProducer.java index d57326c..8576819 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/test/RabbitMQProducer.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/test/RabbitMQProducer.java @@ -1,16 +1,8 @@ package com.docus.server.collect.user.mq.test; -import com.docus.server.collect.web.domain.TaskConfig; -import com.docus.server.collect.web.service.impl.TaskConfigServiceImpl; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import java.util.List; - /** * @Description 生产者 * @Author jxb @@ -20,41 +12,41 @@ import java.util.List; @RequestMapping("mqProducer") public class RabbitMQProducer { - @Autowired - public RabbitTemplate rabbitTemplate; - @Inject - private TaskConfigServiceImpl userService; - - /** - * @Description topic n:1 类型 交换器队列 生产(3个) - * @Author jxb - * @Date 2019-03-09 09:56:45 - */ - @RequestMapping(value = "/topicMQ01", method = {RequestMethod.GET}) - public List topicMQ01() { - List users = userService.list(null); - for (TaskConfig user : users) { - rabbitTemplate.convertAndSend("topic.exchange", "jd.reg.msg", user.getName()); - } - return users; - } - - @RequestMapping(value = "/topicMQ02", method = {RequestMethod.GET}) - public List topicMQ02() { - List users = userService.list(null); - for (TaskConfig user : users) { - rabbitTemplate.convertAndSend("topic.exchange", "tm.reg.msg", user.getName()); - } - return users; - } - - @RequestMapping(value = "/topicMQ03", method = {RequestMethod.GET}) - public List topicMQ03() { - List users = userService.list(null); - for (TaskConfig user : users) { - rabbitTemplate.convertAndSend("topic.exchange", "super.fzb.reg.msg", user.getName()); - } - return users; - } +// @Autowired +// public RabbitTemplate rabbitTemplate; +// @Inject +// private TaskConfigServiceImpl userService; +// +// /** +// * @Description topic n:1 类型 交换器队列 生产(3个) +// * @Author jxb +// * @Date 2019-03-09 09:56:45 +// */ +// @RequestMapping(value = "/topicMQ01", method = {RequestMethod.GET}) +// public List topicMQ01() { +// List users = userService.list(null); +// for (TaskConfig user : users) { +// rabbitTemplate.convertAndSend("topic.exchange", "jd.reg.msg", user.getName()); +// } +// return users; +// } +// +// @RequestMapping(value = "/topicMQ02", method = {RequestMethod.GET}) +// public List topicMQ02() { +// List users = userService.list(null); +// for (TaskConfig user : users) { +// rabbitTemplate.convertAndSend("topic.exchange", "tm.reg.msg", user.getName()); +// } +// return users; +// } +// +// @RequestMapping(value = "/topicMQ03", method = {RequestMethod.GET}) +// public List topicMQ03() { +// List users = userService.list(null); +// for (TaskConfig user : users) { +// rabbitTemplate.convertAndSend("topic.exchange", "super.fzb.reg.msg", user.getName()); +// } +// return users; +// } } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java index 2db112e..e40b7da 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java @@ -14,7 +14,7 @@ import java.util.List; @Component("wsUserCollectorImpl") public class WsUserCollectorImpl implements IWsCollector { @Override - public List get(Date startDate, Date endDate, long pageNum, long pageSize) { + public List list(Date startDate, Date endDate, int pageNum, int pageSize) { UserDTO deptDTO = new UserDTO(); deptDTO.setAuthorId("1"); deptDTO.setAuthorName("admin"); diff --git a/collect-sdry/src/main/resources/bootstrap.yml b/collect-sdry/src/main/resources/bootstrap.yml index df8ace3..3c777b4 100644 --- a/collect-sdry/src/main/resources/bootstrap.yml +++ b/collect-sdry/src/main/resources/bootstrap.yml @@ -12,14 +12,14 @@ spring: datasource: master: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: root - password: root + username: docus + password: docus702 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource his: - url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: root - password: root + url: jdbc:log4jdbc:mysql://db.docus.cn:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai + username: docus + password: docus702 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource # rabbitmq: @@ -27,9 +27,10 @@ spring: # port: 5672 # username: guest # password: guest + redis: host: redis.docus.cn - # password: JSdocus@702 + password: JSdocus@702 cloud: nacos: discovery: @@ -44,6 +45,9 @@ spring: docus: dbtype: mysql + user: + # 用户默认密码 + defpwd: fd29cd53ec12616e5f36b77d4afffbff mybatis-plus: configuration: @@ -53,12 +57,10 @@ mybatis-plus: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: db-config: - update-strategy: ignored field-strategy: NOT_EMPTY db-type: MYSQL mapper-locations: classpath*:/mapper/*Mapper.xml type-enums-package: com.docus.server.collect.web.enums - xxl: job: accessToken: @@ -72,16 +74,21 @@ xxl: logretentiondays: 30 logpath: D:/xxl-job/inspection -api: - soft-delete-column-name=state - soft-delete-column-value=1 -logging: - level: - com: - baomidou: - mybatisplus: DEBUG +# +#ibm: +# mq: +# queueManager: MqManager01 +# channel: chl_server01 +# connName: 10.222.23.130(1414) +# ackUrl: 10.222.23.159:7800/ack +# domain: CDR +# key: cdr-0012-adef +# replica: +# queueManager: MqManager02 +# channel: chl_server02 +# connName: 10.222.23.131(1414) #rocketmq: # name-server: 127.0.01:9876 # producer: -# group: ta-cipher-encode +# group: ta-cipher-encode \ No newline at end of file diff --git a/common-collect/src/main/java/com/docus/server/collect/ICollector.java b/common-collect/src/main/java/com/docus/server/collect/ICollector.java index 8d08af5..0bd2f24 100644 --- a/common-collect/src/main/java/com/docus/server/collect/ICollector.java +++ b/common-collect/src/main/java/com/docus/server/collect/ICollector.java @@ -5,7 +5,7 @@ import java.util.List; public interface ICollector { /** - * 根据配置获取多态的收集器 + * 根据配置适配收集器 */ - List get(Date startDate, Date endDate, long pageNum, long pageSize); + List list(Date startDate, Date endDate, int pageNum, int pageSize); } diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java index 9bc6a82..90969e4 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java @@ -48,8 +48,8 @@ public class TBasicHttpCollectJob extends AbstractCollectJob { @SuppressWarnings("unchecked") @Override - public List execute(Date startDate, Date endDate, long pageNum, long pageSize) { + public List execute(Date startDate, Date endDate, int pageNum, int pageSize) { //需要根据不同医院去解析不同的内容。使用接口实现的方式。 - return collector.get(startDate, endDate, pageNum, pageSize); + return collector.list(startDate, endDate, pageNum, pageSize); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java index a689ef3..85e723f 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java @@ -46,7 +46,7 @@ public class TBasicViewCollectJob extends AbstractCollectJob { @SuppressWarnings("unchecked") @Override - public List execute(Date startDate, Date endDate, long pageNum, long pageSize) { + public List execute(Date startDate, Date endDate, int pageNum, int pageSize) { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 return hisService.getTBasicListView(startDate, endDate, pageNum, pageSize); } diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java index 11649fb..bffb113 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java @@ -46,8 +46,8 @@ public class TBasicWsCollectJob extends AbstractCollectJob { @SuppressWarnings("unchecked") @Override - public List execute(Date startDate, Date endDate, long pageNum, long pageSize) { + public List execute(Date startDate, Date endDate, int pageNum, int pageSize) { //需要根据不同医院去解析不同的内容。使用接口实现的方式。 - return collector.get(startDate, endDate, pageNum, pageSize); + return collector.list(startDate, endDate, pageNum, pageSize); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java index 16f9fe1..4598196 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java @@ -47,7 +47,7 @@ public class DeptHttpCollectJob extends AbstractCollectJob { @SuppressWarnings("unchecked") @Override - public List execute(Date startDate, Date endDate, long pageNum, long pageSize) { - return collector.get(startDate, endDate, pageNum, pageSize); + public List execute(Date startDate, Date endDate, int pageNum, int pageSize) { + return collector.list(startDate, endDate, pageNum, pageSize); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java index e3d5561..c730bd6 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java @@ -46,7 +46,7 @@ public class DeptViewCollectJob extends AbstractCollectJob { @SuppressWarnings("unchecked") @Override - public List execute(Date startDate, Date endDate, long pageNum, long pageSize) { + public List execute(Date startDate, Date endDate, int pageNum, int pageSize) { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 return hisService.getDeptListView(startDate, endDate, pageNum, pageSize); } diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java index e37d231..c437782 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java @@ -46,8 +46,8 @@ public class DeptWsCollectJob extends AbstractCollectJob { @SuppressWarnings("unchecked") @Override - public List execute(Date startDate, Date endDate, long pageNum, long pageSize) { + public List execute(Date startDate, Date endDate, int pageNum, int pageSize) { //需要根据不同医院去解析不同的内容。使用接口实现的方式。 - return collector.get(startDate, endDate, pageNum, pageSize); + return collector.list(startDate, endDate, pageNum, pageSize); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java index 11181a7..c8342fb 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java @@ -46,8 +46,8 @@ public class UserHttpCollectJob extends AbstractCollectJob { @SuppressWarnings("unchecked") @Override - public List execute(Date startDate, Date endDate, long pageNum, long pageSize) { + public List execute(Date startDate, Date endDate, int pageNum, int pageSize) { //需要根据不同医院去解析不同的内容。使用接口实现的方式。 - return collector.get(startDate, endDate, pageNum, pageSize); + return collector.list(startDate, endDate, pageNum, pageSize); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java index 3ee6317..370e49b 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java @@ -46,7 +46,7 @@ public class UserViewCollectJob extends AbstractCollectJob { } @Override - public List execute(Date startDate, Date endDate, long pageNum, long pageSize) { + public List execute(Date startDate, Date endDate, int pageNum, int pageSize) { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 return hisService.getUserListView(startDate, endDate, pageNum, pageSize); } diff --git a/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java index 9aee1b3..5c453f0 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java @@ -46,8 +46,8 @@ public class UserWsCollectJob extends AbstractCollectJob { @SuppressWarnings("unchecked") @Override - public List execute(Date startDate, Date endDate, long pageNum, long pageSize) { + public List execute(Date startDate, Date endDate, int pageNum, int pageSize) { //需要根据不同医院去解析不同的内容。使用接口实现的方式。 - return collector.get(startDate, endDate, pageNum, pageSize); + return collector.list(startDate, endDate, pageNum, pageSize); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/domain/TaskConfig.java b/common-collect/src/main/java/com/docus/server/collect/web/domain/TaskConfig.java index 4774b22..41cc98a 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/domain/TaskConfig.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/domain/TaskConfig.java @@ -45,7 +45,7 @@ public class TaskConfig { /** * 每页大小 */ - private Long pageSize; + private int pageSize; /** * 时间分割周期，把起始时间结束时间进行分割，单位为秒 diff --git a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java index 9994956..a683a1e 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java @@ -74,5 +74,5 @@ public abstract class AbstractCollectJob implements IJob { public abstract void batchInsertOrUpdate(List t); - public abstract List execute(Date startDate, Date endDate, long pageNum, long pageSize); + public abstract List execute(Date startDate, Date endDate, int pageNum, int pageSize); } diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java index 23ebc83..0aac326 100644 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java +++ b/his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java @@ -16,18 +16,17 @@ import java.util.List; @AllArgsConstructor public class HisSysDao { - private final HisDeptMapper hisDeptMapper; private final HisUserMapper hisUserMapper; private final HisTBasicMapper hisTBasicMapper; - public List getDeptListView(Date startDate, Date endDate, long pageNum, long pageSize) { + public List getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize) { return hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); } - public List getUserListView(Date startDate, Date endDate, long pageNum, long pageSize) { + public List getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) { return hisUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); } @@ -35,7 +34,7 @@ public class HisSysDao { } - public List getTBasicListView(Date startDate, Date endDate, long pageNum, long pageSize) { + public List getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize) { return hisTBasicMapper.getTBasicListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); } } diff --git a/his-sysem/src/main/java/com/docus/server/his/service/IHisService.java b/his-sysem/src/main/java/com/docus/server/his/service/IHisService.java index 15a3939..ec5ff1e 100644 --- a/his-sysem/src/main/java/com/docus/server/his/service/IHisService.java +++ b/his-sysem/src/main/java/com/docus/server/his/service/IHisService.java @@ -8,9 +8,9 @@ import java.util.Date; import java.util.List; public interface IHisService { - List getDeptListView(Date startDate, Date endDate, long pageNum, long pageSize); + List getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize); - List getUserListView(Date startDate, Date endDate, long pageNum, long pageSize); + List getUserListView(Date startDate, Date endDate, int pageNum, int pageSize); - List getTBasicListView(Date startDate, Date endDate, long pageNum, long pageSize); + List getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize); } diff --git a/his-sysem/src/main/java/com/docus/server/his/service/impl/HisService.java b/his-sysem/src/main/java/com/docus/server/his/service/impl/HisService.java index 2fee659..ceadf74 100644 --- a/his-sysem/src/main/java/com/docus/server/his/service/impl/HisService.java +++ b/his-sysem/src/main/java/com/docus/server/his/service/impl/HisService.java @@ -18,17 +18,17 @@ public class HisService implements IHisService { private final HisSysDao hisSysDao; @Override - public List getDeptListView(Date startDate, Date endDate, long pageNum, long pageSize) { + public List getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize) { return hisSysDao.getDeptListView(startDate, endDate, pageNum, pageSize); } @Override - public List getUserListView(Date startDate, Date endDate, long pageNum, long pageSize) { + public List getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) { return hisSysDao.getUserListView(startDate, endDate, pageNum, pageSize); } @Override - public List getTBasicListView(Date startDate, Date endDate, long pageNum, long pageSize) { + public List getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize) { return hisSysDao.getTBasicListView(startDate, endDate, pageNum, pageSize); }