canrd-outside / order-erp · Commits

Commit b51d8686d42a75be78583fd337890e6d8fb22d8b

Authored by 谢茂盛
1 parent 8c31cb74
build: skipped

feat: ERP升级 

1、文件上传
Inline Side-by-side
Showing 4 changed files with 36 additions and 1 deletions
src/main/java/com/order/erp/controller/LocalStorageController.java
  View file @b51d868
... ... @@ -31,11 +31,18 @@ public class LocalStorageController {
31 31 return localStorageService.create(name, file);
32 32 }
33 33  
34   - @ApiOperation("上传文件到oss服务")
  34 + @ApiOperation("上传图片到oss服务")
35 35 @PostMapping(value = "/upload_oss")
36 36 @AnonymousAccess
37 37 public ServerResult upload2oss(@RequestParam String name, @RequestParam("file") MultipartFile file) {
38 38 return localStorageService.uploadByAliOss(name, file);
39 39 }
40 40  
  41 + @ApiOperation("上传文件到oss服务")
  42 + @PostMapping(value = "/upload_file_oss")
  43 + @AnonymousAccess
  44 + public ServerResult uploadFile2oss(@RequestParam String name, @RequestParam("file") MultipartFile file) {
  45 + return localStorageService.uploadFileByAliOss(name, file);
  46 + }
  47 +
41 48 }
42 49 \ No newline at end of file
... ...
src/main/java/com/order/erp/service/LocalStorageService.java
  View file @b51d868
... ... @@ -24,6 +24,14 @@ public interface LocalStorageService extends IService<LocalStorageDO> {
24 24 */
25 25 ServerResult uploadByAliOss(String name, MultipartFile file);
26 26  
  27 + /**
  28 + *
  29 + * @param name
  30 + * @param file
  31 + * @return
  32 + */
  33 + ServerResult uploadFileByAliOss(String name, MultipartFile file);
  34 +
27 35 ServerResult create(String name, MultipartFile file);
28 36  
29 37 /**
... ...
src/main/java/com/order/erp/service/impl/LocalStorageServiceImpl.java
  View file @b51d868
... ... @@ -51,6 +51,24 @@ public class LocalStorageServiceImpl extends ServiceImpl<LocalStorageMapper, Loc
51 51 private long maxSize;
52 52  
53 53 @Override
  54 + public ServerResult uploadFileByAliOss(String name, MultipartFile file) {
  55 + FileUtil.checkSize(maxSize, file.getSize());
  56 + String fileName = AliOssUtil.getUniqueFileName(name);
  57 + String tempFileName = "Thumbnails" + Constant.CROSS_BAR_CHARACTER + fileName;
  58 + ImageRespVO imageRespVO = new ImageRespVO();
  59 + try {
  60 + File tempFile = new File(path + "files" + File.separator + tempFileName);
  61 + if (AliOssUtil.upload(AliOssConfig.ALIYUN_BUCKET, fileName, file.getBytes())) {
  62 + FileUtil.del(tempFile);
  63 + }
  64 + return ServerResult.success(imageRespVO);
  65 + } catch (Exception e) {
  66 + log.error("上传文件异常：{}", e.getMessage());
  67 + throw new BusinessException(ServerResultCode.UPLOAD_IMAGES_ERROR);
  68 + }
  69 + }
  70 +
  71 + @Override
54 72 public ServerResult uploadByAliOss(String name, MultipartFile file) {
55 73 FileUtil.checkSize(maxSize, file.getSize());
56 74 String fileName = AliOssUtil.getUniqueFileName(name);
... ...
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
  View file @b51d868
... ... @@ -20,6 +20,7 @@ import com.order.erp.common.utils.TransactionHelper;
20 20 import com.order.erp.config.DataScope;
21 21 import com.order.erp.domain.ApplyStatusEnum;
22 22 import com.order.erp.domain.ApplyTypeEnum;
  23 +import com.order.erp.domain.RoleEnum;
23 24 import com.order.erp.domain.dto.BaseDO;
24 25 import com.order.erp.domain.dto.SystemSettingDO;
25 26 import com.order.erp.domain.dto.order.*;
... ... @@ -681,6 +682,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl<InvoiceBillOrderMap
681 682 .type(ApplyTypeEnum.INVOICE_BILL_APPLY.getType())
682 683 .remark(ApplyTypeEnum.INVOICE_BILL_APPLY.getDesc())
683 684 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
  685 + .auditRoleCodes(RoleEnum.BUSINESS_USER.getCode() + Constant.COMMA_CHARACTER + RoleEnum.ADMIN.getCode())
684 686 .build();
685 687 }
686 688  
... ...