上传富文本视频

gis_common/src/main/java/com/gis/common/util/AliyunOssUtil.java

@@ -1,6 +1,7 @@
 package com.gis.common.util;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.OSSObject;
 import com.aliyun.oss.model.OSSObjectSummary;
@@ -28,15 +29,11 @@ import java.util.Map;
  */
 @Slf4j
 @Component
-public class AliyunOssUtil {
+public class AliYunOssUtil {
 
     @Autowired
     ConfigConstant configConstant;
 
-//    @Autowired
-//    FileUtils fileUtils;
-
-
     /**
      * 初始化
      */
@@ -100,6 +97,51 @@ public class AliyunOssUtil {
         return null;
     }
 
+    /***
+     * 直接上传字节，适合小文件, 以拼音命名，相同文字会覆盖
+     * @param file
+     * @param dir 存放目录 ，结尾需要带斜杠
+     * @param limitSize 限制文件大小，单位是Mb
+     * @return
+     */
+    public Map<String, Object> uploadPinYingByByte(MultipartFile file, String dir, Integer limitSize) {
+
+        // 检查非法文件上传
+        boolean checkFile = FileUtils.checkFile(file);
+        if (!checkFile) {
+            throw new BaseRuntimeException("非法文件, 请重新上传");
+        }
+
+        // 判断文件大小
+        if (limitSize != null){
+            long size = file.getSize()/1024;
+            if (size > limitSize) {
+                String msg = StrUtil.format("文件上传最大为{}MB", limitSize);
+                log.error(msg);
+                throw new BaseRuntimeException(msg);
+            }
+        }
+
+
+        String originalFilename = file.getOriginalFilename();
+        String pinyinName = RegexUtil.getPinyinName(originalFilename);
+        try {
+            String filePath = dir  + pinyinName;
+            String ossPath = configConstant.ossBasePath + filePath;
+            this.upload(file.getBytes(), ossPath);
+            String ossUrl = configConstant.ossDomain + ossPath;
+            HashMap<String, Object> result = new HashMap<>();
+            result.put("fileName", originalFilename);
+            result.put("ossUrl", ossUrl);
+            result.put("ossPath", ossPath);
+            log.info("上传oss完成: {}", ossUrl);
+            return result;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
 
     public void upload(String filePath, String key) {
         OSSClient ossClient = init();

gis_common/src/main/java/com/gis/common/util/FileUtils.java

@@ -228,6 +228,8 @@ public class FileUtils {
         return false;
     }
 
+
+
     /** 返回时间戳名字*/
     public static String getTimeName(MultipartFile file){
         String time = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");

gis_domain/src/main/java/com/gis/domain/dto/AnswerDto.java

@@ -1,7 +1,6 @@
 package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 
 /**
@@ -13,7 +12,7 @@ public class AnswerDto{
     @ApiModelProperty(value = "题号" )
     private Integer num;
 
-    @ApiModelProperty(value = "答案" )
+    @ApiModelProperty(value = "答案, a,b,c" )
     private String answer;
 
 }

gis_domain/src/main/java/com/gis/domain/dto/CountAnswerDto.java

@@ -22,6 +22,7 @@ public class CountAnswerDto {
     @ApiModelProperty(value = "手机号" )
     private String phone;
 
+    @ApiModelProperty(value = "答案， 多选题就提交多组题号+答案" )
     private List<AnswerDto> answer;
 
 //    @ApiModelProperty(value = "答案数量" )

gis_service/src/main/java/com/gis/service/ActivityService.java

@@ -30,4 +30,6 @@ public interface ActivityService extends IBaseService<ActivityEntity, Long> {
     Result upload(MultipartFile file, String code);
 
     List<SearchVo> searchLike(String searchKey);
+
+    Result uploadVideo(MultipartFile file);
 }

gis_service/src/main/java/com/gis/service/ExhibitionService.java

@@ -33,4 +33,6 @@ public interface ExhibitionService extends IBaseService<ExhibitionEntity, Long>
     void checkStatus();
 
     List<SearchVo> searchLike(String searchKey);
+
+    Result uploadVideo(MultipartFile file);
 }

gis_service/src/main/java/com/gis/service/NewsService.java

@@ -33,4 +33,6 @@ public interface NewsService extends IBaseService<NewsEntity, Long> {
     Result addVisit(Long id);
 
     List<SearchVo> searchLike(String searchKey);
+
+    Result uploadVideo(MultipartFile file);
 }

gis_service/src/main/java/com/gis/service/impl/ActivityServiceImpl.java

@@ -2,7 +2,7 @@ package com.gis.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.gis.common.constant.ConfigConstant;
-import com.gis.common.util.AliyunOssUtil;
+import com.gis.common.util.AliYunOssUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.ActivityDto;
 import com.gis.domain.dto.TypePageDto;
@@ -22,7 +22,6 @@ import tk.mybatis.mapper.entity.Condition;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -44,7 +43,7 @@ public class ActivityServiceImpl extends IBaseServiceImpl<ActivityEntity, Long>
     HttpServletRequest request;
 
     @Autowired
-    AliyunOssUtil aliyunOssUtil;
+    AliYunOssUtil aliyunOssUtil;
 
     @Override
     public IBaseMapper<ActivityEntity, Long> getBaseMapper() {
@@ -134,6 +133,12 @@ public class ActivityServiceImpl extends IBaseServiceImpl<ActivityEntity, Long>
     }
 
     @Override
+    public Result uploadVideo(MultipartFile file) {
+        Map<String, Object> result = aliyunOssUtil.uploadPinYingByByte(file, "activity/video/", 500);
+        return Result.success(result);
+    }
+
+    @Override
     public List<SearchVo> searchLike(String searchKey) {
         return entityMapper.searchLike(searchKey);
     }

gis_service/src/main/java/com/gis/service/impl/BookServiceImpl.java

@@ -1,11 +1,10 @@
 package com.gis.service.impl;
 
-import com.gis.common.util.AliyunOssUtil;
+import com.gis.common.util.AliYunOssUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.BookDto;
 import com.gis.domain.dto.PageDto;
 import com.gis.domain.po.BookEntity;
-import com.gis.domain.po.NewsEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.BookMapper;
 import com.gis.service.BookService;
@@ -32,7 +31,7 @@ public class BookServiceImpl extends IBaseServiceImpl<BookEntity, Long> implemen
     private BookMapper entityMapper;
 
     @Autowired
-    AliyunOssUtil aliyunOssUtil;
+    AliYunOssUtil aliyunOssUtil;
 
     @Override
     public IBaseMapper<BookEntity, Long> getBaseMapper() {

gis_service/src/main/java/com/gis/service/impl/ExhibitionServiceImpl.java

@@ -3,7 +3,7 @@ package com.gis.service.impl;
 import cn.hutool.core.date.DateUtil;
 import com.gis.common.constant.MsgCode;
 import com.gis.common.constant.TypeCode;
-import com.gis.common.util.AliyunOssUtil;
+import com.gis.common.util.AliYunOssUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.ExhibitionDto;
 import com.gis.domain.dto.TypePageDto;
@@ -24,9 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Condition;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -51,7 +49,7 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
     HttpServletRequest request;
 
     @Autowired
-    AliyunOssUtil aliyunOssUtil;
+    AliYunOssUtil aliyunOssUtil;
 
     @Autowired
     FileService fileService;
@@ -124,6 +122,13 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
         return Result.success(result);
     }
 
+
+    @Override
+    public Result uploadVideo(MultipartFile file) {
+        Map<String, Object> result = aliyunOssUtil.uploadPinYingByByte(file, "exhibition/video/", 500);
+        return Result.success(result);
+    }
+
     @Override
     public Result remove(Long id) {
         ExhibitionEntity entity = this.findById(id);
@@ -230,4 +235,6 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
         return entityMapper.searchLike(searchKey);
     }
 
+
+
 }

gis_service/src/main/java/com/gis/service/impl/FileServiceImpl.java

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.common.util.AliyunOssUtil;
+import com.gis.common.util.AliYunOssUtil;
 import com.gis.common.util.RegexUtil;
 import com.gis.domain.po.FileEntity;
 import com.gis.mapper.FileMapper;
@@ -32,7 +32,7 @@ public class FileServiceImpl extends IBaseServiceImpl<FileEntity, Long> implemen
     HttpServletRequest request;
 
     @Autowired
-    AliyunOssUtil aliyunOssUtil;
+    AliYunOssUtil aliyunOssUtil;
 
 
     @Override

gis_service/src/main/java/com/gis/service/impl/GoodsServiceImpl.java

@@ -1,11 +1,6 @@
 package com.gis.service.impl;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.extra.pinyin.PinyinUtil;
-import com.gis.common.util.AliyunOssUtil;
-import com.gis.common.util.FileUtils;
-import com.gis.common.util.RegexUtil;
+import com.gis.common.util.AliYunOssUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.GoodsDto;
 import com.gis.domain.dto.GoodsPageDto;
@@ -15,17 +10,12 @@ import com.gis.mapper.GoodsMapper;
 import com.gis.mapper.IBaseMapper;
 import com.gis.service.GoodsService;
 import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -48,7 +38,7 @@ public class GoodsServiceImpl extends IBaseServiceImpl<GoodsEntity, Long> implem
     HttpServletRequest request;
 
     @Autowired
-    AliyunOssUtil aliyunOssUtil;
+    AliYunOssUtil aliyunOssUtil;
 
 
 

gis_service/src/main/java/com/gis/service/impl/GuideServiceImpl.java

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.common.util.AliyunOssUtil;
+import com.gis.common.util.AliYunOssUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.GuideDto;
 import com.gis.domain.po.GuideEntity;
@@ -12,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.List;
 
 
 /**
@@ -25,7 +24,7 @@ public class GuideServiceImpl extends IBaseServiceImpl<GuideEntity, Long> implem
     private GuideMapper entityMapper;
 
     @Autowired
-    AliyunOssUtil aliyunOssUtil;
+    AliYunOssUtil aliyunOssUtil;
 
     @Override
     public IBaseMapper<GuideEntity, Long> getBaseMapper() {

gis_service/src/main/java/com/gis/service/impl/MuseumInfoServiceImpl.java

@@ -1,29 +1,20 @@
 package com.gis.service.impl;
 
-import com.gis.common.constant.TypeCode;
-import com.gis.common.util.AliyunOssUtil;
+import com.gis.common.util.AliYunOssUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.MuseumInfoDto;
-import com.gis.domain.dto.NewsDto;
-import com.gis.domain.dto.PageDto;
-import com.gis.domain.po.FileEntity;
 import com.gis.domain.po.MuseumInfoEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.MuseumInfoMapper;
 import com.gis.service.FileService;
 import com.gis.service.MuseumInfoService;
-import com.github.pagehelper.PageInfo;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import tk.mybatis.mapper.entity.Condition;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 
@@ -45,7 +36,7 @@ public class MuseumInfoServiceImpl extends IBaseServiceImpl<MuseumInfoEntity, Lo
     HttpServletRequest request;
 
     @Autowired
-    AliyunOssUtil aliyunOssUtil;
+    AliYunOssUtil aliyunOssUtil;
 
     @Autowired
     FileService fileService;

gis_service/src/main/java/com/gis/service/impl/NewsServiceImpl.java

@@ -1,14 +1,11 @@
 package com.gis.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import com.gis.common.constant.TypeCode;
-import com.gis.common.util.AliyunOssUtil;
+import com.gis.common.util.AliYunOssUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.NewsDto;
-import com.gis.domain.dto.PageDto;
 import com.gis.domain.dto.TypePageDto;
 import com.gis.domain.po.NewsEntity;
-import com.gis.domain.po.FileEntity;
 import com.gis.domain.vo.SearchVo;
 import com.gis.mapper.NewsMapper;
 import com.gis.mapper.IBaseMapper;
@@ -24,7 +21,6 @@ import tk.mybatis.mapper.entity.Condition;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -47,7 +43,7 @@ public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implemen
     HttpServletRequest request;
 
     @Autowired
-    AliyunOssUtil aliyunOssUtil;
+    AliYunOssUtil aliyunOssUtil;
 
     @Autowired
     FileService fileService;
@@ -127,6 +123,12 @@ public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implemen
     }
 
     @Override
+    public Result uploadVideo(MultipartFile file) {
+        Map<String, Object> result = aliyunOssUtil.uploadPinYingByByte(file, "news/video/", 500);
+        return Result.success(result);
+    }
+
+    @Override
     public Result addVisit(Long id) {
         return entityMapper.addVisit(id);
     }

gis_service/src/main/java/com/gis/service/impl/OnlineExhibitionServiceImpl.java

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.common.util.AliyunOssUtil;
+import com.gis.common.util.AliYunOssUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.po.OnlineExhibitionEntity;
 import com.gis.mapper.IBaseMapper;
@@ -22,7 +22,7 @@ public class OnlineExhibitionServiceImpl extends IBaseServiceImpl<OnlineExhibiti
     private OnlineExhibitionMapper entityMapper;
 
     @Autowired
-    AliyunOssUtil aliyunOssUtil;
+    AliYunOssUtil aliyunOssUtil;
 
     @Override
     public IBaseMapper<OnlineExhibitionEntity, Long> getBaseMapper() {

gis_service/src/main/java/com/gis/service/impl/ProfileServiceImpl.java

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.common.util.AliyunOssUtil;
+import com.gis.common.util.AliYunOssUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.ProfileDto;
 import com.gis.domain.po.ProfileEntity;
@@ -10,11 +10,9 @@ import com.gis.service.ProfileService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -27,7 +25,7 @@ public class ProfileServiceImpl extends IBaseServiceImpl<ProfileEntity, Long> im
     private ProfileMapper entityMapper;
 
     @Autowired
-    AliyunOssUtil aliyunOssUtil;
+    AliYunOssUtil aliyunOssUtil;
 
     @Override
     public IBaseMapper<ProfileEntity, Long> getBaseMapper() {

gis_service/src/main/java/com/gis/service/impl/SlideshowServiceImpl.java

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.common.util.AliyunOssUtil;
+import com.gis.common.util.AliYunOssUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.SlideshowDto;
 import com.gis.domain.po.SlideshowEntity;
@@ -27,7 +27,7 @@ public class SlideshowServiceImpl extends IBaseServiceImpl<SlideshowEntity, Long
     private SlideshowMapper entityMapper;
 
     @Autowired
-    AliyunOssUtil aliyunOssUtil;
+    AliYunOssUtil aliyunOssUtil;
 
     @Override
     public IBaseMapper<SlideshowEntity, Long> getBaseMapper() {

gis_web/src/main/java/com/gis/web/controller/ActivityController.java

@@ -63,4 +63,10 @@ public class ActivityController extends BaseController {
         return activityService.upload(file, code);
     }
 
+
+    @ApiOperation(value = "上传富文本视频", notes = "以拼音命名， 重名覆盖")
+    @PostMapping("uploadVideo")
+    public Result uploadVideo(MultipartFile file) {
+        return activityService.uploadVideo(file);
+    }
 }

gis_web/src/main/java/com/gis/web/controller/ExhibitionController.java

@@ -60,6 +60,12 @@ public class ExhibitionController extends BaseController {
         return entityService.upload(file, code);
     }
 
+    @ApiOperation(value = "上传富文本视频", notes = "以拼音命名， 重名覆盖")
+    @PostMapping("uploadVideo")
+    public Result uploadVideo(MultipartFile file) {
+        return entityService.uploadVideo(file);
+    }
+
     @WebControllerLog(description = "展览资讯-图片置顶", addDb = true)
     @ApiOperation(value = "图片置顶")
     @GetMapping("setIndex/{fileId}")

gis_web/src/main/java/com/gis/web/controller/GuideController.java

@@ -50,11 +50,6 @@ public class GuideController extends BaseController {
     }
 
 
-//    @ApiOperation(value = "上传", notes = "重命名文件")
-//    @PostMapping("upload")
-//    public Result upload(MultipartFile file) {
-//        return entityService.upload(file);
-//    }
 
 
 

gis_web/src/main/java/com/gis/web/controller/NewsController.java

@@ -70,6 +70,12 @@ public class NewsController extends BaseController {
         return entityService.upload(file, code);
     }
 
+    @ApiOperation(value = "上传富文本视频", notes = "以拼音命名， 重名覆盖")
+    @PostMapping("uploadVideo")
+    public Result uploadVideo(MultipartFile file) {
+        return entityService.uploadVideo(file);
+    }
+
 
 
 

gis_web/src/main/java/com/gis/web/controller/OnlineExhibitionController.java

@@ -35,11 +35,7 @@ public class OnlineExhibitionController extends BaseController {
     }
 
 
-//    @ApiOperation(value = "删除", notes = "db数据软删除， 物理数据真删除")
-//    @GetMapping("remove/{id}")
-//    public Result remove(@PathVariable Long id) {
-//        return entityService.remove(id);
-//    }
+
 
     @WebControllerLog(description = "线上展览-详情")
     @ApiOperation(value = "详情")
@@ -53,11 +49,7 @@ public class OnlineExhibitionController extends BaseController {
     }
 
 
-//    @ApiOperation(value = "上传", notes = "重命名文件")
-//    @PostMapping("upload")
-//    public Result upload(MultipartFile file) {
-//        return entityService.upload(file);
-//    }
+
 
 
 

gis_web/src/main/java/com/gis/web/controller/ProfileController.java

@@ -62,11 +62,7 @@ public class ProfileController extends BaseController {
     }
 
 
-//    @ApiOperation(value = "上传", notes = "重命名文件")
-//    @PostMapping("upload")
-//    public Result upload(MultipartFile file) {
-//        return entityService.upload(file);
-//    }
+