“1”

src/main/java/com/fdkankan/manage/controller/AppFileController.java

@@ -30,11 +30,7 @@ public class AppFileController {
     @PostMapping(value = "/upload", consumes = { "multipart/form-data" })
     private ResultData upload(@RequestParam(required = false) MultipartFile file) {
         // 将文件转字节-> 字符串
-        String filePath = appFileService.upload(file);
-        String md5 = FileMd5Util.getFileMD5(filePath);
-        Map<String,String> result = new HashMap<>(2);
-        result.put("md5",md5);
-        return ResultData.ok(result);
+        return ResultData.ok(appFileService.upload(file));
     }
 
     @PostMapping(value = "/add")

src/main/java/com/fdkankan/manage/service/IAppFileService.java

@@ -7,6 +7,7 @@ import com.fdkankan.manage.vo.request.AppFileParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -18,7 +19,7 @@ import java.util.List;
  */
 public interface IAppFileService extends IService<AppFile> {
 
-    String upload(MultipartFile file);
+    Map<String, String> upload(MultipartFile file);
 
     PageInfo pageList(AppFileParam param);
 

src/main/java/com/fdkankan/manage/service/impl/AppFileServiceImpl.java

@@ -6,8 +6,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.common.util.FileMd5Util;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.manage.util.UploadToOssUtil;
+import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.entity.AppFile;
 import com.fdkankan.manage.mapper.IAppFileMapper;
 import com.fdkankan.manage.service.IAppFileService;
@@ -22,7 +23,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.util.Base64;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -37,18 +40,20 @@ import java.util.stream.Collectors;
 public class AppFileServiceImpl extends ServiceImpl<IAppFileMapper, AppFile> implements IAppFileService {
 
     @Autowired
-    private UploadToOssUtil uploadToOssUtil;
+    private MangerUploadToOssUtil mangeUploadToOssUtil;
     @Value("${upload.type}")
     private String ossType;
     @Value("${oss.prefix.sdk}")
     private String prefixAli;
 
     @Override
-    public String upload(MultipartFile file) {
+    public Map<String, String> upload(MultipartFile file) {
         if (ObjectUtils.isEmpty(file) || file.isEmpty() || file.getSize() <= 0) {
             throw new BusinessException(ErrorCode.FAILURE_CODE_3017);
         }
         try {
+            Map<String,String> result = new HashMap<>(2);
+
             String fileContent = Base64.getEncoder().encodeToString(file.getBytes());
             String filePath = FileUtils.getResource().concat("uploadAppTmp");
             FileUtils.createDir(filePath);
@@ -57,7 +62,10 @@ public class AppFileServiceImpl extends ServiceImpl<IAppFileMapper, AppFile> imp
             FileUtils.deleteFile(filePath);
             // 写文件到本地
             FileUtils.base64ToFileWriter(fileContent, filePath);
-            return filePath;
+            String md5 = FileMd5Util.getFileMD5(filePath);
+            result.put("md5",md5);
+            result.put("fileName",file.getOriginalFilename());
+            return result;
         }catch (Exception e){
             throw new BusinessException(-1,"上传失败");
         }
@@ -106,12 +114,12 @@ public class AppFileServiceImpl extends ServiceImpl<IAppFileMapper, AppFile> imp
 
         String ossPathPrefix = "apps/customApp/" + param.getAgent() + "/"+param.getAppType()+"/";
 
-        uploadToOssUtil.upload(param.getFileServerType(),filePath, ossPathPrefix+"4dkankan."+fileType);
+        mangeUploadToOssUtil.upload(param.getFileServerType(),filePath, ossPathPrefix+"4dkankan."+fileType);
         // 上传到 历史记录文件夹目录
-        uploadToOssUtil.upload(param.getFileServerType(),filePath, ossPathPrefix+"oldapps/" + file.getName());
+        mangeUploadToOssUtil.upload(param.getFileServerType(),filePath, ossPathPrefix+"oldapps/" + file.getName());
 
         // 上传到 version.json 文件
-        uploadToOssUtil.upload(param.getFileServerType(),versionFilePath, ossPathPrefix+"version/version.json");
+        mangeUploadToOssUtil.upload(param.getFileServerType(),versionFilePath, ossPathPrefix+"version/version.json");
 
         // 删除旧文件
         FileUtils.deleteFile(filePath);

src/main/java/com/fdkankan/manage/service/impl/CameraVersionServiceImpl.java

@@ -11,7 +11,7 @@ import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileMd5Util;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.validation.ValidationUtils;
-import com.fdkankan.manage.util.UploadToOssUtil;
+import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.entity.CameraVersion;
 import com.fdkankan.manage.mapper.ICameraVersionMapper;
 import com.fdkankan.manage.service.ICameraVersionService;
@@ -47,7 +47,7 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
     @Value("${prefix.ali}")
     private String prefixAli;
     @Resource
-    private UploadToOssUtil uploadToOssUtil;
+    private MangerUploadToOssUtil mangeUploadToOssUtil;
 
     @Override
     public void addAndUpload(MultipartFile file, String version, String description, String minVersion, Integer type) throws IOException {
@@ -73,7 +73,7 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         FileUtils.base64ToFileWriter(fileContent, filePath);
         log.info("filePath: {}", filePath);
         // 上传到阿里云sso
-        uploadToOssUtil.upload(filePath, DIR_NAME + fileName);
+        mangeUploadToOssUtil.upload(filePath, DIR_NAME + fileName);
         log.info("upload success");
         String url = prefixAli + DIR_NAME + fileName;
         if("aws".equals(ossType)){

src/main/java/com/fdkankan/manage/service/impl/CommonServiceImpl.java

@@ -1,12 +1,10 @@
 package com.fdkankan.manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileTypeUtil;
-import cn.hutool.core.io.FileUtil;
 import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.DateExtUtil;
-import com.fdkankan.manage.util.UploadToOssUtil;
+import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.service.ICommonService;
 import java.io.File;
 import java.io.IOException;
@@ -31,7 +29,7 @@ public class CommonServiceImpl implements ICommonService {
     @Value("${oss.prefix.url}")
     private String ossUrlPrefix;
     @Autowired
-    private UploadToOssUtil uploadToOssUtil;
+    private MangerUploadToOssUtil mangeUploadToOssUtil;
 
     @Override
     public ResultData uploadFile(MultipartFile file) throws IOException {
@@ -42,7 +40,7 @@ public class CommonServiceImpl implements ICommonService {
             .getTime(), DateExtUtil.dateStyle6), uuid + extName);
         File tempFile = File.createTempFile(uuid ,extName);
         file.transferTo(tempFile);
-        uploadToOssUtil.upload(tempFile.getPath(), ossPath);
+        mangeUploadToOssUtil.upload(tempFile.getPath(), ossPath);
         tempFile.deleteOnExit();
         String url = this.ossUrlPrefix + ossPath;
         return ResultData.ok(url);

src/main/java/com/fdkankan/manage/service/impl/InvoiceServiceImpl.java

@@ -1,18 +1,12 @@
 package com.fdkankan.manage.service.impl;
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.InvoiceType;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.Result;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.DateExtUtil;
-import com.fdkankan.manage.util.UploadToOssUtil;
+import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.common.Dict;
 import com.fdkankan.manage.entity.Invoice;
 import com.fdkankan.manage.entity.InvoiceRegister;
@@ -20,15 +14,12 @@ import com.fdkankan.manage.mapper.IInvoiceMapper;
 import com.fdkankan.manage.service.IInvoiceRegisterService;
 import com.fdkankan.manage.service.IInvoiceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.manage.service.IOrderService;
 import com.fdkankan.manage.vo.InvoicePageParamVO;
 import com.fdkankan.manage.vo.InvoiceRegisterDetailVO;
 import com.fdkankan.manage.vo.InvoiceVO;
-import java.io.File;
+
 import java.io.IOException;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
 import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -60,7 +51,7 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
     @Autowired
     private IInvoiceRegisterService invoiceRegisterService;
     @Autowired
-    private UploadToOssUtil uploadToOssUtil;
+    private MangerUploadToOssUtil mangeUploadToOssUtil;
 
     @Dict
     @Override
@@ -98,7 +89,7 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
             }
             String fileName = invoicePrefix + invoice.getId() + ".jpg";
             String ossFilePath = String.format(invoiceOssDir) + "/" + fileName;
-            uploadToOssUtil.upload(file.getBytes(), ossFilePath);
+            mangeUploadToOssUtil.upload(file.getBytes(), ossFilePath);
             invoiceRegister.setInvoiceUrl(ossPrefixUrl + ossFilePath);
         }else{//专用发票
             if(StrUtil.isEmpty(shipNum)){

src/main/java/com/fdkankan/manage/service/impl/ScenePlusServiceImpl.java

@@ -2,7 +2,7 @@ package com.fdkankan.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.manage.util.UploadToOssUtil;
+import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.mapper.IScenePlusMapper;
 import com.fdkankan.manage.service.*;
@@ -36,7 +36,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     @Autowired
     private ISceneEditControlsService sceneEditControlsService;
     @Autowired
-    UploadToOssUtil uploadToOssUtil;
+    MangerUploadToOssUtil mangeUploadToOssUtil;
     @Autowired
     ISceneProService sceneProService;
 

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -1,12 +1,10 @@
 package com.fdkankan.manage.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ConstantFilePath;
-import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
@@ -15,7 +13,7 @@ import com.fdkankan.common.util.CreateObjUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.MatrixToImageWriterUtil;
 import com.fdkankan.common.util.RandomUtil;
-import com.fdkankan.manage.util.UploadToOssUtil;
+import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.common.CameraConstant;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.mapper.ISceneProMapper;
@@ -25,15 +23,12 @@ import com.fdkankan.manage.vo.request.SceneParam;
 import com.fdkankan.manage.vo.response.GroupByCount;
 import com.fdkankan.manage.vo.response.SceneVo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -63,7 +58,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Autowired
     ISceneProEditService sceneProEditService;
     @Autowired
-    private UploadToOssUtil uploadToOssUtil;
+    private MangerUploadToOssUtil mangeUploadToOssUtil;
     @Autowired
     IScenePlusService scenePlusService;
     @Autowired
@@ -400,7 +395,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         FileUtils.writeJsonFile(localPath, map);
         if(type.equals("v4")){
-            uploadToOssUtil.upload(localPath,uploadPath);
+            mangeUploadToOssUtil.upload(localPath,uploadPath);
         }
     }
 
@@ -415,7 +410,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         for(String url : urlList){
             map.put(url, url.replace(ConstantFilePath.SCENE_PATH, ""));
         }
-        uploadToOssUtil.uploadMulFiles(map);
+        mangeUploadToOssUtil.uploadMulFiles(map);
     }
 
     @Override
@@ -443,7 +438,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         for(String url : urlList){
             fileMap.put(url, ConstantFilePath.OSS_PREFIX + url.replace(buildModelPath, ""));
         }
-        uploadToOssUtil.uploadMulFiles(fileMap);
+        mangeUploadToOssUtil.uploadMulFiles(fileMap);
 
         FileUtils.delAllFile(newDataSource);
 
@@ -490,7 +485,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             copyList.add(oldViewPath);
         }
         for (String sourcePath : copyList) {
-            uploadToOssUtil.copyFiles(sourcePath,sourcePath.replaceAll(sceneNum,newNum));
+            mangeUploadToOssUtil.copyFiles(sourcePath,sourcePath.replaceAll(sceneNum,newNum));
         }
     }
     @Override

src/main/java/com/fdkankan/manage/service/impl/SpaceSdkServiceImpl.java

@@ -10,7 +10,7 @@ import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.manage.util.UploadToOssUtil;
+import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.entity.SpaceSdk;
 import com.fdkankan.manage.mapper.ISpaceSdkMapper;
 import com.fdkankan.manage.service.ISpaceSdkService;
@@ -41,7 +41,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
     private static String DIR_NAME = "new4dkk/v2/images/_/common/data/";
 
     @Autowired
-    private UploadToOssUtil uploadToOssUtil;
+    private MangerUploadToOssUtil mangeUploadToOssUtil;
 
     @Value("${oss.prefix.sdk}")
     private String prefixAli;
@@ -85,7 +85,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
         log.info("filePath: {}", filePath);
 
         // 上传到阿里云sso
-        uploadToOssUtil.uploadSdk(filePath, DIR_NAME + fileName);
+        mangeUploadToOssUtil.uploadSdk(filePath, DIR_NAME + fileName);
         log.info("upload success");
 
         String url = prefixAli + DIR_NAME + fileName;

src/main/java/com/fdkankan/manage/util/UploadToOssUtil.java

@@ -51,7 +51,7 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Component
-public class UploadToOssUtil {
+public class MangerUploadToOssUtil {
 
 	Zone zone = Zone.autoZone();
 
@@ -150,7 +150,7 @@ public class UploadToOssUtil {
 	public void uploadBySh(String filePath, String key) {
 		String ossPath = this.bucket + "/" + key;
 		try {
-			String command = String.format(UploadToOssUtil.UPLOAD_SH, ossPath, filePath);
+			String command = String.format(MangerUploadToOssUtil.UPLOAD_SH, ossPath, filePath);
 			log.info("开始上传文件, ossPath:{}, srcPath:{}", ossPath, filePath);
 			CreateObjUtil.callshell(command);
 			log.info("上传文件完毕, ossPath:{}, srcPath:{}", ossPath, filePath);