diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Ray.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Ray.java index ce8257ab..674c6e34 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Ray.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Ray.java @@ -26,8 +26,8 @@ public class Ray { @ApiModelProperty(value = "数据集挂载路径") private String model; - @ApiModelProperty(value = "代码") - private String code; + @ApiModelProperty(value = "代码配置") + private String codeConfig; @ApiModelProperty(value = "镜像") private String image; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java index fc7ef4be..32c19964 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java @@ -47,7 +47,7 @@ public class RayServiceImpl implements RayService { ray.setCreateBy(username); ray.setUpdateBy(username); ray.setDataset(JacksonUtil.toJSONString(rayVo.getDataset())); - ray.setCode(JacksonUtil.toJSONString(rayVo.getCode())); + ray.setCodeConfig(JacksonUtil.toJSONString(rayVo.getCodeConfig())); ray.setModel(JacksonUtil.toJSONString(rayVo.getModel())); ray.setImage(JacksonUtil.toJSONString(rayVo.getImage())); ray.setParameters(JacksonUtil.toJSONString(rayVo.getParameters())); @@ -68,7 +68,7 @@ public class RayServiceImpl implements RayService { ray.setParameters(JacksonUtil.toJSONString(rayVo.getParameters())); ray.setPointsToEvaluate(JacksonUtil.toJSONString(rayVo.getPointsToEvaluate())); ray.setDataset(JacksonUtil.toJSONString(rayVo.getDataset())); - ray.setCode(JacksonUtil.toJSONString(rayVo.getCode())); + ray.setCodeConfig(JacksonUtil.toJSONString(rayVo.getCodeConfig())); ray.setModel(JacksonUtil.toJSONString(rayVo.getModel())); ray.setImage(JacksonUtil.toJSONString(rayVo.getImage())); rayDao.edit(ray); @@ -93,8 +93,8 @@ public class RayServiceImpl implements RayService { if (StringUtils.isNotEmpty(ray.getDataset())) { rayVo.setDataset(JsonUtils.jsonToMap(ray.getDataset())); } - if (StringUtils.isNotEmpty(ray.getCode())) { - rayVo.setCode(JsonUtils.jsonToMap(ray.getCode())); + if (StringUtils.isNotEmpty(ray.getCodeConfig())) { + rayVo.setCodeConfig(JsonUtils.jsonToMap(ray.getCodeConfig())); } if (StringUtils.isNotEmpty(ray.getModel())) { rayVo.setModel(JsonUtils.jsonToMap(ray.getModel())); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/RayVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/RayVo.java index 6e8963ee..4cf000e5 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/RayVo.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/RayVo.java @@ -70,7 +70,7 @@ public class RayVo { private String runState; @ApiModelProperty(value = "代码") - private Map code; + private Map codeConfig; private Map dataset; diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml index a23ba911..236141c4 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml @@ -2,10 +2,10 @@ - insert into ray(name, description, dataset, model, code, main_py, num_samples, parameters, points_to_evaluate, storage_path, + insert into ray(name, description, dataset, model, code_config, main_py, num_samples, parameters, points_to_evaluate, storage_path, search_alg, scheduler, metric, mode, max_t, min_samples_required, resource, image, create_by, update_by) - values (#{ray.name}, #{ray.description}, #{ray.dataset}, #{ray.model}, #{ray.code}, #{ray.mainPy}, #{ray.numSamples}, #{ray.parameters}, + values (#{ray.name}, #{ray.description}, #{ray.dataset}, #{ray.model}, #{ray.codeConfig}, #{ray.mainPy}, #{ray.numSamples}, #{ray.parameters}, #{ray.pointsToEvaluate}, #{ray.storagePath}, #{ray.searchAlg}, #{ray.scheduler}, #{ray.metric}, #{ray.mode}, #{ray.maxT}, #{ray.minSamplesRequired}, #{ray.resource}, #{ray.image}, #{ray.createBy}, #{ray.updateBy}) @@ -26,8 +26,8 @@ model = #{ray.model}, - - code = #{ray.code}, + + code_config = #{ray.codeConfig}, image = #{ray.image},