From 54d78017f02eb95b5cccaf1377b884941954e548 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 20 九月 2024 16:12:15 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.8.100:29418/iailab-plat
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleModelController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 71e3fe6..64f4f83 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
@@ -4,10 +4,12 @@
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.module.model.mcs.sche.entity.StScheduleModelEntity;
+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.StScheduleModelParamService;
import com.iailab.module.model.mcs.sche.service.StScheduleModelService;
-import com.iailab.module.model.mcs.sche.vo.StScheduleModelPageReqVO;
-import com.iailab.module.model.mcs.sche.vo.StScheduleModelRespVO;
-import com.iailab.module.model.mcs.sche.vo.StScheduleModelSaveReqVO;
+import com.iailab.module.model.mcs.sche.service.StScheduleModelSettingService;
+import com.iailab.module.model.mcs.sche.vo.*;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +17,8 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+
+import java.util.List;
import static com.iailab.framework.common.pojo.CommonResult.error;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -31,6 +35,12 @@
@Autowired
private StScheduleModelService stScheduleModelService;
+ @Autowired
+ private StScheduleModelParamService stScheduleModelParamService;
+
+ @Autowired
+ private StScheduleModelSettingService stScheduleModelSettingService;
+
@GetMapping("/page")
@Operation(summary = "获得分页")
@PreAuthorize("@ss.hasPermission('sche:model:query')")
@@ -39,12 +49,24 @@
return success(BeanUtils.toBean(page, StScheduleModelRespVO.class));
}
+ @GetMapping("/list")
+ @PreAuthorize("@ss.hasPermission('sche:model:query')")
+ public CommonResult<List<StScheduleModelRespVO>> list() {
+ List<StScheduleModelEntity> list = stScheduleModelService.list();
+ return success(BeanUtils.toBean(list, StScheduleModelRespVO.class));
+ }
+
@GetMapping("/get")
@Operation(summary = "获得详情")
@PreAuthorize("@ss.hasPermission('sche:model:query')")
public CommonResult<StScheduleModelRespVO> get(@RequestParam("id") String id){
StScheduleModelEntity data = stScheduleModelService.get(id);
- return success(BeanUtils.toBean(data, StScheduleModelRespVO.class));
+ StScheduleModelRespVO result = BeanUtils.toBean(data, StScheduleModelRespVO.class);
+ List<StScheduleModelParamEntity> paramList = stScheduleModelParamService.getByModelId(data.getId());
+ result.setParamList(BeanUtils.toBean(paramList, StScheduleModelParamRespVO.class));
+ List<StScheduleModelSettingEntity> settingList = stScheduleModelSettingService.getByModelId(data.getId());
+ result.setSettingList(BeanUtils.toBean(settingList, StScheduleModelSettingRespVO.class));
+ return success(result);
}
@PostMapping("/create")
--
Gitblit v1.9.3