From a9485e6e68e6ebbcfd95d30c4635d77809c5b2c3 Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期一, 26 五月 2025 16:12:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfDetController.java | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfDetController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfDetController.java index 0aaba43..369ffd7 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfDetController.java +++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfDetController.java @@ -2,10 +2,10 @@ import com.iailab.framework.common.pojo.CommonResult; import com.iailab.framework.common.pojo.PageResult; +import com.iailab.framework.common.util.object.BeanUtils; +import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfDetEntity; import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfDetService; -import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetPageReqVO; -import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetRespVO; -import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetSaveReqVO; +import com.iailab.module.model.mcs.sche.vo.*; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -22,7 +22,7 @@ * @Description * @createTime 2025年05月23日 */ -@Tag(name = "调度建议快照详情") +@Tag(name = "调度建议快照配置详情") @RestController @RequestMapping("/model/suggest/snapshot/conf-det") public class StSuggestSnapshotConfDetController { @@ -33,8 +33,8 @@ @GetMapping("/page") @PreAuthorize("@ss.hasPermission('suggest:snapshot:query')") public CommonResult<PageResult<StSuggestSnapshotConfDetRespVO>> getPage(@Valid StSuggestSnapshotConfDetPageReqVO pageVO) { - PageResult<StSuggestSnapshotConfDetRespVO> pageResult = stSuggestSnapshotConfDetService.page(pageVO); - return success(pageResult); + PageResult<StSuggestSnapshotConfDetEntity> pageResult = stSuggestSnapshotConfDetService.page(pageVO); + return success(BeanUtils.toBean(pageResult, StSuggestSnapshotConfDetRespVO.class)); } @PostMapping("/create") @@ -58,4 +58,11 @@ stSuggestSnapshotConfDetService.delete(id); return success(true); } + + @GetMapping("/get") + @PreAuthorize("@ss.hasPermission('suggest:snapshot:info')") + public CommonResult<StSuggestSnapshotConfDetRespVO> get(@RequestParam("id") String id) { + StSuggestSnapshotConfDetRespVO result = stSuggestSnapshotConfDetService.get(id); + return success(result); + } } -- Gitblit v1.9.3