Merge branch 'dev' into dev-zw

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

@@ -105,6 +105,8 @@ public class DatasetServiceImpl implements DatasetService {
             }
         }
         return dataset;
+
+
     }
 
     /**
@@ -326,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

@@ -45,6 +45,9 @@ public class DatasetVersionServiceImpl implements DatasetVersionService {
     private String bucketName;
     @Resource
     private MinioService minioService;
+    // 固定存储桶名
+    @Value("${labelStudio.loaclUrl}")
+    private String labelloaclUrl;
     /**
      * 通过ID查询单条数据
      *
@@ -78,7 +81,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;
     }
@@ -99,6 +107,11 @@ public class DatasetVersionServiceImpl implements DatasetVersionService {
         datasetVersion.setUpdateBy(loginUser.getUsername());
         datasetVersion.setUpdateTime(new Date());
         this.datasetVersionDao.update(datasetVersion);
+        //插入时需要更新对应的数据集更新时间
+        Integer datasetId = datasetVersion.getDatasetId();
+        Dataset dataset = this.datasetDao.queryById(datasetId);
+        dataset.setUpdateTime(new Date());
+        this.datasetDao.update(dataset);
         return this.queryById(datasetVersion.getId());
     }
 
@@ -213,7 +226,7 @@ public class DatasetVersionServiceImpl implements DatasetVersionService {
         // 获取label-studio数据流
         Map<String, String> headers = new HashMap<String, String>();
         headers.put("Authorization","Token "+labelDatasetVersionVo.getToken());
-        InputStream inputStream = HttpUtils.getIntputStream("http://127.0.0.1:8080/api/projects/"+labelDatasetVersionVo.getProject_id()+"/export?exportType="+labelDatasetVersionVo.getExportType(), headers);
+        InputStream inputStream = HttpUtils.getIntputStream(labelloaclUrl+"/api/projects/"+labelDatasetVersionVo.getProject_id()+"/export?exportType="+labelDatasetVersionVo.getExportType(), headers);
         // 构建objectName
         String username = SecurityUtils.getLoginUser().getUsername();
         String url = username + "/" + DateUtils.dateTimeNow() + "/" + dataset.getName()+"_"+labelDatasetVersionVo.getVersion()+"."+labelDatasetVersionVo.getExportType();
@@ -240,5 +253,10 @@ public class DatasetVersionServiceImpl implements DatasetVersionService {
         datasetVersion.setUpdateTime(new Date());
         datasetVersion.setCreateTime(new Date());
         datasetVersion.setState(1);
+        //插入时需要更新对应的数据集更新时间
+        Integer datasetId = datasetVersion.getDatasetId();
+        Dataset dataset = this.datasetDao.queryById(datasetId);
+        dataset.setUpdateTime(new Date());
+        this.datasetDao.update(dataset);
     }
 }

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java

@@ -2,6 +2,8 @@ package com.ruoyi.platform.service.impl;
 
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.platform.annotations.CheckDuplicate;
+import com.ruoyi.platform.domain.Dataset;
+import com.ruoyi.platform.domain.Models;
 import com.ruoyi.platform.domain.ModelsVersion;
 import com.ruoyi.platform.mapper.ModelsDao;
 import com.ruoyi.platform.mapper.ModelsVersionDao;
@@ -71,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;
     }
@@ -157,7 +164,7 @@ public class ModelsVersionServiceImpl implements ModelsVersionService {
 
 
     /**
-     * 复制模型版本
+     * 根据版本id和version查询
      *
      * @param modelsId 模型的id
      * @param version 模型版本号
@@ -199,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);
             }
@@ -233,6 +240,11 @@ public class ModelsVersionServiceImpl implements ModelsVersionService {
         modelsVersion.setUpdateTime(new Date());
         modelsVersion.setCreateTime(new Date());
         modelsVersion.setState(1);
+        //插入时需要更新对应的模型更新时间
+        Integer modelsId = modelsVersion.getModelsId();
+        Models models = this.modelsDao.queryById(modelsId);
+        models.setUpdateTime(new Date());
+        this.modelsDao.update(models);
 
     }
 

ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml

@@ -30,6 +30,7 @@
         id, name, description,available_range, model_type,model_tag, create_by, create_time, update_by, update_time, state
         from models
         where name = #{name} and state = 1 limit 1
+
     </select>
 
     <!--查询指定行数据-->

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java

@@ -11,7 +11,7 @@ import com.ruoyi.file.utils.FileUploadUtils;
  * 
  * @author ruoyi
  */
-@Primary
+
 @Service
 public class LocalSysFileServiceImpl implements ISysFileService
 {

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.file.service;
 
 import java.io.InputStream;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import com.alibaba.nacos.common.utils.IoUtils;
@@ -15,6 +16,7 @@ import io.minio.PutObjectArgs;
  *
  * @author ruoyi
  */
+@Primary
 @Service
 public class MinioSysFileServiceImpl implements ISysFileService
 {
@@ -31,6 +33,8 @@ public class MinioSysFileServiceImpl implements ISysFileService
      * @return 访问地址
      * @throws Exception
      */
+
+
     @Override
     public String uploadFile(MultipartFile file) throws Exception
     {