Browse Source

修改文件模块配置

pull/44/head
西大锐 1 year ago
parent
commit
1233188896
6 changed files with 26 additions and 2 deletions
  1. +2
    -0
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
  2. +10
    -0
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java
  3. +8
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java
  4. +1
    -0
      ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml
  5. +1
    -1
      ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java
  6. +4
    -0
      ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java

+ 2
- 0
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java View File

@@ -105,6 +105,8 @@ public class DatasetServiceImpl implements DatasetService {
} }
} }
return dataset; return dataset;


} }


/** /**


+ 10
- 0
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java View File

@@ -99,6 +99,11 @@ public class DatasetVersionServiceImpl implements DatasetVersionService {
datasetVersion.setUpdateBy(loginUser.getUsername()); datasetVersion.setUpdateBy(loginUser.getUsername());
datasetVersion.setUpdateTime(new Date()); datasetVersion.setUpdateTime(new Date());
this.datasetVersionDao.update(datasetVersion); 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()); return this.queryById(datasetVersion.getId());
} }


@@ -240,5 +245,10 @@ public class DatasetVersionServiceImpl implements DatasetVersionService {
datasetVersion.setUpdateTime(new Date()); datasetVersion.setUpdateTime(new Date());
datasetVersion.setCreateTime(new Date()); datasetVersion.setCreateTime(new Date());
datasetVersion.setState(1); datasetVersion.setState(1);
//插入时需要更新对应的数据集更新时间
Integer datasetId = datasetVersion.getDatasetId();
Dataset dataset = this.datasetDao.queryById(datasetId);
dataset.setUpdateTime(new Date());
this.datasetDao.update(dataset);
} }
} }

+ 8
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java View File

@@ -2,6 +2,8 @@ package com.ruoyi.platform.service.impl;


import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.platform.annotations.CheckDuplicate; 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.domain.ModelsVersion;
import com.ruoyi.platform.mapper.ModelsDao; import com.ruoyi.platform.mapper.ModelsDao;
import com.ruoyi.platform.mapper.ModelsVersionDao; import com.ruoyi.platform.mapper.ModelsVersionDao;
@@ -157,7 +159,7 @@ public class ModelsVersionServiceImpl implements ModelsVersionService {




/** /**
* 复制模型版本
* 根据版本id和version查询
* *
* @param modelsId 模型的id * @param modelsId 模型的id
* @param version 模型版本号 * @param version 模型版本号
@@ -233,6 +235,11 @@ public class ModelsVersionServiceImpl implements ModelsVersionService {
modelsVersion.setUpdateTime(new Date()); modelsVersion.setUpdateTime(new Date());
modelsVersion.setCreateTime(new Date()); modelsVersion.setCreateTime(new Date());
modelsVersion.setState(1); modelsVersion.setState(1);
//插入时需要更新对应的模型更新时间
Integer modelsId = modelsVersion.getModelsId();
Models models = this.modelsDao.queryById(modelsId);
models.setUpdateTime(new Date());
this.modelsDao.update(models);


} }




+ 1
- 0
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml View File

@@ -30,6 +30,7 @@
id, name, description,available_range, model_type,model_tag, create_by, create_time, update_by, update_time, state id, name, description,available_range, model_type,model_tag, create_by, create_time, update_by, update_time, state
from models from models
where name = #{name} and state = 1 limit 1 where name = #{name} and state = 1 limit 1

</select> </select>


<!--查询指定行数据--> <!--查询指定行数据-->


+ 1
- 1
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java View File

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


+ 4
- 0
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java View File

@@ -2,6 +2,7 @@ package com.ruoyi.file.service;


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


@Override @Override
public String uploadFile(MultipartFile file) throws Exception public String uploadFile(MultipartFile file) throws Exception
{ {


Loading…
Cancel
Save