From 048780071bb941b03ccd57b4edb8986a7007a89a Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Mon, 15 Sep 2025 10:14:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(scenic):=20=E6=B7=BB=E5=8A=A0=E6=99=AF?= =?UTF-8?q?=E5=8C=BA=E9=85=8D=E7=BD=AE=E5=88=86=E7=BB=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20-=20=E5=9C=A8=20ScenicConfigResp=20?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=20groupingEnable=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E7=94=A8=E4=BA=8E=E8=A1=A8=E7=A4=BA=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=BC=80=E5=90=AF=E5=88=86=E7=BB=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20-=20=E9=87=8D=E6=9E=84=20getConfig=20=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8=20ScenicConfigManager=20=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3=20ScenicConfigEntity-=20=E4=BC=98=E5=8C=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8F=82=E6=95=B0=E7=9A=84=E8=8E=B7=E5=8F=96=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E4=BD=BF=E7=94=A8=20getString=E3=80=81getBoo?= =?UTF-8?q?lean=E7=AD=89=E6=96=B9=E6=B3=95=E6=9B=BF=E4=BB=A3=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E8=8E=B7=E5=8F=96=E5=AD=97=E6=AE=B5=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile/AppScenicController.java | 41 ++++++++++--------- .../pc/scenic/resp/ScenicConfigResp.java | 1 + 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java index ea86883c..6efc2f93 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java @@ -7,7 +7,7 @@ import com.ycwl.basic.model.mobile.scenic.ScenicAppVO; import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO; import com.ycwl.basic.model.mobile.scenic.ScenicIndexVO; import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO; -import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity; +import com.ycwl.basic.integration.common.manager.ScenicConfigManager; import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity; import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery; import com.ycwl.basic.model.pc.scenic.resp.ScenicConfigResp; @@ -70,26 +70,27 @@ public class AppScenicController { @GetMapping("/{id}/config") @IgnoreToken public ApiResponse getConfig(@PathVariable Long id){ - ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(id); + ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(id); ScenicConfigResp resp = new ScenicConfigResp(); - resp.setBookRoutine(scenicConfig.getBookRoutine()); - resp.setForceFinishTime(scenicConfig.getForceFinishTime()); - resp.setTourTime(scenicConfig.getTourTime()); - resp.setSampleStoreDay(scenicConfig.getSampleStoreDay()); - resp.setFaceStoreDay(scenicConfig.getFaceStoreDay()); - resp.setVideoStoreDay(scenicConfig.getVideoStoreDay()); - resp.setAllFree(scenicConfig.getAllFree()); - resp.setDisableSourceVideo(scenicConfig.getDisableSourceVideo()); - resp.setDisableSourceImage(scenicConfig.getDisableSourceImage()); - resp.setAntiScreenRecordType(scenicConfig.getAntiScreenRecordType()); - resp.setVideoSourceStoreDay(scenicConfig.getVideoSourceStoreDay()); - resp.setImageSourceStoreDay(scenicConfig.getImageSourceStoreDay()); - resp.setUserSourceExpireDay(scenicConfig.getUserSourceExpireDay()); - resp.setBrokerDirectRate(scenicConfig.getBrokerDirectRate()); - resp.setVideoSourcePackHint(scenicConfig.getVideoSourcePackHint()); - resp.setImageSourcePackHint(scenicConfig.getImageSourcePackHint()); - resp.setVoucherEnable(scenicConfig.getVoucherEnable()); - resp.setEnableVoucher(scenicConfig.getVoucherEnable()); // compactible + resp.setBookRoutine(scenicConfig.getInteger("book_routine")); + resp.setForceFinishTime(scenicConfig.getInteger("force_finish_time")); + resp.setTourTime(scenicConfig.getInteger("tour_time")); + resp.setSampleStoreDay(scenicConfig.getInteger("sample_store_day")); + resp.setFaceStoreDay(scenicConfig.getInteger("face_store_day")); + resp.setVideoStoreDay(scenicConfig.getInteger("video_store_day")); + resp.setAllFree(scenicConfig.getBoolean("all_free")); + resp.setDisableSourceVideo(scenicConfig.getBoolean("disable_source_video")); + resp.setDisableSourceImage(scenicConfig.getBoolean("disable_source_image")); + resp.setAntiScreenRecordType(scenicConfig.getInteger("anti_screen_record_type")); + resp.setVideoSourceStoreDay(scenicConfig.getInteger("video_source_store_day")); + resp.setImageSourceStoreDay(scenicConfig.getInteger("image_source_store_day")); + resp.setUserSourceExpireDay(scenicConfig.getInteger("user_source_expire_day")); + resp.setBrokerDirectRate(scenicConfig.getBigDecimal("broker_direct_rate")); + resp.setVideoSourcePackHint(scenicConfig.getString("video_source_pack_hint")); + resp.setImageSourcePackHint(scenicConfig.getString("image_source_pack_hint")); + resp.setVoucherEnable(scenicConfig.getBoolean("voucher_enable")); + resp.setEnableVoucher(scenicConfig.getBoolean("voucher_enable")); // compactible + resp.setGroupingEnable(scenicConfig.getBoolean("grouping_enable")); return ApiResponse.success(resp); } diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java index 163dad9f..c4b482d6 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java @@ -47,4 +47,5 @@ public class ScenicConfigResp { private String videoSourcePackHint = ""; private Boolean voucherEnable; private Boolean enableVoucher; + private Boolean groupingEnable; }