add 新增 通用翻译模块 ruoyi-common-translation 实现(部门名、字典、oss、用户名)

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/bo/SysOssBo.java

@@ -13,22 +13,31 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class SysOssBo extends BaseEntity {
 
+    /**
+     * ossId
+     */
+    private Long ossId;
+
     /**
      * 文件名
      */
     private String fileName;
+
     /**
      * 原名
      */
     private String originalName;
+
     /**
      * 文件后缀名
      */
     private String fileSuffix;
+
     /**
      * URL地址
      */
     private String url;
+
     /**
      * 服务商
      */

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/dubbo/RemoteFileServiceImpl.java

@@ -7,11 +7,11 @@ import com.ruoyi.common.oss.entity.UploadResult;
 import com.ruoyi.common.oss.factory.OssFactory;
 import com.ruoyi.resource.api.RemoteFileService;
 import com.ruoyi.resource.api.domain.SysFile;
-import com.ruoyi.resource.domain.SysOss;
-import com.ruoyi.resource.mapper.SysOssMapper;
+import com.ruoyi.resource.domain.bo.SysOssBo;
+import com.ruoyi.resource.service.ISysOssService;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,11 +22,11 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Slf4j
 @Service
+@RequiredArgsConstructor
 @DubboService
 public class RemoteFileServiceImpl implements RemoteFileService {
 
-    @Autowired
-    private SysOssMapper sysOssMapper;
+    private final ISysOssService sysOssService;
 
     /**
      * 文件上传请求
@@ -39,13 +39,13 @@ public class RemoteFileServiceImpl implements RemoteFileService {
             OssClient storage = OssFactory.instance();
             UploadResult uploadResult = storage.uploadSuffix(file, suffix, contentType);
             // 保存文件信息
-            SysOss oss = new SysOss();
+            SysOssBo oss = new SysOssBo();
             oss.setUrl(uploadResult.getUrl());
             oss.setFileSuffix(suffix);
             oss.setFileName(uploadResult.getFilename());
             oss.setOriginalName(originalFilename);
             oss.setService(storage.getConfigKey());
-            sysOssMapper.insert(oss);
+            sysOssService.insertByBo(oss);
             SysFile sysFile = new SysFile();
             sysFile.setOssId(oss.getOssId());
             sysFile.setName(uploadResult.getFilename());
@@ -57,4 +57,15 @@ public class RemoteFileServiceImpl implements RemoteFileService {
         }
     }
 
+    /**
+     * 通过ossId查询对应的url
+     *
+     * @param ossIds ossId串逗号分隔
+     * @return url串逗号分隔
+     */
+    @Override
+    public String selectUrlByIds(String ossIds) {
+        return sysOssService.selectUrlByIds(ossIds);
+    }
+
 }

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/service/ISysOssService.java

@@ -22,12 +22,15 @@ public interface ISysOssService {
 
     List<SysOssVo> listByIds(Collection<Long> ossIds);
 
+    String selectUrlByIds(String ossIds);
+
     SysOssVo getById(Long ossId);
 
     SysOssVo upload(MultipartFile file);
 
+    Boolean insertByBo(SysOssBo bo);
+
     void download(Long ossId, HttpServletResponse response) throws IOException;
 
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
 }

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/service/impl/SysOssServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.resource.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -31,10 +32,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -69,6 +67,18 @@ public class SysOssServiceImpl implements ISysOssService {
         return list;
     }
 
+    @Override
+    public String selectUrlByIds(String ossIds) {
+        List<String> list = new ArrayList<>();
+        for (Long id : Arrays.stream(ossIds.split(",")).map(Long::parseLong).collect(Collectors.toList())) {
+            SysOssVo vo = SpringUtils.getAopProxy(this).getById(id);
+            if (ObjectUtil.isNotNull(vo)) {
+                list.add(this.matchingUrl(vo).getUrl());
+            }
+        }
+        return String.join(",", list);
+    }
+
     private LambdaQueryWrapper<SysOss> buildQueryWrapper(SysOssBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SysOss> lqw = Wrappers.lambdaQuery();
@@ -131,6 +141,16 @@ public class SysOssServiceImpl implements ISysOssService {
         return this.matchingUrl(sysOssVo);
     }
 
+    @Override
+    public Boolean insertByBo(SysOssBo bo) {
+        SysOss oss = BeanUtil.toBean(bo, SysOss.class);
+        boolean flag = baseMapper.insert(oss) > 0;
+        if (flag) {
+            bo.setOssId(oss.getOssId());
+        }
+        return flag;
+    }
+
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if (isValid) {