lyhzzz 1 hete
szülő
commit
a2dd0c6c1a

+ 2 - 0
src/main/java/com/fdkankan/fusion/entity/CaseOverview.java

@@ -88,4 +88,6 @@ public class CaseOverview implements Serializable {
     @TableField(exist = false)
     private CaseTabulation caseTabulation;
 
+    @TableField(exist = false)
+    private String fileDir;
 }

+ 3 - 0
src/main/java/com/fdkankan/fusion/entity/CaseTabulation.java

@@ -91,4 +91,7 @@ public class CaseTabulation implements Serializable {
 
     @TableField("platform_id")
     private Integer platformId;
+
+    @TableField(exist = false)
+    private String fileDir;
 }

+ 0 - 1
src/main/java/com/fdkankan/fusion/entity/CommonUpload.java

@@ -71,5 +71,4 @@ public class CommonUpload implements Serializable {
     @TableField("gcj02")
     private String gcj02;
 
-
 }

+ 1 - 1
src/main/java/com/fdkankan/fusion/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"fusion", getTables(new String[]{
-               "t_scene_file_build"
+               "t_upload_file"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

+ 3 - 0
src/main/java/com/fdkankan/fusion/service/ICommonUploadService.java

@@ -6,6 +6,7 @@ import com.fdkankan.fusion.entity.CommonUpload;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -30,4 +31,6 @@ public interface ICommonUploadService extends IService<CommonUpload> {
     List<CommonUpload> getDelData();
 
     void delByIds(List<Integer> ids);
+
+    HashMap<String, CommonUpload> getByUrls(List<String> collect);
 }

+ 16 - 0
src/main/java/com/fdkankan/fusion/service/impl/CaseOverviewServiceImpl.java

@@ -5,17 +5,22 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.entity.CaseOverview;
+import com.fdkankan.fusion.entity.CaseTabulation;
+import com.fdkankan.fusion.entity.CommonUpload;
 import com.fdkankan.fusion.mapper.ICaseOverviewMapper;
 import com.fdkankan.fusion.request.CaseOverviewParam;
 import com.fdkankan.fusion.service.ICaseOverviewService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.fusion.service.ICaseTabulationService;
+import com.fdkankan.fusion.service.ICommonUploadService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -32,6 +37,8 @@ public class CaseOverviewServiceImpl extends ServiceImpl<ICaseOverviewMapper, Ca
 
     @Autowired
     ICaseTabulationService caseTabulationService;
+    @Autowired
+    ICommonUploadService commonUploadService;
 
     @Override
     public Object pageList(CaseOverviewParam param) {
@@ -41,6 +48,15 @@ public class CaseOverviewServiceImpl extends ServiceImpl<ICaseOverviewMapper, Ca
         }
         wrapper.orderByDesc(CaseOverview::getId);
         Page<CaseOverview> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+
+        List<String> collect = page.getRecords().stream().map(CaseOverview::getListCover).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+        HashMap<String, CommonUpload> map = commonUploadService.getByUrls(collect);
+        for (CaseOverview record : page.getRecords()) {
+            CommonUpload commonUpload = map.get(record.getListCover());
+            if(commonUpload != null){
+                record.setFileDir(commonUpload.getUnzipPath());
+            }
+        }
         return PageInfo.PageInfo(page);
     }
 

+ 14 - 1
src/main/java/com/fdkankan/fusion/service/impl/CaseTabulationServiceImpl.java

@@ -6,17 +6,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.entity.CaseOverview;
 import com.fdkankan.fusion.entity.CaseTabulation;
+import com.fdkankan.fusion.entity.CommonUpload;
 import com.fdkankan.fusion.mapper.ICaseTabulationMapper;
 import com.fdkankan.fusion.request.CaseOverviewParam;
 import com.fdkankan.fusion.service.ICaseFilesService;
 import com.fdkankan.fusion.service.ICaseOverviewService;
 import com.fdkankan.fusion.service.ICaseTabulationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.fusion.service.ICommonUploadService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -33,7 +37,8 @@ public class CaseTabulationServiceImpl extends ServiceImpl<ICaseTabulationMapper
     ICaseFilesService caseFilesService;
     @Autowired
     ICaseOverviewService caseOverviewService;
-
+    @Autowired
+    ICommonUploadService commonUploadService;
     @Override
     public Object pageList(CaseOverviewParam param) {
         LambdaQueryWrapper<CaseTabulation> wrapper = new LambdaQueryWrapper<>();
@@ -43,6 +48,14 @@ public class CaseTabulationServiceImpl extends ServiceImpl<ICaseTabulationMapper
         }
         wrapper.orderByDesc(CaseTabulation::getId);
         Page<CaseTabulation> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        List<String> collect = page.getRecords().stream().map(CaseTabulation::getListCover).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+        HashMap<String, CommonUpload> map = commonUploadService.getByUrls(collect);
+        for (CaseTabulation record : page.getRecords()) {
+            CommonUpload commonUpload = map.get(record.getListCover());
+            if(commonUpload != null){
+                record.setFileDir(commonUpload.getUnzipPath());
+            }
+        }
         return PageInfo.PageInfo(page);
     }
 

