feat:开发环境新增接口联调完成
This commit is contained in:
parent
9e140d1944
commit
34792a7397
|
@ -4,6 +4,7 @@ import com.ruoyi.common.core.web.controller.BaseController;
|
|||
import com.ruoyi.common.core.web.domain.GenericsAjaxResult;
|
||||
import com.ruoyi.platform.domain.DevEnvironment;
|
||||
import com.ruoyi.platform.service.DevEnvironmentService;
|
||||
import com.ruoyi.platform.vo.DevEnvironmentVo;
|
||||
import io.swagger.annotations.Api;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
|
@ -56,12 +57,12 @@ public class DevEnvironmentController extends BaseController {
|
|||
/**
|
||||
* 新增数据
|
||||
*
|
||||
* @param devEnvironment 实体
|
||||
* @param devEnvironmentVo 实体
|
||||
* @return 新增结果
|
||||
*/
|
||||
@PostMapping
|
||||
public ResponseEntity<DevEnvironment> add(@RequestBody DevEnvironment devEnvironment) {
|
||||
return ResponseEntity.ok(this.devEnvironmentService.insert(devEnvironment));
|
||||
public GenericsAjaxResult<DevEnvironment> add(@RequestBody DevEnvironmentVo devEnvironmentVo) {
|
||||
return genericsSuccess(this.devEnvironmentService.insert(devEnvironmentVo));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -71,8 +72,8 @@ public class DevEnvironmentController extends BaseController {
|
|||
* @return 编辑结果
|
||||
*/
|
||||
@PutMapping
|
||||
public ResponseEntity<DevEnvironment> edit(@RequestBody DevEnvironment devEnvironment) {
|
||||
return ResponseEntity.ok(this.devEnvironmentService.update(devEnvironment));
|
||||
public GenericsAjaxResult<DevEnvironment> edit(@RequestBody DevEnvironment devEnvironment) {
|
||||
return genericsSuccess(this.devEnvironmentService.update(devEnvironment));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -82,8 +83,8 @@ public class DevEnvironmentController extends BaseController {
|
|||
* @return 删除是否成功
|
||||
*/
|
||||
@DeleteMapping("{id}")
|
||||
public ResponseEntity<String> deleteById(@PathVariable("id") Integer id) {
|
||||
return ResponseEntity.ok(this.devEnvironmentService.removeById(id));
|
||||
public GenericsAjaxResult<String> deleteById(@PathVariable("id") Integer id) {
|
||||
return genericsSuccess(this.devEnvironmentService.removeById(id));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package com.ruoyi.platform.service;
|
||||
|
||||
import com.ruoyi.platform.domain.DevEnvironment;
|
||||
import com.ruoyi.platform.vo.DevEnvironmentVo;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
|
||||
|
@ -35,7 +36,7 @@ public interface DevEnvironmentService {
|
|||
* @param devEnvironment 实例对象
|
||||
* @return 实例对象
|
||||
*/
|
||||
DevEnvironment insert(DevEnvironment devEnvironment);
|
||||
DevEnvironment insert(DevEnvironmentVo devEnvironmentVo);
|
||||
|
||||
/**
|
||||
* 修改数据
|
||||
|
|
|
@ -6,6 +6,7 @@ import com.ruoyi.platform.mapper.DevEnvironmentDao;
|
|||
import com.ruoyi.platform.service.DevEnvironmentService;
|
||||
import com.ruoyi.platform.service.JupyterService;
|
||||
import com.ruoyi.platform.utils.JacksonUtil;
|
||||
import com.ruoyi.platform.vo.DevEnvironmentVo;
|
||||
import com.ruoyi.system.api.model.LoginUser;
|
||||
import io.kubernetes.client.openapi.models.V1PersistentVolumeClaim;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
@ -61,9 +62,20 @@ public class DevEnvironmentServiceImpl implements DevEnvironmentService {
|
|||
* @return 实例对象
|
||||
*/
|
||||
@Override
|
||||
public DevEnvironment insert(DevEnvironment devEnvironment) {
|
||||
public DevEnvironment insert(DevEnvironmentVo devEnvironmentVo) {
|
||||
//插入预备,此时不需要判断版本重复
|
||||
DevEnvironment devEnvironment = new DevEnvironment();
|
||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||
devEnvironment.setName(devEnvironmentVo.getName());
|
||||
devEnvironment.setComputingResource(devEnvironmentVo.getComputingResource());
|
||||
devEnvironment.setStandard(devEnvironmentVo.getStandard());
|
||||
devEnvironment.setEnvVariable(devEnvironmentVo.getEnvVariable());
|
||||
devEnvironment.setImage(devEnvironmentVo.getImage());
|
||||
// 将 dataset 和 model 转换成 JSON 字符串
|
||||
String datasetJson = JacksonUtil.toJSONString(devEnvironmentVo.getDataset());
|
||||
String modelJson = JacksonUtil.toJSONString(devEnvironmentVo.getModel());
|
||||
devEnvironment.setDataset(datasetJson);
|
||||
devEnvironment.setModel(modelJson);
|
||||
devEnvironment.setCreateBy(loginUser.getUsername());
|
||||
devEnvironment.setUpdateBy(loginUser.getUsername());
|
||||
devEnvironment.setUpdateTime(new Date());
|
||||
|
|
|
@ -0,0 +1,44 @@
|
|||
package com.ruoyi.platform.vo;
|
||||
|
||||
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonNaming;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
|
||||
public class DevEnvironmentVo implements Serializable {
|
||||
|
||||
private Integer id;
|
||||
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 计算资源
|
||||
*/
|
||||
private String computingResource;
|
||||
/**
|
||||
* 资源规格
|
||||
*/
|
||||
private String standard;
|
||||
|
||||
/**
|
||||
* 环境变量
|
||||
*/
|
||||
private String envVariable;
|
||||
/**
|
||||
* 所用镜像
|
||||
*/
|
||||
private String image;
|
||||
/**
|
||||
* 对应数据集
|
||||
*/
|
||||
private Map<String,Object> dataset;
|
||||
/**
|
||||
* 对应模型
|
||||
*/
|
||||
private Map<String,Object> model;
|
||||
|
||||
}
|
Loading…
Reference in New Issue