From aafe6c1cbbf16cb27bd69491265fce5811da9e37 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 3 Mar 2025 10:26:04 +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 --- .../controller/basic/BasicCorpController.java | 4 +- .../basic/BasicGenExcelService.java | 2 +- .../basic/UdiContrastController.java | 3 +- .../basic/UdiRelevanceController.java | 3 +- .../controller/basic/UdiRlSupController.java | 5 +- .../IoCollectOrderBackupController.java | 3 +- .../controller/sync/SyncDelController.java | 2 +- .../thrsys/ThrBusTypeOriginController.java | 3 +- .../thrsys/ThrCorpExportLogController.java | 3 +- .../controller/thrsys/ThrCorpsController.java | 2 +- .../thrsys/ThrInvProductsController.java | 2 +- .../ThrInvProductsExportLogController.java | 2 +- .../controller/thrsys/ThrManusController.java | 3 +- .../controller/thrsys/ThrOrderController.java | 3 +- .../thrsys/ThrOrderExportLogController.java | 2 +- .../thrsys/ThrProductsAddDiController.java | 8 +-- .../thrsys/ThrProductsController.java | 3 +- .../ThrProductsExportLogController.java | 2 +- .../thrsys/ThrSystemController.java | 3 +- .../{http => httpClient}/ErpBasicClient.java | 49 ++++--------------- .../{http => httpClient}/ErpInvClient.java | 10 +--- .../{http => httpClient}/ErpOrderClient.java | 2 +- .../{http => httpClient}/HttpOkClient.java | 2 +- .../{http => httpClient}/NmpaUdiClient.java | 2 +- .../req/UdiwmsBusTypeRequest.java | 2 +- .../req/UdiwmsUnitRequest.java | 2 +- .../basic/BasicBackUpdateProductService.java | 2 +- .../api/service/basic/UdiContrastService.java | 2 +- .../BasicProductsImportLogServiceImpl.java | 2 +- .../inout/impl/IoOrderServiceImpl.java | 2 +- .../api/service/thrsys/ThrCorpsDlService.java | 6 +-- .../api/service/thrsys/ThrDataService.java | 5 +- .../thrsys/ThrInvProductsDlService.java | 3 +- .../thrsys/ThrManufacturerService.java | 3 +- .../service/thrsys/ThrOrdersDlService.java | 5 +- .../service/thrsys/ThrProductsDlService.java | 4 +- .../service/thrsys/ThrUnitImportService.java | 6 +-- .../api/service/thrsys/YbDrugService.java | 2 +- .../thrsys/impl/ThrDeptServiceImpl.java | 2 +- .../impl/ThrSystemDetailServiceImpl.java | 2 +- 40 files changed, 52 insertions(+), 121 deletions(-) rename src/main/java/com/glxp/api/{http => httpClient}/ErpBasicClient.java (85%) rename src/main/java/com/glxp/api/{http => httpClient}/ErpInvClient.java (85%) rename src/main/java/com/glxp/api/{http => httpClient}/ErpOrderClient.java (99%) rename src/main/java/com/glxp/api/{http => httpClient}/HttpOkClient.java (97%) rename src/main/java/com/glxp/api/{http => httpClient}/NmpaUdiClient.java (99%) rename src/main/java/com/glxp/api/{http => httpClient}/req/UdiwmsBusTypeRequest.java (92%) rename src/main/java/com/glxp/api/{http => httpClient}/req/UdiwmsUnitRequest.java (84%) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index 29366744..58ac5cf3 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -19,7 +19,7 @@ import com.glxp.api.entity.sync.SocketMsgEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.basic.*; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; @@ -28,7 +28,6 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicErpUnitsResponse; import com.glxp.api.res.basic.BasicProductThirdSysResponse; import com.glxp.api.res.basic.BasicUnitMaintainResponse; -import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.system.CompanyService; import com.glxp.api.service.system.SystemParamConfigService; @@ -38,7 +37,6 @@ import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.service.thrsys.ThrUnitImportService; import com.glxp.api.util.CustomUtil; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java index 52e1079f..293cf42e 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java @@ -10,7 +10,7 @@ import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpsExportLogEntity; import com.glxp.api.entity.basic.BasicProductsExportLogEntity; import com.glxp.api.entity.sync.SyncDataSetEntity; -import com.glxp.api.http.HttpOkClient; +import com.glxp.api.httpClient.HttpOkClient; import com.glxp.api.req.basic.BasicCorpsExportRequest; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.res.basic.BasicCorpExportLogResponse; diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index 6981cc6b..836cd81b 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -24,7 +23,7 @@ import com.glxp.api.entity.sync.SocketMsgEntity; import com.glxp.api.entity.thrsys.CodeRel; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.http.NmpaUdiClient; +import com.glxp.api.httpClient.NmpaUdiClient; import com.glxp.api.req.basic.*; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 07f60c9e..f21bbc15 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -23,7 +23,7 @@ import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.CodeRel; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.basic.*; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; @@ -39,7 +39,6 @@ import com.glxp.api.service.inv.InvProductService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrDataService; import com.glxp.api.service.thrsys.ThrSystemService; -import com.glxp.api.util.IntUtil; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 2a0edceb..ed7ea986 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -1,7 +1,6 @@ package com.glxp.api.controller.basic; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; @@ -22,7 +21,7 @@ import com.glxp.api.entity.sync.SocketMsgEntity; import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.entity.thrsys.CodeRel; import com.glxp.api.exception.JsonException; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.basic.*; import com.glxp.api.req.system.CompanyRequest; import com.glxp.api.req.system.DeleteCompanyFileRequest; @@ -33,12 +32,10 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.auth.CustomerInfoService; import com.glxp.api.service.basic.*; -import com.glxp.api.service.system.ClassifyCodeService; import com.glxp.api.service.system.CompanyService; import com.glxp.api.util.IntUtil; import com.glxp.api.util.SupplementVailUtil; import com.glxp.api.util.udi.FilterUdiUtils; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java index e97f31b8..5afa8faa 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java @@ -2,8 +2,7 @@ package com.glxp.api.controller.collect; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.collect.PostCollectOrderRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDelController.java b/src/main/java/com/glxp/api/controller/sync/SyncDelController.java index 53a37d2c..61413368 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDelController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDelController.java @@ -21,7 +21,7 @@ import com.glxp.api.entity.inv.DeviceInspectTaskEntity; import com.glxp.api.entity.sync.SyncEditLogEntity; import com.glxp.api.entity.sync.SyncEditTypeEntity; import com.glxp.api.entity.thrsys.CodeRel; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.basic.*; import com.glxp.api.req.system.DeleteCompanyFileRequest; import com.glxp.api.req.system.DeleteRequest; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java index a55f164d..53e194fe 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java @@ -1,7 +1,6 @@ package com.glxp.api.controller.thrsys; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; @@ -11,7 +10,7 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import com.glxp.api.req.thrsys.FilterThrBusTypeOriginRequest; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java index 358447dd..1b866b70 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java @@ -12,7 +12,7 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrCorpExportLogRequest; import com.glxp.api.req.thrsys.FilterThrCorpRequest; @@ -25,7 +25,6 @@ import com.glxp.api.service.thrsys.ThrCorpExportLogService; import com.glxp.api.service.thrsys.ThrCorpService; import com.glxp.api.service.thrsys.ThrCorpsDlService; import com.glxp.api.util.CustomUtil; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java index aca962a0..c9cfda51 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java @@ -11,7 +11,7 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrCorpRequest; import com.glxp.api.req.thrsys.PostThrCorpRequest; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java index 935df55a..2981bec4 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java @@ -14,7 +14,7 @@ import com.glxp.api.constant.Constant; import com.glxp.api.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.http.HttpOkClient; +import com.glxp.api.httpClient.HttpOkClient; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; import com.glxp.api.req.thrsys.PostThrInvProductsRequest; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java index a18b524f..6211d846 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java @@ -10,7 +10,7 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.entity.thrsys.ThrInvProductsExportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; -import com.glxp.api.http.ErpInvClient; +import com.glxp.api.httpClient.ErpInvClient; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.*; import com.glxp.api.res.PageSimpleResponse; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java index cd81a437..8c3ec8c1 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java @@ -7,10 +7,9 @@ import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.thrsys.ThrManufacturerEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterBasicProducstRequest; import com.glxp.api.req.thrsys.FilterThrCorpRequest; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java index 863c6285..284e6a54 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java @@ -14,7 +14,7 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.*; -import com.glxp.api.http.HttpOkClient; +import com.glxp.api.httpClient.HttpOkClient; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.*; @@ -24,7 +24,6 @@ import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.*; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.RedisUtil; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java index 310dd229..8fde75f2 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java @@ -11,7 +11,7 @@ import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrOrderExportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; -import com.glxp.api.http.ErpOrderClient; +import com.glxp.api.httpClient.ErpOrderClient; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.*; import com.glxp.api.res.PageSimpleResponse; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index 02b8163d..5da069ed 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -3,8 +3,6 @@ package com.glxp.api.controller.thrsys; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; @@ -13,7 +11,6 @@ import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BusinessType; import com.glxp.api.dao.system.ClassifyCodeDao; import com.glxp.api.entity.auth.AuthAdmin; @@ -24,14 +21,13 @@ import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.exception.JsonException; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.basic.SupplementRequest; import com.glxp.api.req.basic.UdiCombineRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.AddThrDiProductsRequest; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.BasicCorpExportLogResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.thrsys.ThrProductsAddDiResponse; import com.glxp.api.res.thrsys.UdiInfoResponse; @@ -55,11 +51,9 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.io.File; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import java.util.Set; /** * 供应商新增DI产品相关接口 diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index 44b7c241..3cc68b20 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -13,7 +13,7 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.PageSimpleResponse; @@ -23,7 +23,6 @@ import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.service.thrsys.ThrSystemDetailService; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java index 2395de10..9e6457d3 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java @@ -9,7 +9,7 @@ import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrProductsExportLogRequest; import com.glxp.api.req.thrsys.FilterThrProductsRequest; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java index e7b7cd39..8c0498b3 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java @@ -13,7 +13,7 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; import com.glxp.api.res.PageSimpleResponse; @@ -22,7 +22,6 @@ import com.glxp.api.service.thrsys.IThrBusTypeOriginService; import com.glxp.api.service.thrsys.ThrSystemBusApiService; import com.glxp.api.service.thrsys.ThrSystemDetailService; import com.glxp.api.service.thrsys.ThrSystemService; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/httpClient/ErpBasicClient.java similarity index 85% rename from src/main/java/com/glxp/api/http/ErpBasicClient.java rename to src/main/java/com/glxp/api/httpClient/ErpBasicClient.java index bfee9922..dda80b89 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/httpClient/ErpBasicClient.java @@ -1,4 +1,4 @@ -package com.glxp.api.http; +package com.glxp.api.httpClient; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; @@ -7,8 +7,8 @@ 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.http.req.UdiwmsBusTypeRequest; -import com.glxp.api.http.req.UdiwmsUnitRequest; +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; @@ -81,28 +81,7 @@ public class ErpBasicClient { } } - // //获取单据类型 -// public BaseResponse> getBusTypes(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest) { -// BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterBasicThirdSysDetailRequest.getThirdSysFk()); -// String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getOrderType"; -// UdiwmsBusTypeRequest udiwmsBusTypeRequest = new UdiwmsBusTypeRequest(); -// udiwmsBusTypeRequest.setThirdSys(filterBasicThirdSysDetailRequest.getThirdSysFk()); -// udiwmsBusTypeRequest.setPage(filterBasicThirdSysDetailRequest.getPage()); -// udiwmsBusTypeRequest.setLimit(filterBasicThirdSysDetailRequest.getLimit()); -// try { -// String response = httpOkClient.uCloudPost(url, udiwmsBusTypeRequest, basicThirdSysEntity); -// log.info(response); -// BaseResponse> udiDlDeviceResponse = -// JSONObject.parseObject(response, new TypeReference>>() { -// }); -// return udiDlDeviceResponse; -// } catch (Exception e) { -// log.error("获取单据类型异常", e); -// return ResultVOUtils.error(500, "连接第三方系统接口服务出错！"); -// } -// } -// -//查询仓库货位号 + //查询仓库货位号 public BaseResponse> getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) { ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(udiwmsWarehouseRequest.getThirdSys()); String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getWarehouse"; @@ -119,21 +98,6 @@ public class ErpBasicClient { } } - //测试连通性 - public BaseResponse testConnection(ThrSystemEntity thrSystemEntity) { - String response = httpOkClient.uCloudPost(thrSystemEntity.getThridUrl() + "/udispsync/sync/testConnection", "{}"); - log.info(response); - if (StrUtil.isBlank(response)) { - return ResultVOUtils.error(500, "连接失败"); - } - try { - return JSONObject.parseObject(response, BaseResponse.class); - } catch (Exception e) { - log.info("测试第三方服务连通性失败"); - return ResultVOUtils.error(500, "连接失败"); - } - } - //测试连通性 public BaseResponse testThridConnect(ThrSystemEntity thrSystemEntity) { String response = httpOkClient.uCloudPost(thrSystemEntity.getThridUrl() + "/udiwms/erp/testThirdSys", "{}"); @@ -217,6 +181,11 @@ public class ErpBasicClient { } } + /** + * 通过医保编码获取 药品 信息 + * @param ybHcflDetailFilterRequest + * @return + */ public BaseResponse> getYbDrugDetail(YbDrugDetailFilterRequest ybHcflDetailFilterRequest) { String url = "https://www.udims.com/UDI_DL_Server_test" + "/udchs/ybDrug/list"; try { diff --git a/src/main/java/com/glxp/api/http/ErpInvClient.java b/src/main/java/com/glxp/api/httpClient/ErpInvClient.java similarity index 85% rename from src/main/java/com/glxp/api/http/ErpInvClient.java rename to src/main/java/com/glxp/api/httpClient/ErpInvClient.java index 8510b2b8..0189c4f7 100644 --- a/src/main/java/com/glxp/api/http/ErpInvClient.java +++ b/src/main/java/com/glxp/api/httpClient/ErpInvClient.java @@ -1,4 +1,4 @@ -package com.glxp.api.http; +package com.glxp.api.httpClient; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -10,7 +10,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.HashMap; -import java.util.List; import java.util.Map; @Service @@ -44,7 +43,7 @@ public class ErpInvClient { paramMap.put("page", onhandRequest.getPage()); if (onhandRequest.getLimit() != null) paramMap.put("limit", onhandRequest.getLimit()); -// String response = HttpClient.mipsGet(url, paramMap); + String response = httpOkClient.uCloudPost(url, onhandRequest); try { BaseResponse> onHandsResponse = @@ -57,9 +56,4 @@ public class ErpInvClient { return null; } - public List getInvPrdoduct(ThrOnhandRequest onhandRequest, String url) { - BaseResponse> responseBaseResponse = getInvPrdoductResponse(onhandRequest, url); - List responseList = responseBaseResponse.getData().getList(); - return responseList; - } } diff --git a/src/main/java/com/glxp/api/http/ErpOrderClient.java b/src/main/java/com/glxp/api/httpClient/ErpOrderClient.java similarity index 99% rename from src/main/java/com/glxp/api/http/ErpOrderClient.java rename to src/main/java/com/glxp/api/httpClient/ErpOrderClient.java index 2d98b632..6acc8877 100644 --- a/src/main/java/com/glxp/api/http/ErpOrderClient.java +++ b/src/main/java/com/glxp/api/httpClient/ErpOrderClient.java @@ -1,4 +1,4 @@ -package com.glxp.api.http; +package com.glxp.api.httpClient; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; diff --git a/src/main/java/com/glxp/api/http/HttpOkClient.java b/src/main/java/com/glxp/api/httpClient/HttpOkClient.java similarity index 97% rename from src/main/java/com/glxp/api/http/HttpOkClient.java rename to src/main/java/com/glxp/api/httpClient/HttpOkClient.java index 19171159..6f634727 100644 --- a/src/main/java/com/glxp/api/http/HttpOkClient.java +++ b/src/main/java/com/glxp/api/httpClient/HttpOkClient.java @@ -1,4 +1,4 @@ -package com.glxp.api.http; +package com.glxp.api.httpClient; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; diff --git a/src/main/java/com/glxp/api/http/NmpaUdiClient.java b/src/main/java/com/glxp/api/httpClient/NmpaUdiClient.java similarity index 99% rename from src/main/java/com/glxp/api/http/NmpaUdiClient.java rename to src/main/java/com/glxp/api/httpClient/NmpaUdiClient.java index ed53bd05..f55a6f00 100644 --- a/src/main/java/com/glxp/api/http/NmpaUdiClient.java +++ b/src/main/java/com/glxp/api/httpClient/NmpaUdiClient.java @@ -1,4 +1,4 @@ -package com.glxp.api.http; +package com.glxp.api.httpClient; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; diff --git a/src/main/java/com/glxp/api/http/req/UdiwmsBusTypeRequest.java b/src/main/java/com/glxp/api/httpClient/req/UdiwmsBusTypeRequest.java similarity index 92% rename from src/main/java/com/glxp/api/http/req/UdiwmsBusTypeRequest.java rename to src/main/java/com/glxp/api/httpClient/req/UdiwmsBusTypeRequest.java index 4b2b6efe..015f8b25 100644 --- a/src/main/java/com/glxp/api/http/req/UdiwmsBusTypeRequest.java +++ b/src/main/java/com/glxp/api/httpClient/req/UdiwmsBusTypeRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.http.req; +package com.glxp.api.httpClient.req; import lombok.Data; diff --git a/src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java b/src/main/java/com/glxp/api/httpClient/req/UdiwmsUnitRequest.java similarity index 84% rename from src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java rename to src/main/java/com/glxp/api/httpClient/req/UdiwmsUnitRequest.java index 536ba1ca..6ba2d636 100644 --- a/src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java +++ b/src/main/java/com/glxp/api/httpClient/req/UdiwmsUnitRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.http.req; +package com.glxp.api.httpClient.req; import com.glxp.api.util.page.ListPageRequest; diff --git a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java index 37c942e4..e8280322 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java @@ -8,7 +8,7 @@ import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 1ae4637a..6d5e795f 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -18,7 +18,7 @@ import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.thrsys.*; import com.glxp.api.exception.JsonException; -import com.glxp.api.http.NmpaUdiClient; +import com.glxp.api.httpClient.NmpaUdiClient; import com.glxp.api.req.alihealth.AlihealthKytDrugrescodeReqeust; import com.glxp.api.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust; import com.glxp.api.req.basic.UdiCombineRequest; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java index 9016441e..a4dfdc38 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java @@ -14,7 +14,7 @@ import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.http.NmpaUdiClient; +import com.glxp.api.httpClient.NmpaUdiClient; import com.glxp.api.req.basic.FilterUdiIpLogRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 31d4d2bd..748bd46f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -30,7 +30,7 @@ import com.glxp.api.entity.inv.*; import com.glxp.api.entity.sync.SyncDataBustypeEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.http.HttpOkClient; +import com.glxp.api.httpClient.HttpOkClient; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inout.FilterUploadOrderRequest; import com.glxp.api.req.inout.OrderEditRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java index fdc9f678..90a72235 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java @@ -10,8 +10,8 @@ import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.Constant; import com.glxp.api.entity.sync.SyncDataSetEntity; import com.glxp.api.entity.thrsys.*; -import com.glxp.api.http.ErpBasicClient; -import com.glxp.api.http.HttpOkClient; +import com.glxp.api.httpClient.ErpBasicClient; +import com.glxp.api.httpClient.HttpOkClient; import com.glxp.api.req.thrsys.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse; @@ -20,8 +20,6 @@ import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.ExcelUtil; import com.glxp.api.util.RedisUtil; -import org.java_websocket.server.WebSocketServer; -import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java b/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java index 4e364cdc..ade362d3 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java @@ -2,20 +2,17 @@ package com.glxp.api.service.thrsys; import cn.hutool.core.bean.BeanUtil; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; /** diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java index d5b6122d..f27da647 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java @@ -6,14 +6,13 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.Constant; import com.glxp.api.entity.thrsys.*; -import com.glxp.api.http.ErpInvClient; +import com.glxp.api.httpClient.ErpInvClient; import com.glxp.api.req.thrsys.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrInvProductResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.util.ExcelUtil; import com.glxp.api.util.RedisUtil; -import org.java_websocket.server.WebSocketServer; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java b/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java index e37a52a8..03ef48ee 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java @@ -6,10 +6,9 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.thrsys.ThrManufacturerMapper; -import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.thrsys.ThrManufacturerEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.thrsys.FilterBasicProducstRequest; import com.glxp.api.req.thrsys.FilterThrCorpRequest; import com.glxp.api.req.thrsys.ThrManuFilterRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java index 38905c2d..3ea31431 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java @@ -7,8 +7,8 @@ import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.Constant; import com.glxp.api.entity.sync.SyncDataSetEntity; import com.glxp.api.entity.thrsys.*; -import com.glxp.api.http.ErpOrderClient; -import com.glxp.api.http.HttpOkClient; +import com.glxp.api.httpClient.ErpOrderClient; +import com.glxp.api.httpClient.HttpOkClient; import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.req.thrsys.FilterThrOrderRequest; import com.glxp.api.req.thrsys.PostThrOrderRequest; @@ -17,7 +17,6 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrOrderResponse; import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.RedisUtil; -import org.java_websocket.server.WebSocketServer; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java index 91f7de95..15f393fa 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java @@ -10,8 +10,8 @@ import com.glxp.api.entity.sync.SyncDataSetEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; -import com.glxp.api.http.ErpBasicClient; -import com.glxp.api.http.HttpOkClient; +import com.glxp.api.httpClient.ErpBasicClient; +import com.glxp.api.httpClient.HttpOkClient; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.req.thrsys.PostThrProductsRequest; import com.glxp.api.req.thrsys.ThrProductsExportRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java b/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java index 0e81844a..4a3f745b 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java @@ -3,14 +3,11 @@ package com.glxp.api.service.thrsys; import cn.hutool.extra.pinyin.PinyinUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; -import com.glxp.api.http.ErpBasicClient; -import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.thrsys.FilterThrCorpRequest; import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.BasicErpUnitsResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import com.glxp.api.service.basic.BasicCorpService; @@ -24,7 +21,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Locale; -import java.util.stream.Collectors; @Service public class ThrUnitImportService { diff --git a/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java b/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java index b6792f2e..4d466ed9 100644 --- a/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java +++ b/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.dao.thrsys.YbDrugMapper; import com.glxp.api.entity.thrsys.YbDrug; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.basic.YbDrugDetailFilterRequest; import com.glxp.api.res.PageSimpleResponse; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java index d1d5203f..e37b19ec 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java @@ -10,7 +10,7 @@ import com.glxp.api.dao.thrsys.ThrDeptDao; import com.glxp.api.dao.thrsys.ThrInvWarehouseDao; import com.glxp.api.entity.thrsys.ThrDeptEntity; import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.thrsys.FilterThrDeptRequest; import com.glxp.api.req.thrsys.UdiwmsWarehouseRequest; import com.glxp.api.res.PageSimpleResponse; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java index 752c1505..61a30c3e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java @@ -5,7 +5,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.dao.thrsys.ThrSystemDetailDao; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; -import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.httpClient.ErpBasicClient; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import com.glxp.api.service.thrsys.ThrSystemDetailService; import lombok.extern.slf4j.Slf4j;