From 24996ea75ec4ca3b7d154387bfe37ec9dd387255 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期四, 29 五月 2025 14:40:05 +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/StSuggestSnapshotConfMainController.java | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfMainController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfMainController.java index a37fc8f..8e8117c 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfMainController.java +++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfMainController.java @@ -3,19 +3,20 @@ 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.entity.StSuggestSnapshotConfMainEntity; +import com.iailab.module.model.api.mcs.dto.StScheduleModelOutDTO; +import com.iailab.module.model.mcs.sche.entity.*; import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfMainService; -import com.iailab.module.model.mcs.sche.vo.StScheduleModelRespVO; -import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainPageReqVO; -import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainRespVO; -import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainSaveReqVO; +import com.iailab.module.model.mcs.sche.vo.*; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; + +import java.util.List; import static com.iailab.framework.common.pojo.CommonResult.success; @@ -24,7 +25,7 @@ * @Description * @createTime 2025年05月23日 */ -@Tag(name = "调度建议快照") +@Tag(name = "调度建议快照配置主表") @RestController @RequestMapping("/model/suggest/snapshot/conf-main") public class StSuggestSnapshotConfMainController { @@ -33,24 +34,35 @@ private StSuggestSnapshotConfMainService stSuggestSnapshotConfMainService; @GetMapping("/page") + @PreAuthorize("@ss.hasPermission('suggest:snapshot:query')") public CommonResult<PageResult<StSuggestSnapshotConfMainRespVO>> getPage(@Valid StSuggestSnapshotConfMainPageReqVO pageVO) { PageResult<StSuggestSnapshotConfMainEntity> pageResult = stSuggestSnapshotConfMainService.page(pageVO); return success(BeanUtils.toBean(pageResult, StSuggestSnapshotConfMainRespVO.class)); } + @GetMapping("/get") + @PreAuthorize("@ss.hasPermission('suggest:snapshot:info')") + public CommonResult<StSuggestSnapshotConfMainRespVO> get(@RequestParam("id") String id) { + StSuggestSnapshotConfMainRespVO result = stSuggestSnapshotConfMainService.get(id); + return success(result); + } + @PostMapping("/create") + @PreAuthorize("@ss.hasPermission('suggest:snapshot:create')") public CommonResult<Boolean> create(@Valid @RequestBody StSuggestSnapshotConfMainSaveReqVO createReqVO) { stSuggestSnapshotConfMainService.create(createReqVO); return success(true); } @PutMapping("/update") + @PreAuthorize("@ss.hasPermission('suggest:snapshot:update')") public CommonResult<Boolean> update(@Valid @RequestBody StSuggestSnapshotConfMainSaveReqVO updateReqVO) { stSuggestSnapshotConfMainService.update(updateReqVO); return success(true); } @DeleteMapping("/delete") + @PreAuthorize("@ss.hasPermission('suggest:snapshot:delete')") @Parameter(name = "id", description = "编号", required = true, example = "1024") public CommonResult<Boolean> deleteTenant(@RequestParam("id") String id) { stSuggestSnapshotConfMainService.delete(id); -- Gitblit v1.9.3