q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(scenic): 添加景区配置分组功能并优化配置获取接口

Browse Source 
- 在 ScenicConfigResp 中添加 groupingEnable 字段，用于表示是否开启分组功能
- 重构 getConfig 方法，使用 ScenicConfigManager 替代 ScenicConfigEntity- 优化配置参数的获取方式，使用 getString、getBoolean等方法替代直接获取字段值
This commit is contained in:
Jerry Yan
2025-09-15 10:14:10 +08:00
parent c5f7003077
commit 048780071b
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java
View File

@@ -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.ScenicDeviceCountVO;
import com.ycwl.basic.model.mobile.scenic.ScenicIndexVO; import com.ycwl.basic.model.mobile.scenic.ScenicIndexVO;
import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO; 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.entity.ScenicEntity;
import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery; import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
import com.ycwl.basic.model.pc.scenic.resp.ScenicConfigResp; import com.ycwl.basic.model.pc.scenic.resp.ScenicConfigResp;
@@ -70,26 +70,27 @@ public class AppScenicController {
@GetMapping("/{id}/config") @GetMapping("/{id}/config")
@IgnoreToken @IgnoreToken
public ApiResponse<ScenicConfigResp> getConfig(@PathVariable Long id){ public ApiResponse<ScenicConfigResp> getConfig(@PathVariable Long id){
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(id); ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(id);
ScenicConfigResp resp = new ScenicConfigResp(); ScenicConfigResp resp = new ScenicConfigResp();
resp.setBookRoutine(scenicConfig.getBookRoutine()); resp.setBookRoutine(scenicConfig.getInteger("book_routine"));
resp.setForceFinishTime(scenicConfig.getForceFinishTime()); resp.setForceFinishTime(scenicConfig.getInteger("force_finish_time"));
resp.setTourTime(scenicConfig.getTourTime()); resp.setTourTime(scenicConfig.getInteger("tour_time"));
resp.setSampleStoreDay(scenicConfig.getSampleStoreDay()); resp.setSampleStoreDay(scenicConfig.getInteger("sample_store_day"));
resp.setFaceStoreDay(scenicConfig.getFaceStoreDay()); resp.setFaceStoreDay(scenicConfig.getInteger("face_store_day"));
resp.setVideoStoreDay(scenicConfig.getVideoStoreDay()); resp.setVideoStoreDay(scenicConfig.getInteger("video_store_day"));
resp.setAllFree(scenicConfig.getAllFree()); resp.setAllFree(scenicConfig.getBoolean("all_free"));
resp.setDisableSourceVideo(scenicConfig.getDisableSourceVideo()); resp.setDisableSourceVideo(scenicConfig.getBoolean("disable_source_video"));
resp.setDisableSourceImage(scenicConfig.getDisableSourceImage()); resp.setDisableSourceImage(scenicConfig.getBoolean("disable_source_image"));
resp.setAntiScreenRecordType(scenicConfig.getAntiScreenRecordType()); resp.setAntiScreenRecordType(scenicConfig.getInteger("anti_screen_record_type"));
resp.setVideoSourceStoreDay(scenicConfig.getVideoSourceStoreDay()); resp.setVideoSourceStoreDay(scenicConfig.getInteger("video_source_store_day"));
resp.setImageSourceStoreDay(scenicConfig.getImageSourceStoreDay()); resp.setImageSourceStoreDay(scenicConfig.getInteger("image_source_store_day"));
resp.setUserSourceExpireDay(scenicConfig.getUserSourceExpireDay()); resp.setUserSourceExpireDay(scenicConfig.getInteger("user_source_expire_day"));
resp.setBrokerDirectRate(scenicConfig.getBrokerDirectRate()); resp.setBrokerDirectRate(scenicConfig.getBigDecimal("broker_direct_rate"));
resp.setVideoSourcePackHint(scenicConfig.getVideoSourcePackHint()); resp.setVideoSourcePackHint(scenicConfig.getString("video_source_pack_hint"));
resp.setImageSourcePackHint(scenicConfig.getImageSourcePackHint()); resp.setImageSourcePackHint(scenicConfig.getString("image_source_pack_hint"));
resp.setVoucherEnable(scenicConfig.getVoucherEnable()); resp.setVoucherEnable(scenicConfig.getBoolean("voucher_enable"));
resp.setEnableVoucher(scenicConfig.getVoucherEnable()); // compactible resp.setEnableVoucher(scenicConfig.getBoolean("voucher_enable")); // compactible
resp.setGroupingEnable(scenicConfig.getBoolean("grouping_enable"));
return ApiResponse.success(resp); return ApiResponse.success(resp);
} }

1
src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java
View File

@@ -47,4 +47,5 @@ public class ScenicConfigResp {
private String videoSourcePackHint = ""; private String videoSourcePackHint = "";
private Boolean voucherEnable; private Boolean voucherEnable;
private Boolean enableVoucher; private Boolean enableVoucher;
private Boolean groupingEnable;
} }