From 5f4f89112b570696173b74fc1cf03883ed66941c Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Sat, 11 Oct 2025 00:11:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor(scenic):=20=E7=A7=BB=E9=99=A4ScenicV2W?= =?UTF-8?q?ithConfigDTO=E5=B9=B6=E7=AE=80=E5=8C=96=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=80=BB=E8=BE=91=20-=20=E5=88=A0=E9=99=A4Sc?= =?UTF-8?q?enicV2WithConfigDTO=E7=B1=BB=E5=AE=9A=E4=B9=89=20-=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0ScenicV2Controller=E4=B8=AD=E7=9A=84=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BE=9D=E8=B5=96-=20=E6=9B=B4=E6=96=B0ScenicV2Client=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=85=A5=E4=BE=9D=E8=B5=96=20-=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0ScenicIntegrationService=E4=B8=AD=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=BE=9D=E8=B5=96=20-=20=E6=9B=B4=E6=96=B0ScenicRepos?= =?UTF-8?q?itory=E4=B8=AD=E7=9A=84=E5=AF=BC=E5=85=A5=E4=BE=9D=E8=B5=96=20-?= =?UTF-8?q?=20=E7=AE=80=E5=8C=96convertToScenicEntity=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=20-=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E7=BB=84=E5=90=88ScenicV2WithConfigDTO?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/pc/ScenicV2Controller.java | 1 - .../integration/scenic/client/ScenicV2Client.java | 1 - .../scenic/dto/scenic/ScenicV2WithConfigDTO.java | 14 -------------- .../scenic/service/ScenicIntegrationService.java | 1 - .../ycwl/basic/repository/ScenicRepository.java | 12 ++---------- 5 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 src/main/java/com/ycwl/basic/integration/scenic/dto/scenic/ScenicV2WithConfigDTO.java diff --git a/src/main/java/com/ycwl/basic/controller/pc/ScenicV2Controller.java b/src/main/java/com/ycwl/basic/controller/pc/ScenicV2Controller.java index 2205fb1d..d7c5f122 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/ScenicV2Controller.java +++ b/src/main/java/com/ycwl/basic/controller/pc/ScenicV2Controller.java @@ -10,7 +10,6 @@ import com.ycwl.basic.integration.scenic.dto.filter.ScenicFilterRequest; import com.ycwl.basic.integration.scenic.dto.scenic.CreateScenicRequest; import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO; import com.ycwl.basic.integration.common.response.PageResponse; -import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2WithConfigDTO; import com.ycwl.basic.integration.scenic.dto.scenic.UpdateScenicRequest; import com.ycwl.basic.integration.scenic.service.ScenicConfigIntegrationService; import com.ycwl.basic.integration.scenic.service.ScenicIntegrationService; diff --git a/src/main/java/com/ycwl/basic/integration/scenic/client/ScenicV2Client.java b/src/main/java/com/ycwl/basic/integration/scenic/client/ScenicV2Client.java index 2d637941..b4a52601 100644 --- a/src/main/java/com/ycwl/basic/integration/scenic/client/ScenicV2Client.java +++ b/src/main/java/com/ycwl/basic/integration/scenic/client/ScenicV2Client.java @@ -5,7 +5,6 @@ import com.ycwl.basic.integration.scenic.dto.filter.ScenicFilterPageResponse; import com.ycwl.basic.integration.scenic.dto.filter.ScenicFilterRequest; import com.ycwl.basic.integration.scenic.dto.scenic.CreateScenicRequest; import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO; -import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2WithConfigDTO; import com.ycwl.basic.integration.common.response.PageResponse; import com.ycwl.basic.integration.scenic.dto.scenic.UpdateScenicRequest; import org.springframework.cloud.openfeign.FeignClient; diff --git a/src/main/java/com/ycwl/basic/integration/scenic/dto/scenic/ScenicV2WithConfigDTO.java b/src/main/java/com/ycwl/basic/integration/scenic/dto/scenic/ScenicV2WithConfigDTO.java deleted file mode 100644 index 18e1dbb0..00000000 --- a/src/main/java/com/ycwl/basic/integration/scenic/dto/scenic/ScenicV2WithConfigDTO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.ycwl.basic.integration.scenic.dto.scenic; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Map; - -@Data -@EqualsAndHashCode(callSuper = true) -public class ScenicV2WithConfigDTO extends ScenicV2DTO { - @JsonProperty("config") - private Map config; -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/integration/scenic/service/ScenicIntegrationService.java b/src/main/java/com/ycwl/basic/integration/scenic/service/ScenicIntegrationService.java index be79e19b..e69618f7 100644 --- a/src/main/java/com/ycwl/basic/integration/scenic/service/ScenicIntegrationService.java +++ b/src/main/java/com/ycwl/basic/integration/scenic/service/ScenicIntegrationService.java @@ -9,7 +9,6 @@ import com.ycwl.basic.integration.scenic.dto.filter.ScenicFilterPageResponse; import com.ycwl.basic.integration.scenic.dto.filter.ScenicFilterRequest; import com.ycwl.basic.integration.scenic.dto.scenic.CreateScenicRequest; import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO; -import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2WithConfigDTO; import com.ycwl.basic.integration.common.response.PageResponse; import com.ycwl.basic.integration.scenic.dto.scenic.UpdateScenicRequest; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/ycwl/basic/repository/ScenicRepository.java b/src/main/java/com/ycwl/basic/repository/ScenicRepository.java index 7c71c1e7..0e412759 100644 --- a/src/main/java/com/ycwl/basic/repository/ScenicRepository.java +++ b/src/main/java/com/ycwl/basic/repository/ScenicRepository.java @@ -4,7 +4,6 @@ import com.ycwl.basic.facebody.enums.FaceBodyAdapterType; import com.ycwl.basic.integration.common.util.ConfigValueUtil; import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO; import com.ycwl.basic.integration.common.response.PageResponse; -import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2WithConfigDTO; import com.ycwl.basic.integration.scenic.service.ScenicIntegrationService; import com.ycwl.basic.integration.scenic.service.ScenicConfigIntegrationService; import com.ycwl.basic.integration.scenic.dto.config.ScenicConfigV2DTO; @@ -56,14 +55,7 @@ public class ScenicRepository { ScenicV2DTO scenicBasic = scenicIntegrationService.getScenic(id); ScenicConfigManager configManager = getScenicConfigManager(id); - // 手动组合成WithConfig对象用于转换 - ScenicV2WithConfigDTO scenicWithConfig = new ScenicV2WithConfigDTO(); - scenicWithConfig.setId(scenicBasic.getId()); - scenicWithConfig.setName(scenicBasic.getName()); - scenicWithConfig.setMpId(scenicBasic.getMpId()); - scenicWithConfig.setStatus(scenicBasic.getStatus()); - - ScenicEntity scenicEntity = convertToScenicEntity(scenicWithConfig, configManager); + ScenicEntity scenicEntity = convertToScenicEntity(scenicBasic, configManager); return scenicEntity; } @@ -230,7 +222,7 @@ public class ScenicRepository { } } - private ScenicEntity convertToScenicEntity(ScenicV2WithConfigDTO dto, ScenicConfigManager configManager) { + private ScenicEntity convertToScenicEntity(ScenicV2DTO dto, ScenicConfigManager configManager) { if (dto == null) { return null; }