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 82cd418..0c80522 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 @@ -15,7 +15,7 @@ import java.util.List; @Component("httpTBasicCollectorImpl") public class HttpTBasicCollectorImpl extends AbstractHttpCollector { @Override - public List list(PeriodTime periodTime, TaskConfig taskConfig) { + public List page(PeriodTime periodTime, TaskConfig taskConfig) { TBasicDTO deptDTO = new TBasicDTO(); TBasicDTO deptDTO1 = new TBasicDTO(); 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 4b8c33f..7d941f1 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 @@ -16,7 +16,7 @@ import java.util.List; public class WsBasicCollectorImpl extends AbstractWsCollector { @Override - public List list(PeriodTime periodTime, TaskConfig taskConfig) { + public List page(PeriodTime periodTime, TaskConfig taskConfig) { 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 141a09b..fd8d7ff 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 @@ -13,7 +13,7 @@ import java.util.List; public class HttpDeptCollectorImpl extends AbstractHttpCollector { @Override - public List list(PeriodTime periodTime, TaskConfig taskConfig) { + public List page(PeriodTime periodTime, TaskConfig taskConfig) { DeptDTO deptDTO = new DeptDTO(); deptDTO.setAuthorId("1"); deptDTO.setAuthorName("admin"); 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 ed8d56e..45584b4 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 @@ -15,7 +15,7 @@ import java.util.List; @Component("wsDeptCollectorImpl") public class WsDeptCollectorImpl extends AbstractWsCollector { @Override - public List list(PeriodTime periodTime, TaskConfig taskConfig) { + public List page(PeriodTime periodTime, TaskConfig taskConfig) { DeptDTO deptDTO = new DeptDTO(); deptDTO.setAuthorId("1"); deptDTO.setAuthorName("admin"); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/AbstractNoViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/AbstractNoViewJobResultImpl.java index 8831d96..26632cc 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/AbstractNoViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/AbstractNoViewJobResultImpl.java @@ -18,4 +18,8 @@ public abstract class AbstractNoViewJobResultImpl implements IJobResult { return null; } + @Override + public void handle(T results, String param) { + + } } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefJobNoViewCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefJobNoViewCollectorImpl.java index 81c478c..c2eb552 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefJobNoViewCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefJobNoViewCollectorImpl.java @@ -1,10 +1,13 @@ package com.docus.server.collect.report.noview; +import com.docus.core.util.Func; +import com.docus.core.util.json.JSON; import com.docus.server.collect.AbstractJobCollector; +import com.docus.server.collect.web.common.dto.NoViewCollectionDto; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.enums.QueryWayEnum; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.common.util.ParamsUtils; +import com.docus.server.common.util.MapObjUtil; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -16,10 +19,18 @@ public class DefJobNoViewCollectorImpl extends AbstractJobCollector> { @Override - public List> list(PeriodTime periodTime, TaskConfig taskConfig) { + public List> page(PeriodTime periodTime, TaskConfig taskConfig) { + + NoViewCollectionDto noViewCollectionDto = JSON.fromJSON(taskConfig.getParam(), NoViewCollectionDto.class); + noViewCollectionDto.setStartTime(Func.format(periodTime.getPeriodStartDate(), "yyyy-MM-dd HH:mm:ss")); + noViewCollectionDto.setEndTime(Func.format(periodTime.getPeriodEndDate(), "yyyy-MM-dd HH:mm:ss")); + noViewCollectionDto.setOffset(taskConfig.getOffset()); + noViewCollectionDto.setPageSize(taskConfig.getPageSize()); + + int queryway = noViewCollectionDto.getQueryway(); + List> results = new ArrayList<>(); - Map param = ParamsUtils.addParam("periodTime", periodTime).addParam("taskConfig", taskConfig).param(); - int queryway = taskConfig.getQueryway(); + Map param = MapObjUtil.object2Map(noViewCollectionDto); if (queryway == QueryWayEnum.outtime.value()) { results = basicService.getBasicOutData(param); } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java index 13db12b..772a442 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java @@ -2,18 +2,16 @@ package com.docus.server.collect.report.noview; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.docus.core.util.Func; -import com.docus.log.context.TrackHelper; import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; import com.docus.server.archivefile.service.IAfCollectSysDictionary; import com.docus.server.collect.web.common.DocusProperties; import com.docus.server.collect.web.common.NoViewChNewbornProperties; import com.docus.server.collect.web.common.NoViewProperties; +import com.docus.server.collect.web.common.dto.NoViewCollectionDto; import com.docus.server.collect.web.common.dto.NoViewConfig; import com.docus.server.collect.web.common.dto.ViewReportTwoDto; -import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.enums.DisposeModeEnum; import com.docus.server.collect.web.enums.HospitalEnum; import com.docus.server.collect.web.enums.RedisKeyEnum; @@ -40,6 +38,7 @@ import java.util.stream.Collectors; @Slf4j public class DefNoViewJobResultImpl extends AbstractNoViewJobResultImpl>> { + @Resource private NoViewProperties noViewProperties; @Resource @@ -56,35 +55,34 @@ public class DefNoViewJobResultImpl MqQueueUtils mqQueueUtils; @Override - public void handle(List> results, String dsKey) { + public void handle(List> results, String param) { + super.handle(results, param); - } + NoViewCollectionDto collectionDto = com.docus.core.util.json.JSON.fromJSON(param, NoViewCollectionDto.class); - @Override - public void handle(List> results, Map param) { - Map params = TrackHelper.getParams(); - if (Func.isNull(params)) { + if (Func.isBlank(param)) { return; } - TaskConfig taskConfig = (TaskConfig) params.get("taskConfig"); List list = new ArrayList<>(); for (Map map : results) { ViewReportTwoDto viewReportTwoDto = MapObjUtil.map2ObjectUnderlined(map, ViewReportTwoDto.class); - viewReportTwoDto.setIspriority(taskConfig.getPriority()); + viewReportTwoDto.setIspriority(collectionDto.getPriority()); list.add(viewReportTwoDto); } try { - GenerateQueue(list, taskConfig.getSyscodes()); + GenerateQueue(list, collectionDto); } catch (Exception ex) { - log.error("发送队列信息失败，错误信息：" + ex.getMessage() + "." + JSON.toJSONString(dto)); + log.error("发送队列信息失败，错误信息：" + ex.getMessage() + "." + JSON.toJSONString(collectionDto)); } - TrackHelper.clear(); + } - private void GenerateQueue(List list, String syscodes) { -// List configs = initNoviewConfig(); + private void GenerateQueue(List list, NoViewCollectionDto collectionDto) { + String syscodes = collectionDto.getSyscodes(); + List configs = collectionDto.getNoviewconfig(); + Map queuemerge = collectionDto.getQueuemerge(); List collectsysDictionaries = afCollectSysDictionary.findAll(); if (!StringUtils.isEmpty(syscodes)) { List collectids = Arrays.asList(syscodes.split(",")); @@ -104,7 +102,7 @@ public class DefNoViewJobResultImpl k.setCollectorId(o.getSysCode()); if (docusProperties.getMode().equals(DisposeModeEnum.mq)) { MqMessage mqMessage = new MqMessage(); - String mqKey = String.format("topic_task_%s_queue", getQueueKey(o.getSysCode())); + String mqKey = String.format("topic_task_%s_queue", getQueueKey(o.getSysCode(), queuemerge)); mqQueueUtils.DeclareQueue(mqKey); mqMessage.setMessageBody(JSON.toJSONString(k, SerializerFeature.WriteDateUseDateFormat, SerializerFeature.WriteMapNullValue)); amqpTemplate.convertAndSend("", mqKey, mqMessage); @@ -116,13 +114,11 @@ public class DefNoViewJobResultImpl } } - private static String getQueueKey(String sysCode) { - TableJsonRead tableJsonRead = new TableJsonRead(); - JSONObject read = tableJsonRead.Read("docus", "queuemerge", JSONObject.class); - if (read == null || read.size() <= 0) { + private static String getQueueKey(String sysCode, Map queuemerge) { + if (Func.isNull(queuemerge)) { return sysCode; } - for (Map.Entry merge : read.entrySet()) { + for (Map.Entry merge : queuemerge.entrySet()) { if (Arrays.asList(String.valueOf(merge.getKey()).split(StrUtil.COMMA)).contains(sysCode)) { if (StrUtil.isBlank(String.valueOf(merge.getValue())) || "null".equals(String.valueOf(merge.getValue()))) { return sysCode; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java index 6795d41..c7aef66 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java @@ -35,7 +35,13 @@ import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; @Slf4j @@ -485,8 +491,4 @@ public abstract class AbstractViewJobResultImpl implements IJobResult { return null; } - @Override - public void handle(T results, Map param) { - - } } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/BlViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/BlViewJobResultImpl.java index 8b7bf03..0964662 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/BlViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/BlViewJobResultImpl.java @@ -13,7 +13,7 @@ public class BlViewJobResultImpl extends AbstractViewJobResultImpl>> { @Override - public void handle(List> results, String dsKey) { - super.handle(results, dsKey); + public void handle(List> results, String param) { + super.handle(results, param); } } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/EcgViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/EcgViewJobResultImpl.java index 2d2ef7e..23176dd 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/EcgViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/EcgViewJobResultImpl.java @@ -13,7 +13,7 @@ public class EcgViewJobResultImpl extends AbstractViewJobResultImpl>> { @Override - public void handle(List> results, String dsKey) { - super.handle(results, dsKey); + public void handle(List> results, String param) { + super.handle(results, param); } } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/EmrViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/EmrViewJobResultImpl.java index 413c63d..605328e 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/EmrViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/EmrViewJobResultImpl.java @@ -13,7 +13,7 @@ public class EmrViewJobResultImpl extends AbstractViewJobResultImpl>> { @Override - public void handle(List> results, String dsKey) { - super.handle(results, dsKey); + public void handle(List> results, String param) { + super.handle(results, param); } } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/HlViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/HlViewJobResultImpl.java index ee2d1c0..03624df 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/HlViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/HlViewJobResultImpl.java @@ -13,7 +13,7 @@ public class HlViewJobResultImpl extends AbstractViewJobResultImpl>> { @Override - public void handle(List> results, String dsKey) { - super.handle(results, dsKey); + public void handle(List> results, String param) { + super.handle(results, param); } } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/IssubmitViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/IssubmitViewJobResultImpl.java index 29ec7b5..164d75f 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/IssubmitViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/IssubmitViewJobResultImpl.java @@ -13,7 +13,7 @@ public class IssubmitViewJobResultImpl extends AbstractViewJobResultImpl>> { @Override - public void handle(List> results, String dsKey) { - super.handle(results, dsKey); + public void handle(List> results, String param) { + super.handle(results, param); } } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/LisViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/LisViewJobResultImpl.java index b30d8db..e228ef0 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/LisViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/LisViewJobResultImpl.java @@ -13,7 +13,7 @@ public class LisViewJobResultImpl extends AbstractViewJobResultImpl>> { @Override - public void handle(List> results, String dsKey) { - super.handle(results, dsKey); + public void handle(List> results, String param) { + super.handle(results, param); } } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/PacsViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/PacsViewJobResultImpl.java index e967325..a11f4ad 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/PacsViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/PacsViewJobResultImpl.java @@ -13,7 +13,7 @@ public class PacsViewJobResultImpl extends AbstractViewJobResultImpl>> { @Override - public void handle(List> results, String dsKey) { - super.handle(results, dsKey); + public void handle(List> results, String param) { + super.handle(results, param); } } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/VteViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/VteViewJobResultImpl.java index 1d36c1a..c7a3434 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/VteViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/VteViewJobResultImpl.java @@ -13,7 +13,7 @@ public class VteViewJobResultImpl extends AbstractViewJobResultImpl>> { @Override - public void handle(List> results, String dsKey) { - super.handle(results, dsKey); + public void handle(List> results, String param) { + super.handle(results, param); } } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/ZzViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/ZzViewJobResultImpl.java index daa190d..95ece71 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/ZzViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/ZzViewJobResultImpl.java @@ -13,7 +13,7 @@ public class ZzViewJobResultImpl extends AbstractViewJobResultImpl>> { @Override - public void handle(List> results, String dsKey) { - super.handle(results, dsKey); + public void handle(List> results, String param) { + super.handle(results, param); } } 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 c5e3b34..90e4589 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 @@ -15,7 +15,7 @@ import java.util.List; @Component("httpUserCollectorImpl") public class HttpUserCollectorImpl extends AbstractHttpCollector { @Override - public List list(PeriodTime periodTime, TaskConfig taskConfig) { + public List page(PeriodTime periodTime, TaskConfig taskConfig) { UserDTO deptDTO = new UserDTO(); deptDTO.setAuthorId("1"); deptDTO.setAuthorName("admin"); 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 9e518c1..a9f02fc 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 @@ -15,7 +15,7 @@ import java.util.List; @Component("wsUserCollectorImpl") public class WsUserCollectorImpl extends AbstractWsCollector { @Override - public List list(PeriodTime periodTime, TaskConfig taskConfig) { + public List page(PeriodTime periodTime, TaskConfig taskConfig) { UserDTO deptDTO = new UserDTO(); deptDTO.setAuthorId("1"); deptDTO.setAuthorName("admin"); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/NoViewCollectionDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/NoViewCollectionDto.java index 7abbcae..4c62215 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/NoViewCollectionDto.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/NoViewCollectionDto.java @@ -3,6 +3,9 @@ package com.docus.server.collect.web.common.dto; import lombok.Getter; import lombok.Setter; +import java.util.List; +import java.util.Map; + @Getter @Setter public class NoViewCollectionDto { @@ -18,16 +21,20 @@ public class NoViewCollectionDto { /** * 查询条件 */ - private String where=""; - private Integer interval=5; + private String where = ""; + private Integer interval = 5; /** * 0：不计算节假日,1:计算节假日 */ - private Integer holiday=0; + private Integer holiday = 0; /** * 页数，从0开始 */ - private int pageNumber=0; + private int offset; + /** + * 页数，从0开始 + */ + private int pageNumber = 0; /** * 笔数 */ @@ -36,31 +43,41 @@ public class NoViewCollectionDto { /** * 采集器ids,以 , 分隔 */ - private String syscodes=""; + private String syscodes = ""; /** * 数据查询方式, 0:出院，1:创建时间 */ - private int queryway=0; + private int queryway = 0; /** * 此任务优先级优先级 */ - private int priority=1; + private int priority = 1; + + /** + * 指定队列，指定科室，具体业务 + */ + List noviewconfig; + + /** + * 合并队列，具体业务 + */ + private Map queuemerge; @Override public String toString() { return "NoViewCollectionDto{" + - "startTime='" + startTime + '\'' + - ", endTime='" + endTime + '\'' + - ", where='" + where + '\'' + - ", interval=" + interval + - ", holiday=" + holiday + - ", pageNumber=" + pageNumber + - ", pageSize=" + pageSize + - ", syscodes='" + syscodes + '\'' + - ", queryway=" + queryway + - ", priority=" + priority + - '}'; + "startTime='" + startTime + '\'' + + ", endTime='" + endTime + '\'' + + ", where='" + where + '\'' + + ", interval=" + interval + + ", holiday=" + holiday + + ", pageNumber=" + pageNumber + + ", pageSize=" + pageSize + + ", syscodes='" + syscodes + '\'' + + ", queryway=" + queryway + + ", priority=" + priority + + '}'; } } diff --git a/collect-sdry/src/main/resources/bootstrap.yml b/collect-sdry/src/main/resources/bootstrap.yml index ddbeaef..8dc13b0 100644 --- a/collect-sdry/src/main/resources/bootstrap.yml +++ b/collect-sdry/src/main/resources/bootstrap.yml @@ -13,92 +13,92 @@ spring: #公司病案的文件服务数据库 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 #公司病案的系统服务数据库 system: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_system?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 #公司病案的基础服务数据库 record: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_medicalrecord?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 + password: root@123456 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #病理数据 bl: 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 + password: root@123456 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #电生理系统数据 ecg: 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 + password: root@123456 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #电子病历系统数据 emr: 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 + password: root@123456 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #护理文书系统数据 hl: 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 + password: root@123456 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #手麻系统数据 issubmit: 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 + password: root@123456 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #lis系统数据 lis: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/lis?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root + password: root@123456 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #Pacs系统数据视图 pacs: 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 + password: root@123456 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #vte静脉血栓栓塞症 vte: 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 + password: root@123456 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #重症系统数据 zz: 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 + password: root@123456 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource # rabbitmq: @@ -108,7 +108,7 @@ spring: # password: guest redis: host: redis.docus.cn - # password: JSdocus@702 + password: JSdocus@702 cloud: nacos: discovery: 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 b6a42b0..c7bbac5 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 @@ -13,5 +13,5 @@ public interface ICollector { * @param taskConfig 任务配置 * @return */ - List list(PeriodTime periodTime, TaskConfig taskConfig); + List page(PeriodTime periodTime, TaskConfig taskConfig); } diff --git a/common-collect/src/main/java/com/docus/server/collect/IJob.java b/common-collect/src/main/java/com/docus/server/collect/IJob.java index 382f604..845f909 100644 --- a/common-collect/src/main/java/com/docus/server/collect/IJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/IJob.java @@ -18,6 +18,6 @@ public interface IJob { /** * 根据配置获取数据 */ - void get(PeriodTime periodTime, TaskConfig taskConfig); + void page(PeriodTime periodTime, TaskConfig taskConfig); } diff --git a/common-collect/src/main/java/com/docus/server/collect/IJobResult.java b/common-collect/src/main/java/com/docus/server/collect/IJobResult.java index e25ab5c..bed320d 100644 --- a/common-collect/src/main/java/com/docus/server/collect/IJobResult.java +++ b/common-collect/src/main/java/com/docus/server/collect/IJobResult.java @@ -1,7 +1,5 @@ package com.docus.server.collect; -import java.util.Map; - /** * @author linruifeng * @date 2023/6/14 14:27 @@ -9,19 +7,10 @@ import java.util.Map; public interface IJobResult extends IResult { /** - * 有视图job主动返回结果 - * - * @param results 分页查询表数据 - * @param dsKey 数据源key - */ - void handle(T results, String dsKey); - - - /** - * 无视图job主动返回结果 + * job主动返回结果 * * @param results 分页查询表数据 * @param param 参数 */ - void handle(T results, Map param); + void handle(T results, String param); } 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 5fbb6ed..71c18ed 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 @@ -40,7 +40,7 @@ public class TBasicHttpCollectJob extends AbstractCollectJob { @Override - public void doHandle(List results) { + public void doHandle(List results, String param) { basicService.batchSaveBasics(results); } @@ -48,6 +48,6 @@ public class TBasicHttpCollectJob extends AbstractCollectJob { @Override public List execute(PeriodTime periodTime, TaskConfig taskConfig) { //需要根据不同医院去解析不同的内容。使用接口实现的方式。 - return collector.list(periodTime, taskConfig); + return collector.page(periodTime, taskConfig); } } 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 15ca87f..6da1074 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 @@ -41,7 +41,7 @@ public class TBasicViewCollectJob extends AbstractCollectJob { } @Override - public void doHandle(List results) { + public void doHandle(List results,String param) { basicService.batchSaveBasics(results); } 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 cd37423..68e98b1 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 @@ -39,7 +39,7 @@ public class TBasicWsCollectJob extends AbstractCollectJob { } @Override - public void doHandle(List results) { + public void doHandle(List results, String param) { basicService.batchSaveBasics(results); } @@ -47,7 +47,7 @@ public class TBasicWsCollectJob extends AbstractCollectJob { @Override public List execute(PeriodTime periodTime, TaskConfig taskConfig) { //需要根据不同医院去解析不同的内容。使用接口实现的方式。 - return collector.list(periodTime, taskConfig); + return collector.page(periodTime, taskConfig); } } 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 72e97d9..bd4e663 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 @@ -40,13 +40,13 @@ public class DeptHttpCollectJob extends AbstractCollectJob { } @Override - public void doHandle(List results) { + public void doHandle(List results, String param) { deptService.batchInsertOrUpdatePowerDept(results); } @SuppressWarnings("unchecked") @Override public List execute(PeriodTime periodTime, TaskConfig taskConfig) { - return collector.list(periodTime, taskConfig); + return collector.page(periodTime, taskConfig); } } 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 14bf0b3..cadac76 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 @@ -43,7 +43,7 @@ public class DeptViewCollectJob extends AbstractCollectJob { } @Override - public void doHandle(List results) { + public void doHandle(List results, String param) { deptService.batchInsertOrUpdatePowerDept(results); } 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 7a062e9..9444af1 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 @@ -39,7 +39,7 @@ public class DeptWsCollectJob extends AbstractCollectJob { } @Override - public void doHandle(List results) { + public void doHandle(List results, String param) { deptService.batchInsertOrUpdatePowerDept(results); } @@ -47,6 +47,6 @@ public class DeptWsCollectJob extends AbstractCollectJob { @Override public List execute(PeriodTime periodTime, TaskConfig taskConfig) { //需要根据不同医院去解析不同的内容。使用接口实现的方式。 - return collector.list(periodTime, taskConfig); + return collector.page(periodTime, taskConfig); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/noview/DefNoViewCollectionJob.java b/common-collect/src/main/java/com/docus/server/collect/report/noview/DefNoViewCollectionJob.java index dae7ead..d7ce92e 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/noview/DefNoViewCollectionJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/noview/DefNoViewCollectionJob.java @@ -1,14 +1,11 @@ package com.docus.server.collect.report.noview; -import com.docus.log.context.TrackContext; -import com.docus.log.context.TrackHelper; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.common.util.ParamsUtils; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -43,7 +40,7 @@ public class DefNoViewCollectionJob extends AbstractCollectJob> results) { - jobResult.handle(results, TrackHelper.getParams()); + public void doHandle(List> results, String param) { + jobResult.handle(results, param); } @SuppressWarnings("unchecked") @Override public List> execute(PeriodTime periodTime, TaskConfig taskConfig) { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 - TrackContext.init(ParamsUtils.addParam("taskConfig", taskConfig).param()); - return collector.list(periodTime, taskConfig); + return collector.page(periodTime, taskConfig); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java index 58f9125..a7b859e 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java @@ -1,5 +1,6 @@ package com.docus.server.collect.report.view; +import com.docus.server.bl.common.DSKeyConstants; import com.docus.server.bl.service.IBlService; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; @@ -7,7 +8,6 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.lis.common.DSKeyConstants; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -48,7 +48,7 @@ public class BlViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override - public void doHandle(List> results) { + public void doHandle(List> results, String param) { jobResult.handle(results, DSKeyConstants.DS_KEY); } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java index 08a4835..025acbd 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java @@ -6,8 +6,8 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.ecg.common.DSKeyConstants; import com.docus.server.ecg.service.IEcgService; -import com.docus.server.lis.common.DSKeyConstants; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -48,7 +48,7 @@ public class EcgViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override - public void doHandle(List> results) { + public void doHandle(List> results, String param) { jobResult.handle(results, DSKeyConstants.DS_KEY); } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java index 7e6f0d9..bed0aac 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java @@ -6,8 +6,8 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.emr.common.DSKeyConstants; import com.docus.server.emr.service.IEmrService; -import com.docus.server.lis.common.DSKeyConstants; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -48,7 +48,7 @@ public class EmrViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override - public void doHandle(List> results) { + public void doHandle(List> results, String param) { jobResult.handle(results, DSKeyConstants.DS_KEY); } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java index 998d2b8..accfcc1 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java @@ -6,8 +6,8 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.hl.common.DSKeyConstants; import com.docus.server.hl.service.IHlService; -import com.docus.server.lis.common.DSKeyConstants; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -48,10 +48,9 @@ public class HlViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override - public void doHandle(List> results) { + public void doHandle(List> results, String param) { jobResult.handle(results, DSKeyConstants.DS_KEY); } - @Override public List> execute(PeriodTime periodTime, TaskConfig taskConfig) { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java index 879aae7..f70c287 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java @@ -6,8 +6,8 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; +import com.docus.server.issubmit.common.DSKeyConstants; import com.docus.server.issubmit.service.IIssubmitService; -import com.docus.server.lis.common.DSKeyConstants; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -48,10 +48,9 @@ public class IssubmitViewCollectJob extends AbstractCollectJob> results) { + public void doHandle(List> results, String param) { jobResult.handle(results, DSKeyConstants.DS_KEY); } - @Override public List> execute(PeriodTime periodTime, TaskConfig taskConfig) { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java index d4d80da..4419193 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java @@ -48,7 +48,7 @@ public class LisViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override - public void doHandle(List> results) { + public void doHandle(List> results, String param) { jobResult.handle(results, DSKeyConstants.DS_KEY); } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java index 7627c2c..04f4f7b 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java @@ -6,7 +6,7 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.lis.common.DSKeyConstants; +import com.docus.server.pacs.common.DSKeyConstants; import com.docus.server.pacs.service.IPacsService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -48,10 +48,9 @@ public class PacsViewCollectJob extends AbstractCollectJob> @SuppressWarnings("unchecked") @Override - public void doHandle(List> results) { + public void doHandle(List> results, String param) { jobResult.handle(results, DSKeyConstants.DS_KEY); } - @Override public List> execute(PeriodTime periodTime, TaskConfig taskConfig) { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java index 2f90847..df57654 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java @@ -6,7 +6,7 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.lis.common.DSKeyConstants; +import com.docus.server.vte.common.DSKeyConstants; import com.docus.server.vte.service.IVteService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -48,10 +48,9 @@ public class VteViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override - public void doHandle(List> results) { + public void doHandle(List> results, String param) { jobResult.handle(results, DSKeyConstants.DS_KEY); } - @Override public List> execute(PeriodTime periodTime, TaskConfig taskConfig) { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java index 6797660..e9ef3ac 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java @@ -6,7 +6,7 @@ import com.docus.server.collect.IJobResult; import com.docus.server.collect.web.common.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.collect.web.utils.PeriodTime; -import com.docus.server.lis.common.DSKeyConstants; +import com.docus.server.zz.common.DSKeyConstants; import com.docus.server.zz.service.IZzService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -48,7 +48,7 @@ public class ZzViewCollectJob extends AbstractCollectJob> { @SuppressWarnings("unchecked") @Override - public void doHandle(List> results) { + public void doHandle(List> results, String param) { jobResult.handle(results, DSKeyConstants.DS_KEY); } 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 6c1cff8..8e8e776 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 @@ -39,7 +39,7 @@ public class UserHttpCollectJob extends AbstractCollectJob { } @Override - public void doHandle(List results) { + public void doHandle(List results,String param) { userService.batchInsertOrUpdatePowerUser(results); } @@ -47,6 +47,6 @@ public class UserHttpCollectJob extends AbstractCollectJob { @Override public List execute(PeriodTime periodTime, TaskConfig taskConfig) { //需要根据不同医院去解析不同的内容。使用接口实现的方式。 - return collector.list(periodTime, taskConfig); + return collector.page(periodTime, taskConfig); } } 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 9df559f..246f5d5 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 @@ -49,7 +49,7 @@ public class UserViewCollectJob extends AbstractCollectJob { } @Override - public void doHandle(List results) { + public void doHandle(List results, String param) { //docus-BasicDataReceive同步user逻辑 Collection userNames = ListUtils.distinctSelect(results, UserDTO::getUserName); List powerUsers = userService.findByList("userName", userNames); 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 7978908..9b8fe8f 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 @@ -39,7 +39,7 @@ public class UserWsCollectJob extends AbstractCollectJob { } @Override - public void doHandle(List results) { + public void doHandle(List results, String param) { userService.batchInsertOrUpdatePowerUser(results); } @@ -47,6 +47,6 @@ public class UserWsCollectJob extends AbstractCollectJob { @Override public List execute(PeriodTime periodTime, TaskConfig taskConfig) { //需要根据不同医院去解析不同的内容。使用接口实现的方式。 - return collector.list(periodTime, taskConfig); + return collector.page(periodTime, taskConfig); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java b/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java index 234d227..fb44ade 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java @@ -63,38 +63,14 @@ public class TaskConfig { */ private Long spiltPeriod; - /** * 指针时间，当前增量任务的执行到的时间 */ private Date incPointerTime; /** - * 查询条件 - */ - private String where = ""; - /** - * 间隔 - */ - private Integer interval = 5; - /** - * 0：不计算节假日,1:计算节假日 - */ - private Integer holiday = 0; - /** - * 采集器ids,以 , 分隔 + * 任务其他参数配置 */ - private String syscodes = ""; - - /** - * 数据查询方式, 0:出院，1:创建时间 - */ - private int queryway = 0; - - /** - * 此任务优先级优先级 - */ - private int priority = 1; - + private String param; /** * 执行状态 */ 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 c7869bf..7ddcddc 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 @@ -41,11 +41,13 @@ public abstract class AbstractCollectJob implements IJob { @Override public void startCollectAll(String taskConfigId) { TaskConfig taskConfig = getTaskConfig(taskConfigId); - try { List periodTimes = taskConfig.getAllPeriodTimes(); + for (PeriodTime periodTime : periodTimes) { - get(periodTime, taskConfig); + + page(periodTime, taskConfig); + taskConfigService.updateAllPointerDate(taskConfigId, periodTime.getPeriodEndDate()); } } catch (Exception ex) { @@ -53,39 +55,39 @@ public abstract class AbstractCollectJob implements IJob { updateTaskState(ex.getMessage(), taskConfig); } - if (StateEnum.FAIL.equals(taskConfig.getState())) { - updateTaskState(taskConfig); - } + refreshTaskState(taskConfig); } @Override public void startCollectIncrement(String taskConfigId) { TaskConfig taskConfig = getTaskConfig(taskConfigId); - try { + try { List periodTimes = taskConfig.getIncPeriodTimes(); - periodTimes.forEach(periodTime -> { - get(periodTime, taskConfig); - taskConfigService.updateIncPointerDate(taskConfigId, periodTime.getPeriodEndDate()); - }); + for (PeriodTime periodTime : periodTimes) { + + page(periodTime, taskConfig); + + taskConfigService.updateIncPointerDate(taskConfigId, periodTime.getPeriodEndDate()); + } } catch (Exception ex) { log.error(ex.getMessage(), ex); updateTaskState(ex.getMessage(), taskConfig); } - if (StateEnum.FAIL.equals(taskConfig.getState())) { - updateTaskState(taskConfig); - } + refreshTaskState(taskConfig); } @Override - public void get(PeriodTime periodTime, TaskConfig taskConfig) { + public void page(PeriodTime periodTime, TaskConfig taskConfig) { //考虑到性能，应该把起始时间和结束时间进行切割拆分到每天。按段查询。 List results; + int pageNum = 1; + for (; true; pageNum++) { taskConfig.setPageNum(pageNum); @@ -99,14 +101,22 @@ public abstract class AbstractCollectJob implements IJob { } log.info("本次采集：" + results.size() + "笔" + taskConfig.getType()); - doHandle(results); + + doHandle(results, taskConfig.getParam()); } } - public abstract void doHandle(List results); + public abstract void doHandle(List results, String param); public abstract List execute(PeriodTime periodTime, TaskConfig taskConfig); + + private void refreshTaskState(TaskConfig taskConfig) { + if (StateEnum.FAIL.equals(taskConfig.getState())) { + updateTaskState(taskConfig); + } + } + private void updateTaskState(TaskConfig taskConfig) { taskConfig.setState(StateEnum.OK); taskConfigService.updateById(taskConfig); diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java index bc1f812..0b7be2f 100644 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java +++ b/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java @@ -4,7 +4,9 @@ import com.docus.server.archivefile.mapper.AfCollectSysDictionaryMapper; import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; import com.docus.server.archivefile.service.IAfCollectSysDictionary; import com.docus.server.common.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; +@Service public class AfCollectSysDictionaryImpl extends BaseServiceImpl implements IAfCollectSysDictionary { } diff --git a/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml b/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml index c351053..0fafbc1 100644 --- a/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml +++ b/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml @@ -198,16 +198,16 @@ AND dis_date IS NOT NULL AND dis_date != '1801-02-03 00:00:00' AND is_cancel = 0 - - AND dis_date = ]]> #{param.periodTime.periodStartDate} + + AND dis_date = ]]> #{param.startTime} - - AND dis_date #{param.periodTime.periodEndDate} + + AND dis_date #{param.endTime} - - AND #{param.taskConfig.where} + + AND #{param.where} - LIMIT #{param.taskConfig.offset}, #{param.taskConfig.pageSize} + LIMIT #{param.offset}, #{param.pageSize}