diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java index 7ae8dd7c4..b39a9833c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java @@ -17,7 +17,7 @@ public interface IOSSFileService extends IService { * @param bizPath 自定义路径 * @return */ - public OSSFile uploadLocal(MultipartFile mf, String bizPath,String state); + public OSSFile uploadLocal(MultipartFile mf, String bizPath,String state,String cut); public List getFileInfos(String id); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index ad3c0c277..6f4c3c676 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.oss.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.CommonUtils; @@ -57,13 +58,17 @@ public class OSSFileServiceImpl extends ServiceImpl impl * @return */ @Override - public OSSFile uploadLocal(MultipartFile mf, String bizPath,String state) { + public OSSFile uploadLocal(MultipartFile mf, String bizPath,String state,String cut) { //处理文件大小,大于100M抛出异常 long fileSize = mf.getSize() / 1024 / 1024; String originalFilename = mf.getOriginalFilename(); if (fileSize >= 100) { - throw new JeroBootException(originalFilename + "文件大小超出100MB限制, 请压缩或降低文件质量!"); + if(cut.equals(CutEnum.CN.getValue())){ + throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); + }else{ + throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); + } } OSSFile oSSFile = new OSSFile(); @@ -89,11 +94,19 @@ public class OSSFileServiceImpl extends ServiceImpl impl if("1".equals(state)){ //固定文件 if(!fileTypeStr.contains(fileType)){ - throw new JeroBootException("只能够上传pdf,word,excel类型的文件。请重新选择文件!"); + if(cut.equals(CutEnum.CN.getValue())){ + throw new JeroBootException("只能够上传pdf,word,excel类型的文件。请重新选择文件!"); + }else{ + throw new JeroBootException("Only upload pdf,word,excel type of file Please select the file again!"); + } } }else{ if (CommonUtils.limitFileSuffix(orgName, fileSuffixLimits)) { - throw new JeroBootException("不能上传"+StringUtils.join(fileSuffixLimits, ",")+"类型的文件。请重新选择文件!"); + if(cut.equals(CutEnum.CN.getValue())){ + throw new JeroBootException("不能上传"+StringUtils.join(fileSuffixLimits, ",")+"类型的文件。请重新选择文件!"); + }else{ + throw new JeroBootException("Can't upload"+StringUtils.join(fileSuffixLimits, ",")+"type of file Please select the file again!"); + } } } @@ -109,9 +122,12 @@ public class OSSFileServiceImpl extends ServiceImpl impl } } if (flag) { - throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件!"); + if(cut.equals(CutEnum.CN.getValue())){ + throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件!"); + }else{ + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件!"); + } } - } String savePath = file.getPath() + File.separator + fileName; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java index 46d39cbda..2552347cb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.util.RestUtil; @@ -150,7 +151,8 @@ public class CommonController { @ApiOperation(value="文件上传统一方法", notes="文件上传统一方法") @PostMapping(value = "/upload") public Result upload(HttpServletRequest request, HttpServletResponse response, - @RequestParam(value = "state",required = false) String state) { + @RequestParam(value = "state",required = false) String state, + @RequestParam(value = "cut",required = false) String cut) { Result result = new Result<>(); String bizPath = request.getParameter("biz"); MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; @@ -163,12 +165,16 @@ public class CommonController { bizPath = ""; } } - OSSFile oSSFile = ossFileService.uploadLocal(file, bizPath,state); + OSSFile oSSFile = ossFileService.uploadLocal(file, bizPath,state,cut); if (oConvertUtils.isNotEmpty(oSSFile)) { result.setResult(oSSFile); result.setSuccess(true); } else { - result.setMessage("上传失败!"); + if("cut".equals(CutEnum.CN.getValue())){ + result.setMessage("上传失败!"); + }else{ + result.setMessage("fail to upload!"); + } result.setSuccess(false); } return result; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index d37450c3e..31a17ee3e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -4030,7 +4030,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public IPage queryPageList(Map params) { + return null; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 7c0ca1533..792236ad1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -1109,7 +1109,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl