From 872871831835b86b4d238cce2d6a5fbb30bd7ab8 Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Mon, 7 Apr 2025 14:22:49 +0800 Subject: [PATCH] =?UTF-8?q?20250407=20=E6=9B=B4=E6=96=B0=201.=E6=8F=90?= =?UTF-8?q?=E4=BE=9BBusinessType=E6=9E=9A=E4=B8=BE=E5=88=B0api=E5=8C=85?= =?UTF-8?q?=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/inspetion/api}/enums/BusinessType.java | 2 +- .../inspection/controller/EntrustInfoController.java | 2 +- .../controller/TestRecordSampleDataController.java | 5 +---- .../inspection/service/impl/AssignmentInfoServiceImpl.java | 2 +- .../inspection/service/impl/InspectRecordServiceImpl.java | 3 +-- .../service/impl/PushDataToLabsCareServiceImpl.java | 5 +---- .../inspection/service/impl/TaskInfoServiceImpl.java | 2 +- .../service/impl/TestRecordSampleDataServiceImpl.java | 2 +- .../service/impl/TestRecordSampledataExpandServiceImpl.java | 2 +- .../inspection/service/impl/TestRecordServiceImpl.java | 2 +- 10 files changed, 10 insertions(+), 17 deletions(-) rename {dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection => dlp-drugtesting-api/src/main/java/digital/laboratory/platform/inspetion/api}/enums/BusinessType.java (95%) diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/enums/BusinessType.java b/dlp-drugtesting-api/src/main/java/digital/laboratory/platform/inspetion/api/enums/BusinessType.java similarity index 95% rename from dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/enums/BusinessType.java rename to dlp-drugtesting-api/src/main/java/digital/laboratory/platform/inspetion/api/enums/BusinessType.java index 37d8338..638edfa 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/enums/BusinessType.java +++ b/dlp-drugtesting-api/src/main/java/digital/laboratory/platform/inspetion/api/enums/BusinessType.java @@ -1,4 +1,4 @@ -package digital.laboratory.platform.inspection.enums; +package digital.laboratory.platform.inspetion.api.enums; import lombok.Getter; diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/EntrustInfoController.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/EntrustInfoController.java index b389e73..b366ef7 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/EntrustInfoController.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/EntrustInfoController.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.oss.service.OssFile; -import digital.laboratory.platform.inspection.enums.BusinessType; +import digital.laboratory.platform.inspetion.api.enums.BusinessType; import digital.laboratory.platform.inspection.enums.TestRecordFileUrl; import digital.laboratory.platform.inspection.dto.EntrustInfoDto; import digital.laboratory.platform.inspetion.api.entity.EntrustInfo; diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/TestRecordSampleDataController.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/TestRecordSampleDataController.java index 79aa337..0e94ea8 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/TestRecordSampleDataController.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/TestRecordSampleDataController.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import digital.laboratory.platform.common.aop.annotation.DlpAccessLimit; import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.mybatis.security.service.DLPUser; -import digital.laboratory.platform.inspection.enums.BusinessType; +import digital.laboratory.platform.inspetion.api.enums.BusinessType; import digital.laboratory.platform.inspection.dto.*; import digital.laboratory.platform.inspection.entity.TestRecordSampleData; import digital.laboratory.platform.inspection.query.AnalysisTestResultPageQuery; @@ -32,12 +32,9 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; import java.security.Principal; -import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * @author xy diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/AssignmentInfoServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/AssignmentInfoServiceImpl.java index d0fbef0..a7a6e11 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/AssignmentInfoServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/AssignmentInfoServiceImpl.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import digital.laboratory.platform.inspection.enums.BusinessType; +import digital.laboratory.platform.inspetion.api.enums.BusinessType; import digital.laboratory.platform.inspection.dto.AssignmentInfoDto; import digital.laboratory.platform.inspection.entity.*; import digital.laboratory.platform.inspection.mapper.AssignmentInfoMapper; diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/InspectRecordServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/InspectRecordServiceImpl.java index de40de2..e8c11c0 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/InspectRecordServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/InspectRecordServiceImpl.java @@ -19,14 +19,13 @@ import digital.laboratory.platform.inspection.entity.TestRecordInstrument; import digital.laboratory.platform.inspection.entity.TestRecordReagent; import digital.laboratory.platform.inspection.entity.TestRecordSampleData; import digital.laboratory.platform.inspection.entity.TestRecordSampleDataExpand; -import digital.laboratory.platform.inspection.enums.BusinessType; +import digital.laboratory.platform.inspetion.api.enums.BusinessType; import digital.laboratory.platform.inspection.enums.TestRecordFileUrl; import digital.laboratory.platform.inspection.service.*; import digital.laboratory.platform.inspection.vo.IonPairAndCEVO; import digital.laboratory.platform.inspection.vo.TestRecordReagentVO; import digital.laboratory.platform.inspetion.api.entity.EntrustInfo; import digital.laboratory.platform.inspetion.api.entity.SampleInfo; -import digital.laboratory.platform.inspetion.api.entity.TargetObject; import digital.laboratory.platform.inspetion.api.entity.TestRecord; import digital.laboratory.platform.sys.entity.Drug; import digital.laboratory.platform.sys.enums.entrust.EntrustBiologyType; diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/PushDataToLabsCareServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/PushDataToLabsCareServiceImpl.java index f843972..7ddf534 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/PushDataToLabsCareServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/PushDataToLabsCareServiceImpl.java @@ -13,8 +13,7 @@ import digital.laboratory.platform.inspection.entity.TestRecordInstrument; import digital.laboratory.platform.inspection.entity.TestRecordMethod; import digital.laboratory.platform.inspection.entity.TestRecordReagent; import digital.laboratory.platform.inspection.entity.TestRecordSampleData; -import digital.laboratory.platform.inspection.enums.BusinessType; -import digital.laboratory.platform.inspection.event.PushDataToLabsCareEvent; +import digital.laboratory.platform.inspetion.api.enums.BusinessType; import digital.laboratory.platform.inspection.mapper.TestRecordSampleDataMapper; import digital.laboratory.platform.inspection.service.*; import digital.laboratory.platform.inspection.vo.TestRecordReagentVO; @@ -27,10 +26,8 @@ import digital.laboratory.platform.othersys.utils.HttpsUtils; import digital.laboratory.platform.sys.entity.Drug; import digital.laboratory.platform.sys.entity.SysUser; import lombok.extern.slf4j.Slf4j; -import org.aspectj.weaver.ast.Test; import org.springframework.http.*; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Service; import org.springframework.web.client.RestClientException; import javax.annotation.Resource; diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TaskInfoServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TaskInfoServiceImpl.java index 6688d7c..d8fd941 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TaskInfoServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TaskInfoServiceImpl.java @@ -27,7 +27,7 @@ import digital.laboratory.platform.common.core.constant.OSSDirectoryConstants; import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.feign.RemoteGenerateWordService; import digital.laboratory.platform.common.oss.service.OssFile; -import digital.laboratory.platform.inspection.enums.BusinessType; +import digital.laboratory.platform.inspetion.api.enums.BusinessType; import digital.laboratory.platform.inspection.enums.SewageReportColumn; import digital.laboratory.platform.inspection.dto.*; import digital.laboratory.platform.inspection.entity.AssignmentInfo; diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java index 1ad5e95..94cb028 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java @@ -23,7 +23,7 @@ import digital.laboratory.platform.inspection.constant.TestRecordSampleDataConst import digital.laboratory.platform.inspection.convert.TestRecordSampleDataConverter; import digital.laboratory.platform.inspection.dto.*; import digital.laboratory.platform.inspection.entity.*; -import digital.laboratory.platform.inspection.enums.BusinessType; +import digital.laboratory.platform.inspetion.api.enums.BusinessType; import digital.laboratory.platform.inspection.enums.StdSolutionNum; import digital.laboratory.platform.inspection.enums.TaskTestDataStatus; import digital.laboratory.platform.inspection.event.AuditDataExecutionEvent; diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampledataExpandServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampledataExpandServiceImpl.java index 6ec4029..9662b6d 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampledataExpandServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampledataExpandServiceImpl.java @@ -12,7 +12,7 @@ import digital.laboratory.platform.inspection.dto.NPSCaseTestDataDto; import digital.laboratory.platform.inspection.dto.TestSampleDataExpandDTO; import digital.laboratory.platform.inspection.entity.TestRecordSampleData; import digital.laboratory.platform.inspection.entity.TestRecordSampleDataExpand; -import digital.laboratory.platform.inspection.enums.BusinessType; +import digital.laboratory.platform.inspetion.api.enums.BusinessType; import digital.laboratory.platform.inspection.mapper.TestRecordSampleDataExpandMapper; import digital.laboratory.platform.inspection.service.ProcessInspectDataService; import digital.laboratory.platform.inspection.service.TestRecordSampleDataService; diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordServiceImpl.java index 449dabc..d11501e 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordServiceImpl.java @@ -17,7 +17,7 @@ import com.deepoove.poi.xwpf.NiceXWPFDocument; import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.mybatis.security.service.DLPUser; import digital.laboratory.platform.common.oss.service.OssFile; -import digital.laboratory.platform.inspection.enums.BusinessType; +import digital.laboratory.platform.inspetion.api.enums.BusinessType; import digital.laboratory.platform.inspection.enums.TestRecordArgumentType; import digital.laboratory.platform.inspection.enums.TestRecordFileUrl; import digital.laboratory.platform.inspection.constant.TestRecordSampleDataConstant;