上传文件添加业务类型

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneUploadController.java

@@ -21,6 +21,7 @@ public class SceneUploadController extends BaseController {
      * 上传图片到oss,base64
      * base64   图片base64
      * fileName  文件名称
+     * blzType  业务类型
      * files     文件
      * num 场景码
      * type     0添加，1替换
@@ -28,10 +29,11 @@ public class SceneUploadController extends BaseController {
     @RequestMapping(value = "/files", method = RequestMethod.POST)
     public String uploads(@RequestParam(value = "base64",required = false) String base64,
                                      @RequestParam(value = "fileName",required = false) String fileName,
+                                     @RequestParam(value = "blzType",required = false) String blzType,
                                      @RequestParam(value = "files",required = false) MultipartFile[] files,
                                      @RequestParam(value = "num",required = false) String num,
                                      @RequestParam(value = "type",required = false,defaultValue = "0") Integer type) throws Exception {
-        return sceneUploadService.uploads(base64,fileName,files,num,type,getToken());
+        return sceneUploadService.uploads(base64,fileName,blzType,files,num,type,getToken());
     }
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneUpload.java

@@ -40,14 +40,14 @@ public class SceneUpload implements Serializable {
     /**
      * 文件名称
      */
-    @TableField("file_name")
-    private String fileName;
+    @TableField("file_path")
+    private String filePath;
 
     /**
      * 文件后缀
      */
-    @TableField("file_prefix")
-    private String filePrefix;
+    @TableField("blz_type")
+    private String blzType;
 
     /**
      * 文件上传者id

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneUploadService.java

@@ -14,5 +14,5 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public interface ISceneUploadService extends IService<SceneUpload> {
 
-    String uploads(String imgData, String fileName,MultipartFile[] files, String sceneCode, Integer type,String token) throws Exception;
+    String uploads(String imgData, String fileName,String blzType,MultipartFile[] files, String sceneCode, Integer type,String token) throws Exception;
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneUploadServiceImpl.java

@@ -3,12 +3,12 @@ package com.fdkankan.scene.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.user.SSOLoginHelper;
 import com.fdkankan.common.user.SSOUser;
 import com.fdkankan.common.util.BASE64DecodedMultipartFile;
 import com.fdkankan.common.util.FileUtil;
-import com.fdkankan.fyun.oss.UploadFilePath;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.scene.entity.SceneUpload;
 import com.fdkankan.scene.mapper.ISceneUploadMapper;
@@ -55,7 +55,7 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
     private SSOLoginHelper ssoLoginHelper;
 
     @Override
-    public String uploads(String imgData,String fileName,MultipartFile[] files,String sceneCode,Integer type,String token) throws Exception{
+    public String uploads(String imgData,String fileName,String blzType,MultipartFile[] files,String sceneCode,Integer type,String token) throws Exception{
         SSOUser ssoUser = ssoLoginHelper.loginCheck(token);
 //        if(ssoUser == null ){
 //            throw new BusinessException(ErrorCode.USER_NOT_LOGIN);
@@ -70,30 +70,21 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
         if(files !=null && files.length >0){
             multipartFiles.addAll(Arrays.asList(files));
         }
-        return this.uploadFiles(fileName,multipartFiles,sceneCode,type,userId);
+        return this.uploadFiles(fileName,blzType,multipartFiles,sceneCode,type,userId);
     }
 
-    public String uploadFiles(String sendFileName,List<MultipartFile> files, String sceneCode, Integer type,Long userId) throws Exception{
-        if (StringUtils.isEmpty(sceneCode) || files == null || files.size() <= 0) {
+    public String uploadFiles(String sendFileName,String blzType,List<MultipartFile> files, String sceneCode, Integer type,Long userId) throws Exception{
+        if (StringUtils.isEmpty(sceneCode) || files == null || files.size() <= 0 || StringUtils.isEmpty(blzType)) {
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
         List<String> urlList = new ArrayList<>();
-        String prefix ="";
-        for (MultipartFile file : files) {
-            String fileName = file.getOriginalFilename();
-            if(StringUtils.isNotBlank(prefix) && !prefix.equals(fileName.substring(fileName.lastIndexOf(".")))){
-                throw new BusinessException(-1,"文件类型不一致");
-            }
-            // 获取文件后缀
-            prefix = fileName.substring(fileName.lastIndexOf("."));
-        }
         if(type != null && 1 == type){
-            this.updateFileByPreFix(sceneCode,prefix);
+            this.updateFileByPreFix(sceneCode,blzType);
         }
         for (MultipartFile file : files) {
             String fileName = file.getOriginalFilename();
             // 获取文件后缀
-            prefix = fileName.substring(fileName.lastIndexOf("."));
+            String prefix = fileName.substring(fileName.lastIndexOf("."));
             File newFile = File.createTempFile(UUID.randomUUID().toString() ,prefix);
             file.transferTo(newFile);
             String realFileName = fileName;
@@ -112,7 +103,7 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
 
             FileUtil.delFile(newFile.getPath());
             //添加记录
-            this.saveData(sceneCode,ossPath,prefix,userId);
+            this.saveData(sceneCode,ossPath,blzType,userId);
         }
         StringBuilder returnString = new StringBuilder();
         for (String res : urlList) {
@@ -124,20 +115,20 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
         return returnString.toString();
     }
 
-    private void updateFileByPreFix(String sceneCode, String prefix) {
+    private void updateFileByPreFix(String sceneCode, String blzType) {
         LambdaQueryWrapper<SceneUpload> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SceneUpload::getNum,sceneCode)
-                .eq(SceneUpload::getFilePrefix,prefix)
+                .eq(SceneUpload::getBlzType,blzType)
                 .eq(SceneUpload::getTbStatus,0);
         List<SceneUpload> list = this.list(queryWrapper);
 
         if(list != null && list.size() >0){
             for (SceneUpload sceneUpload : list) {
                 try {
-                    uploadToOssUtil.delete(sceneUpload.getFileName());
+                    uploadToOssUtil.delete(sceneUpload.getFilePath());
                     this.removeEntity(sceneUpload);
                 }catch (Exception e){
-                    log.error(sceneUpload.getFileName()+"删除oss文件失败",e);
+                    log.error(sceneUpload.getFilePath()+"删除oss文件失败",e);
                 }
             }
         }
@@ -151,8 +142,8 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
     private void saveData(String sceneCode, String ossPath, String prefix,Long userId) {
         SceneUpload sceneUpload = new SceneUpload();
         sceneUpload.setNum(sceneCode);
-        sceneUpload.setFileName(ossPath);
-        sceneUpload.setFilePrefix(prefix);
+        sceneUpload.setFilePath(ossPath);
+        sceneUpload.setBlzType(prefix);
         sceneUpload.setUploadUser(userId);
         this.save(sceneUpload);
     }