From 1ff908506257b813818edafaf8d823e2a6b7be6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Sat, 11 May 2024 15:08:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=20=E6=A8=A1=E5=9E=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/controller/model/ModelsController.java | 3 +++ .../main/java/com/ruoyi/platform/domain/Models.java | 2 +- .../java/com/ruoyi/platform/domain/ModelsVersion.java | 4 ++-- .../platform/service/impl/DatasetServiceImpl.java | 2 +- .../service/impl/DatasetVersionServiceImpl.java | 7 ++++++- .../service/impl/ModelsVersionServiceImpl.java | 11 ++++++++--- 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java index 210aefc4..ed50963c 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java @@ -139,6 +139,9 @@ public class ModelsController extends BaseController { public GenericsAjaxResult addModelAndVersion(@RequestBody ModelsVo modelsVo) throws Exception { return genericsSuccess(this.modelsService.insertModelAndVersion(modelsVo)); + + + } /** diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java index f00f189d..449ae7f0 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java @@ -32,7 +32,7 @@ public class Models implements Serializable { @ApiModelProperty(value = "模型可见范围，1表示公开，0表示私有") private int availableRange; - @ApiModelProperty(value = "模型类型") + @ApiModelProperty(value = "模型类型(模型框架)") private String modelType; @ApiModelProperty(value = "模型标签") diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java index 8c54673a..b75dfbb7 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java @@ -22,8 +22,8 @@ public class ModelsVersion implements Serializable { /** * 主键 */ -@ApiModelProperty(value = "ID") -private Integer id; + @ApiModelProperty(value = "ID") + private Integer id; @ApiModelProperty(value = "模型ID") private Integer modelsId; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java index 0a57ae2d..3e4f277b 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java @@ -328,7 +328,7 @@ public class DatasetServiceImpl implements DatasetService { throw new Exception("新增数据集失败"); } - for (VersionVo datasetVersionVo :datasetVersionVos){ + for (VersionVo datasetVersionVo : datasetVersionVos){ DatasetVersion datasetVersion = new DatasetVersion(); datasetVersion.setDatasetId(datasetInsert.getId()); datasetVersion.setVersion(datasetVo.getVersion()); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java index 80e80a82..6a794238 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java @@ -78,7 +78,12 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { @Override public DatasetVersion insert(DatasetVersion datasetVersion) throws Exception { //插入预备 - insertPrepare(datasetVersion); + LoginUser loginUser = SecurityUtils.getLoginUser(); + datasetVersion.setCreateBy(loginUser.getUsername()); + datasetVersion.setUpdateBy(loginUser.getUsername()); + datasetVersion.setUpdateTime(new Date()); + datasetVersion.setCreateTime(new Date()); + datasetVersion.setState(1); this.datasetVersionDao.insert(datasetVersion); return datasetVersion; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java index 1c9a3b35..be20b969 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java @@ -73,8 +73,13 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { */ @Override public ModelsVersion insert(ModelsVersion modelsVersion) throws Exception { - //插入预备 - insertPrepare(modelsVersion); + //插入预备，此时不需要判断版本重复 + LoginUser loginUser = SecurityUtils.getLoginUser(); + modelsVersion.setCreateBy(loginUser.getUsername()); + modelsVersion.setUpdateBy(loginUser.getUsername()); + modelsVersion.setUpdateTime(new Date()); + modelsVersion.setCreateTime(new Date()); + modelsVersion.setState(1); this.modelsVersionDao.insert(modelsVersion); return modelsVersion; } @@ -201,7 +206,7 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { @Override public String addModelVersions(List modelsVersions) throws Exception { try { - // 遍历传入的 datasetVersions 列表 + // 遍历传入的 modelsVersions 列表 for(ModelsVersion modelsVersion : modelsVersions) { insertPrepare(modelsVersion); }