From f08114ee03c8d2e5ea87840e7ca723dca75a0bf4 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Mon, 20 Jan 2025 10:00:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B6=85=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AF=BB=E4=BC=98=E5=AE=9E=E9=AA=8C=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/platform/domain/Ray.java | 5 ++++- .../platform/service/impl/RayServiceImpl.java | 10 ++++++++++ .../main/java/com/ruoyi/platform/vo/RayVo.java | 7 +++++-- .../mapper/managementPlatform/RayDaoMapper.xml | 15 +++++++++------ 4 files changed, 28 insertions(+), 9 deletions(-) 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 00ffb645..ce8257ab 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 @@ -24,11 +24,14 @@ public class Ray { private String dataset; @ApiModelProperty(value = "数据集挂载路径") - private String datasetPath; + private String model; @ApiModelProperty(value = "代码") private String code; + @ApiModelProperty(value = "镜像") + private String image; + @ApiModelProperty(value = "主函数代码文件") private String mainPy; 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 82c983ae..fc7ef4be 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 @@ -48,6 +48,8 @@ public class RayServiceImpl implements RayService { ray.setUpdateBy(username); ray.setDataset(JacksonUtil.toJSONString(rayVo.getDataset())); ray.setCode(JacksonUtil.toJSONString(rayVo.getCode())); + ray.setModel(JacksonUtil.toJSONString(rayVo.getModel())); + ray.setImage(JacksonUtil.toJSONString(rayVo.getImage())); ray.setParameters(JacksonUtil.toJSONString(rayVo.getParameters())); ray.setPointsToEvaluate(JacksonUtil.toJSONString(rayVo.getPointsToEvaluate())); rayDao.save(ray); @@ -67,6 +69,8 @@ public class RayServiceImpl implements RayService { ray.setPointsToEvaluate(JacksonUtil.toJSONString(rayVo.getPointsToEvaluate())); ray.setDataset(JacksonUtil.toJSONString(rayVo.getDataset())); ray.setCode(JacksonUtil.toJSONString(rayVo.getCode())); + ray.setModel(JacksonUtil.toJSONString(rayVo.getModel())); + ray.setImage(JacksonUtil.toJSONString(rayVo.getImage())); rayDao.edit(ray); return "修改成功"; } @@ -92,6 +96,12 @@ public class RayServiceImpl implements RayService { if (StringUtils.isNotEmpty(ray.getCode())) { rayVo.setCode(JsonUtils.jsonToMap(ray.getCode())); } + if (StringUtils.isNotEmpty(ray.getModel())) { + rayVo.setModel(JsonUtils.jsonToMap(ray.getModel())); + } + if (StringUtils.isNotEmpty(ray.getImage())) { + rayVo.setImage(JsonUtils.jsonToMap(ray.getImage())); + } return rayVo; } 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 8f001f38..6e8963ee 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 @@ -74,6 +74,9 @@ public class RayVo { private Map dataset; - @ApiModelProperty(value = "数据集挂载路径") - private String datasetPath; + @ApiModelProperty(value = "模型") + private Map model; + + @ApiModelProperty(value = "镜像") + private Map image; } 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 b8a7818c..a23ba911 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,13 +2,13 @@ - insert into ray(name, description, dataset, dataset_path, code, main_py, num_samples, parameters, points_to_evaluate, storage_path, + insert into ray(name, description, dataset, model, code, main_py, num_samples, parameters, points_to_evaluate, storage_path, search_alg, scheduler, metric, mode, max_t, - min_samples_required, resource, create_by, update_by) - values (#{ray.name}, #{ray.description}, #{ray.dataset}, #{ray.datasetPath}, #{ray.code}, #{ray.mainPy}, #{ray.numSamples}, #{ray.parameters}, + 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}, #{ray.pointsToEvaluate}, #{ray.storagePath}, #{ray.searchAlg}, #{ray.scheduler}, #{ray.metric}, #{ray.mode}, #{ray.maxT}, #{ray.minSamplesRequired}, - #{ray.resource}, #{ray.createBy}, #{ray.updateBy}) + #{ray.resource}, #{ray.image}, #{ray.createBy}, #{ray.updateBy}) @@ -23,12 +23,15 @@ dataset = #{ray.dataset}, - - dataset_path = #{ray.datasetPath}, + + model = #{ray.model}, code = #{ray.code}, + + image = #{ray.image}, + main_py = #{ray.mainPy},