From 9817cc5d8a65e3c8e9a287eed4986c6574e22cb1 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 3 Mar 2025 11:12:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E7=BB=9C=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceClient/ErpBasicClient.java | 32 +++++++------------ .../serviceClient/ErpInvClient.java | 2 +- .../serviceClient/ErpOrderClient.java | 2 +- .../serviceClient/NmpaUdiClient.java | 17 ++-------- 4 files changed, 17 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/glxp/api/httpClient/serviceClient/ErpBasicClient.java b/src/main/java/com/glxp/api/httpClient/serviceClient/ErpBasicClient.java index ed19871e..f8e2648c 100644 --- a/src/main/java/com/glxp/api/httpClient/serviceClient/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/httpClient/serviceClient/ErpBasicClient.java @@ -1,14 +1,7 @@ package com.glxp.api.httpClient.serviceClient; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.thrsys.*; -import com.glxp.api.httpClient.req.UdiwmsBusTypeRequest; -import com.glxp.api.httpClient.req.UdiwmsUnitRequest; import com.glxp.api.req.basic.YbDrugDetailFilterRequest; import com.glxp.api.req.basic.YbHcflDetailFilterRequest; import com.glxp.api.req.collect.PostCollectOrderRequest; @@ -18,67 +11,66 @@ import com.glxp.api.res.chs.YbHcflEntityResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; import com.glxp.api.res.thrsys.UdiwmsWarehouseDetail; -import org.springframework.beans.BeanUtils; import java.util.List; public interface ErpBasicClient { - public BaseResponse> getErpCrop(ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest); + BaseResponse> getErpCrop(ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest); //获取产品信息 - public BaseResponse> getErpProducts(FilterThrProductsRequest filterThrProductsRequest); + BaseResponse> getErpProducts(FilterThrProductsRequest filterThrProductsRequest); //查询仓库货位号 - public BaseResponse> getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest); + BaseResponse> getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest); //测试连通性 - public BaseResponse testThridConnect(ThrSystemEntity thrSystemEntity); + BaseResponse testThridConnect(ThrSystemEntity thrSystemEntity); //下载第三方系统单据类型 - public BaseResponse> getBusTypes(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest); + BaseResponse> getBusTypes(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest); /** * 医保耗材详情 */ - public BaseResponse> getYbHcflDetail(YbHcflDetailFilterRequest ybHcflDetailFilterRequest); + BaseResponse> getYbHcflDetail(YbHcflDetailFilterRequest ybHcflDetailFilterRequest); /** * 获取往来单位 */ - public BaseResponse> getThrManu(ThrManuFilterRequest thrManuFilterRequest); + BaseResponse> getThrManu(ThrManuFilterRequest thrManuFilterRequest); /** * 通过医保编码获取 药品 信息 * @param ybHcflDetailFilterRequest * @return */ - public BaseResponse> getYbDrugDetail(YbDrugDetailFilterRequest ybHcflDetailFilterRequest); + BaseResponse> getYbDrugDetail(YbDrugDetailFilterRequest ybHcflDetailFilterRequest); /** * 获取 多码融合表 * @param codeRel * @return */ - public BaseResponse> getCodeRelDetail(CodeRel codeRel); + BaseResponse> getCodeRelDetail(CodeRel codeRel); /** * 获取 多码融合表 * @param codeList * @return */ - public BaseResponse checkCode(List codeList); + BaseResponse checkCode(List codeList); /** * 更新 多码融合表 * @param codeRel * @return */ - public BaseResponse updateCodeRelDetail(CodeRel codeRel); + BaseResponse updateCodeRelDetail(CodeRel codeRel); /** * 上传已成功传输医保的完成单据 * @param postCollectOrderRequest * @return */ - public BaseResponse collectOrderUpload(PostCollectOrderRequest postCollectOrderRequest); + BaseResponse collectOrderUpload(PostCollectOrderRequest postCollectOrderRequest); } diff --git a/src/main/java/com/glxp/api/httpClient/serviceClient/ErpInvClient.java b/src/main/java/com/glxp/api/httpClient/serviceClient/ErpInvClient.java index 71e54b5b..6557b825 100644 --- a/src/main/java/com/glxp/api/httpClient/serviceClient/ErpInvClient.java +++ b/src/main/java/com/glxp/api/httpClient/serviceClient/ErpInvClient.java @@ -6,5 +6,5 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrInvProductResponse; public interface ErpInvClient { - public BaseResponse> getInvPrdoductResponse(ThrOnhandRequest onhandRequest, String url); + BaseResponse> getInvPrdoductResponse(ThrOnhandRequest onhandRequest, String url); } diff --git a/src/main/java/com/glxp/api/httpClient/serviceClient/ErpOrderClient.java b/src/main/java/com/glxp/api/httpClient/serviceClient/ErpOrderClient.java index 90643eea..180d6fb3 100644 --- a/src/main/java/com/glxp/api/httpClient/serviceClient/ErpOrderClient.java +++ b/src/main/java/com/glxp/api/httpClient/serviceClient/ErpOrderClient.java @@ -6,5 +6,5 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrOrderResponse; public interface ErpOrderClient { - public BaseResponse> getThrOrderResponse(FilterThrOrderRequest filterOrderRequest); + BaseResponse> getThrOrderResponse(FilterThrOrderRequest filterOrderRequest); } diff --git a/src/main/java/com/glxp/api/httpClient/serviceClient/NmpaUdiClient.java b/src/main/java/com/glxp/api/httpClient/serviceClient/NmpaUdiClient.java index e66aeea3..39285e8c 100644 --- a/src/main/java/com/glxp/api/httpClient/serviceClient/NmpaUdiClient.java +++ b/src/main/java/com/glxp/api/httpClient/serviceClient/NmpaUdiClient.java @@ -1,24 +1,13 @@ package com.glxp.api.httpClient.serviceClient; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; -import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.req.basic.ProductInfoFilterRequest; -import com.glxp.api.util.UuidUtils; - -import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; public interface NmpaUdiClient { + List getUdiByUuid(String uuid); - public List getUdiByUuid(String uuid); - - public List getOrUpdateByUuid(String uuid); + List getOrUpdateByUuid(String uuid); - public List getUdiByDi(String key); + List getUdiByDi(String key); }