From eb08b033deaa811317b8f70e705d3ec51ebe13ee Mon Sep 17 00:00:00 2001 From: linrf Date: Thu, 15 Jun 2023 17:38:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9baseservice=E7=9A=84collectio?= =?UTF-8?q?n<=3F>=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/docus/server/AppRunBootstrap.java | 1 + .../report/view/BaseViewJobResultImpl.java | 36 ++++++++++++------- .../common/consumer/handle/Invoker.java | 9 ----- .../server/common/service/IBaseService.java | 4 +-- .../common/service/impl/BaseServiceImpl.java | 10 ++++-- .../record/common/pojo/entity/TBasic.java | 2 ++ 6 files changed, 35 insertions(+), 27 deletions(-) diff --git a/collect-sdry/src/main/java/com/docus/server/AppRunBootstrap.java b/collect-sdry/src/main/java/com/docus/server/AppRunBootstrap.java index 4a4ed0e..9a711e5 100644 --- a/collect-sdry/src/main/java/com/docus/server/AppRunBootstrap.java +++ b/collect-sdry/src/main/java/com/docus/server/AppRunBootstrap.java @@ -16,6 +16,7 @@ import org.springframework.retry.annotation.EnableRetry; @SpringBootApplication(scanBasePackages = {"com.docus"}) @EnableRetry @EnableTrackGroup +//@EnableRabbit public class AppRunBootstrap { public static void main(String[] args) { System.setProperty("javax.xml.parsers.DocumentBuilderFactory", "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/BaseViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/BaseViewJobResultImpl.java index 5311852..7432938 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/BaseViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/BaseViewJobResultImpl.java @@ -23,6 +23,8 @@ import com.docus.server.collect.web.utils.RedisMq; import com.docus.server.collect.web.utils.SpringRestTemplateUtils; import com.docus.server.common.message.MqMessage; import com.docus.server.common.util.SpringUtils; +import com.docus.server.record.common.pojo.entity.TBasic; +import com.docus.server.record.service.ITBasicService; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; @@ -62,6 +64,8 @@ public abstract class BaseViewJobResultImpl implements IJobResult> getBasicForZYHs(List zyhs) { - List> datas = new ArrayList<>(); - String url = String.format("http://localhost:%s", getPort()); - String requstParam = JSON.toJSONString(zyhs); - String sendPost = SpringRestTemplateUtils.getInstance().sendPost(url + "/api/conllection/getBasicForZYHs", requstParam, MediaType.APPLICATION_JSON, null, true); - ObjectMapper objectMapper = new ObjectMapper(); - try { - datas = objectMapper.readValue(sendPost, new TypeReference>>() { - }); - } catch (Exception ex) { - log.error("解析失败：" + sendPost); - return null; - } - return datas; + List tBasics = basicService.findByList("inpatientNo", zyhs); + String s = com.docus.core.util.json.JSON.toJSON(tBasics); + return com.docus.core.util.json.JSON.fromJSONWithGeneric(s, new TypeReference>>() { + }); + +// List> datas = new ArrayList<>(); +// String url = String.format("http://localhost:%s", getPort()); +// String requstParam = JSON.toJSONString(zyhs); +// String sendPost = SpringRestTemplateUtils.getInstance().sendPost(url + "/api/conllection/getBasicForZYHs", requstParam, MediaType.APPLICATION_JSON, null, true); +// ObjectMapper objectMapper = new ObjectMapper(); +// try { +// datas = objectMapper.readValue(sendPost, new TypeReference>>() { +// }); +// } catch (Exception ex) { +// log.error("解析失败：" + sendPost); +// return null; +// } +// +// return datas; } /** diff --git a/docus-api-common/src/main/java/com/docus/server/common/consumer/handle/Invoker.java b/docus-api-common/src/main/java/com/docus/server/common/consumer/handle/Invoker.java index 4b1c4bb..5a7ea94 100644 --- a/docus-api-common/src/main/java/com/docus/server/common/consumer/handle/Invoker.java +++ b/docus-api-common/src/main/java/com/docus/server/common/consumer/handle/Invoker.java @@ -30,13 +30,4 @@ public class Invoker { return this.command.execute(messageData); } - public static void main(String[] args) { - Invoker invoker = new Invoker(); - invoker.setCommand(new AbstractCommand() { - @Override - public HandleResult execute(MessageData messageData) { - return null; - } - }); - } } diff --git a/docus-api-common/src/main/java/com/docus/server/common/service/IBaseService.java b/docus-api-common/src/main/java/com/docus/server/common/service/IBaseService.java index 8b2aad5..2c5ccee 100644 --- a/docus-api-common/src/main/java/com/docus/server/common/service/IBaseService.java +++ b/docus-api-common/src/main/java/com/docus/server/common/service/IBaseService.java @@ -15,7 +15,7 @@ public interface IBaseService extends IService { List findBy(String propertyName, Object propertyValue); - List findByList(String propertyName, Collection propertyValue); + List findByList(String propertyName, Collection propertyValue); List findActiveBy(String propertyName, Object propertyValue); @@ -25,7 +25,7 @@ public interface IBaseService extends IService { T findOneBy(String propertyName, Object propertyValue); - T findOneByList(String propertyName, Collection propertyValue); + T findOneByList(String propertyName, Collection propertyValue); T findActiveOneBy(String propertyName, Object propertyValue); diff --git a/docus-api-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java b/docus-api-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java index 7909899..4b18f2c 100644 --- a/docus-api-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java +++ b/docus-api-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java @@ -11,7 +11,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.docus.server.common.service.IBaseService; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Objects; public abstract class BaseServiceImpl, T> extends ServiceImpl implements IBaseService { @@ -44,7 +48,7 @@ public abstract class BaseServiceImpl, T> extends Servic * 按字段查询，返回所有匹配的记录, in */ @Override - public List findByList(String propertyName, Collection propertyValue) { + public List findByList(String propertyName, Collection propertyValue) { String columnName = getColumnName(propertyName); return baseMapper.selectList(new QueryWrapper().in(!Objects.isNull(propertyValue), columnName, propertyValue)); } @@ -86,7 +90,7 @@ public abstract class BaseServiceImpl, T> extends Servic } @Override - public T findOneByList(String propertyName, Collection propertyValue) { + public T findOneByList(String propertyName, Collection propertyValue) { String columnName = getColumnName(propertyName); List list = baseMapper.selectList(new QueryWrapper().eq(!Objects.isNull(propertyValue), columnName, propertyValue)); return (list == null || list.size() == 0) ? null : list.get(0); diff --git a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasic.java b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasic.java index 3a7ca56..b3e86a7 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasic.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/common/pojo/entity/TBasic.java @@ -1,5 +1,6 @@ package com.docus.server.record.common.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -30,6 +31,7 @@ public class TBasic implements Serializable { private Integer admissTimes; @ApiModelProperty(value = "病案号") + @TableField("inpatientNo") private String inpatientNo; @ApiModelProperty(value = "住院ID号")