修改新建数据集 模型bug

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<String> addModelAndVersion(@RequestBody ModelsVo modelsVo) throws Exception {
         return genericsSuccess(this.modelsService.insertModelAndVersion(modelsVo));
 
+
+
+
     }
 
     /**

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 = "模型标签")

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;

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());

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;
     }

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<ModelsVersion> modelsVersions) throws Exception {
         try {
-            // 遍历传入的 datasetVersions 列表
+            // 遍历传入的 modelsVersions 列表
             for(ModelsVersion modelsVersion : modelsVersions) {
                 insertPrepare(modelsVersion);
             }