+ 14 - 0
src/main/java/com/fdkankan/fusion/service/impl/CommonUploadServiceImpl.java

@@ -2,6 +2,7 @@ package com.fdkankan.fusion.service.impl;
 
 
 import cn.hutool.core.io.FileUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.fusion.common.OssPath;
 import com.fdkankan.fusion.common.ResultCode;
@@ -314,4 +315,17 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
     public void delByIds(List<Integer> ids) {
          this.getBaseMapper().delByIds(ids);
     }
+
+    @Override
+    public HashMap<String, CommonUpload> getByUrls(List<String> collect) {
+        HashMap<String, CommonUpload> map = new HashMap<>();
+        if(collect == null || collect.isEmpty()){
+            return map;
+        }
+        LambdaQueryWrapper<CommonUpload> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(CommonUpload::getFileUrl,collect);
+        List<CommonUpload> list = this.list(wrapper);
+        list.forEach(e -> map.put(e.getFileUrl(),e));
+        return map;
+    }
 }

+ 11 - 0
src/main/java/com/fdkankan/fusion/service/impl/UploadService.java

@@ -3,11 +3,15 @@ package com.fdkankan.fusion.service.impl;
 import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.OssPath;
 import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.common.enums.FileTypeEnum;
 import com.fdkankan.fusion.common.util.*;
 import com.fdkankan.fusion.common.util.LocalToOssUtil;
 import com.fdkankan.fusion.config.CacheUtil;
+import com.fdkankan.fusion.entity.CommonUpload;
 import com.fdkankan.fusion.exception.BusinessException;
+import com.fdkankan.fusion.service.ICommonUploadService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.language.Nysiis;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -38,6 +42,8 @@ public class UploadService {
     private String queryPath;
     @Value("${spring.profiles.active}")
     private String environment;
+    @Autowired
+    ICommonUploadService commonUploadService;
 
     public String uploadFile(MultipartFile file, Integer videoFolderId) {
         if(file.isEmpty()){
@@ -99,6 +105,11 @@ public class UploadService {
             }
             file.transferTo(localFile);
             //localToOssUtil.uploadOss(localFile.getPath(),ossPath);
+            String format = suffixName.replace(".", "");
+            FileTypeEnum fileTypeEnum = FileTypeEnum.getByType(format);
+
+            commonUploadService.add(fileName.replace(suffixName, ""), CacheUtil.mapping + ossPath,
+                    String.valueOf(file.getSize()), uuid, fileTypeEnum, format,format,1,localFile.getPath(), null);
             return CacheUtil.mapping + ossPath;
         }catch (Exception e){
             log.info("upload-error:{}",e);