From 0a2b23ad3f30dfb01c5d590fb98f39e93bfe1932 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 31 十二月 2024 18:35:17 +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/StScheduleModelController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleModelController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleModelController.java
index ced1d63..6ac4dcf 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleModelController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleModelController.java
@@ -3,9 +3,12 @@
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.api.mcs.dto.StScheduleModelOutDTO;
import com.iailab.module.model.mcs.sche.entity.StScheduleModelEntity;
+import com.iailab.module.model.mcs.sche.entity.StScheduleModelOutEntity;
import com.iailab.module.model.mcs.sche.entity.StScheduleModelParamEntity;
import com.iailab.module.model.mcs.sche.entity.StScheduleModelSettingEntity;
+import com.iailab.module.model.mcs.sche.service.StScheduleModelOutService;
import com.iailab.module.model.mcs.sche.service.StScheduleModelParamService;
import com.iailab.module.model.mcs.sche.service.StScheduleModelService;
import com.iailab.module.model.mcs.sche.service.StScheduleModelSettingService;
@@ -40,6 +43,8 @@
@Autowired
private StScheduleModelSettingService stScheduleModelSettingService;
+ @Autowired
+ private StScheduleModelOutService stScheduleModelOutService;
@GetMapping("/page")
@Operation(summary = "获得分页")
@@ -66,6 +71,8 @@
result.setParamList(BeanUtils.toBean(paramList, StScheduleModelParamRespVO.class));
List<StScheduleModelSettingEntity> settingList = stScheduleModelSettingService.getByModelId(data.getId());
result.setSettingList(BeanUtils.toBean(settingList, StScheduleModelSettingRespVO.class));
+ List<StScheduleModelOutDTO> outList = stScheduleModelOutService.list(data.getId());
+ result.setModelOut(outList);
return success(result);
}
--
Gitblit v1.9.3