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; }