From d68b0629519f90187674b35483179ba12aae9e9b Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Sat, 11 Oct 2025 00:10:25 +0800 Subject: [PATCH] =?UTF-8?q?refactor(repository):=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E6=99=AF=E5=8C=BA=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E9=80=BB?= =?UTF-8?q?=E8=BE=91-=20=E5=BC=95=E5=85=A5=20ScenicConfigManager=20?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=20-=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=89=8B=E5=8A=A8=E6=9E=84=E5=BB=BA=20config?= =?UTF-8?q?Map=20=E7=9A=84=E9=80=BB=E8=BE=91=20-=20=E4=BF=AE=E6=94=B9=20co?= =?UTF-8?q?nvertToScenicEntity=20=E6=96=B9=E6=B3=95=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=99=A8=20-=20=E4=BD=BF=E7=94=A8=20configMa?= =?UTF-8?q?nager=20=E6=9B=BF=E4=BB=A3=E7=9B=B4=E6=8E=A5=E4=BB=8E=20DTO=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=85=8D=E7=BD=AE=E5=80=BC=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=20-=20=E7=BB=9F=E4=B8=80=E9=85=8D=E7=BD=AE=E9=A1=B9?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=A2=9E=E5=BC=BA?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8F=AF=E7=BB=B4=E6=8A=A4=E6=80=A7=E4=B8=8E?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/repository/ScenicRepository.java | 39 +++++++------------ 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/ycwl/basic/repository/ScenicRepository.java b/src/main/java/com/ycwl/basic/repository/ScenicRepository.java index 7bc87c40..7c71c1e7 100644 --- a/src/main/java/com/ycwl/basic/repository/ScenicRepository.java +++ b/src/main/java/com/ycwl/basic/repository/ScenicRepository.java @@ -54,15 +54,7 @@ public class ScenicRepository { public ScenicEntity getScenic(Long id) { // 分别获取景区基础信息和配置信息 ScenicV2DTO scenicBasic = scenicIntegrationService.getScenic(id); - List configList = scenicConfigIntegrationService.listConfigs(id); - - // 将配置列表转换为Map - Map configMap = new HashMap<>(); - if (configList != null) { - for (ScenicConfigV2DTO config : configList) { - configMap.put(config.getConfigKey(), config.getConfigValue()); - } - } + ScenicConfigManager configManager = getScenicConfigManager(id); // 手动组合成WithConfig对象用于转换 ScenicV2WithConfigDTO scenicWithConfig = new ScenicV2WithConfigDTO(); @@ -70,9 +62,8 @@ public class ScenicRepository { scenicWithConfig.setName(scenicBasic.getName()); scenicWithConfig.setMpId(scenicBasic.getMpId()); scenicWithConfig.setStatus(scenicBasic.getStatus()); - scenicWithConfig.setConfig(configMap); - ScenicEntity scenicEntity = convertToScenicEntity(scenicWithConfig); + ScenicEntity scenicEntity = convertToScenicEntity(scenicWithConfig, configManager); return scenicEntity; } @@ -239,7 +230,7 @@ public class ScenicRepository { } } - private ScenicEntity convertToScenicEntity(ScenicV2WithConfigDTO dto) { + private ScenicEntity convertToScenicEntity(ScenicV2WithConfigDTO dto, ScenicConfigManager configManager) { if (dto == null) { return null; } @@ -248,19 +239,17 @@ public class ScenicRepository { entity.setName(dto.getName()); entity.setMpId(dto.getMpId()); entity.setStatus(dto.getStatus().toString()); - if (dto.getConfig() != null) { - entity.setAddress(ConfigValueUtil.getStringValue(dto.getConfig(), "address")); - entity.setArea(ConfigValueUtil.getStringValue(dto.getConfig(), "area")); - entity.setCity(ConfigValueUtil.getStringValue(dto.getConfig(), "city")); - entity.setProvince(ConfigValueUtil.getStringValue(dto.getConfig(), "province")); - entity.setLatitude(ConfigValueUtil.getBigDecimalValue(dto.getConfig(), "latitude")); - entity.setLongitude(ConfigValueUtil.getBigDecimalValue(dto.getConfig(), "longitude")); - entity.setRadius(ConfigValueUtil.getBigDecimalValue(dto.getConfig(), "radius")); - entity.setPhone(ConfigValueUtil.getStringValue(dto.getConfig(), "phone")); - entity.setLogoUrl(ConfigValueUtil.getStringValue(dto.getConfig(), "logoUrl")); - entity.setCoverUrl(ConfigValueUtil.getStringValue(dto.getConfig(), "coverUrl")); - entity.setKfCodeUrl(ConfigValueUtil.getStringValue(dto.getConfig(), "kfCodeUrl")); - } + entity.setAddress(configManager.getString("address")); + entity.setArea(configManager.getString("area")); + entity.setCity(configManager.getString("city")); + entity.setProvince(configManager.getString("province")); + entity.setLatitude(configManager.getBigDecimal("latitude")); + entity.setLongitude(configManager.getBigDecimal("longitude")); + entity.setRadius(configManager.getBigDecimal("radius")); + entity.setPhone(configManager.getString("phone")); + entity.setLogoUrl(configManager.getString("logo_url")); + entity.setCoverUrl(configManager.getString("cover_url")); + entity.setKfCodeUrl(configManager.getString("kf_code_url")); return entity; }