From e83cc18f017efcca5c2d52bb84b3c11f226ae945 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 03 六月 2025 13:54:11 +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 | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 8e8117c..c04940f 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
@@ -5,6 +5,7 @@
import com.iailab.framework.common.util.object.BeanUtils;
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.StScheduleModelService;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfMainService;
import com.iailab.module.model.mcs.sche.vo.*;
import io.swagger.v3.oas.annotations.Operation;
@@ -32,12 +33,18 @@
@Autowired
private StSuggestSnapshotConfMainService stSuggestSnapshotConfMainService;
-
+
+ @Autowired
+ private StScheduleModelService stScheduleModelService;
+
@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));
+ PageResult<StSuggestSnapshotConfMainRespVO> result = BeanUtils.toBean(pageResult, StSuggestSnapshotConfMainRespVO.class);
+ result.getList().forEach(item -> {
+ item.setModelName(stScheduleModelService.get(item.getModelId())!=null?stScheduleModelService.get(item.getModelId()).getModelName():null);
+ });
+ return success(result);
}
@GetMapping("/get")
--
Gitblit v1.9.3