From f3876737d7cb28897e16758e756d9bab357ddebd Mon Sep 17 00:00:00 2001 From: gjq Date: Mon, 20 Dec 2021 18:14:18 +0800 Subject: [PATCH] ... --- .../controller/ContentController.java | 4 + .../controller/OssUploadController.java | 69 ++++--- src/main/java/com/nbclass/vo/base/Result.java | 18 +- .../resources/templates/content/edit2.html | 181 ++++++++++++++++-- src/main/resources/templates/index/index.html | 2 + 5 files changed, 234 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/nbclass/activity/controller/ContentController.java b/src/main/java/com/nbclass/activity/controller/ContentController.java index 20a65a6..375c8e4 100644 --- a/src/main/java/com/nbclass/activity/controller/ContentController.java +++ b/src/main/java/com/nbclass/activity/controller/ContentController.java @@ -303,6 +303,10 @@ public class ContentController extends BaseController { } } } + if(entity.getAttachment()!=null){ + String s = JSON.toJSONString(entity.getAttachment()); + entity.setAttachment(s); + } String desc = null; if(entity.getId()!=null && entity.getId()>0){ service.update(entity); diff --git a/src/main/java/com/nbclass/activity/controller/OssUploadController.java b/src/main/java/com/nbclass/activity/controller/OssUploadController.java index 39e881b..92b9d2a 100644 --- a/src/main/java/com/nbclass/activity/controller/OssUploadController.java +++ b/src/main/java/com/nbclass/activity/controller/OssUploadController.java @@ -1,9 +1,12 @@ package com.nbclass.activity.controller; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; +import java.util.List; +import com.nbclass.activity.model.OssFile; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -38,8 +41,8 @@ public class OssUploadController extends BaseController{ * @return */ @PostMapping("/uploadFile") - public Result fileUploadTest(@RequestParam(required=false, value="file")MultipartFile file, String caseType, String category){ - if(file==null || file.isEmpty()){ + public Result fileUploadTest(@RequestParam(required=false, value="file")MultipartFile[] file, String caseType, String category){ + if(file==null || file.length == 0){ throw new ParameterException("请选择文件"); } /*if(StringUtils.isBlank(caseType)) { @@ -55,38 +58,52 @@ public class OssUploadController extends BaseController{ throw new ParameterException("文件类别参数有误"); } try { - String suffix = "", ori_name = file.getOriginalFilename(); - if(StringUtils.isNotBlank(ori_name)){ - suffix = ori_name.substring(ori_name.lastIndexOf("."), ori_name.length()); - suffix = suffix.toLowerCase(); - } - if(("icon".equals(category)||"image".equals(category)) - && !Arrays. asList(Const.UPLOAD_IMAGE_SUFFIX.split(",")).contains(suffix)) { - throw new ParameterException("请上传正确的图片"); - } + List list = new ArrayList<>(); + for (MultipartFile multipartFile : file) { + if (multipartFile.isEmpty()) { + throw new ParameterException("上传文件失败"); + } - if("video".equals(category) && !Arrays. asList(Const.UPLOAD_VIDEO_SUFFIX.split(",")).contains(suffix)) { - throw new ParameterException("请上传正确的视频"); - } + String suffix = "", ori_name = multipartFile.getOriginalFilename(); + if (StringUtils.isNotBlank(ori_name)) { + suffix = ori_name.substring(ori_name.lastIndexOf("."), ori_name.length()); + suffix = suffix.toLowerCase(); + } + if (("icon".equals(category) || "image".equals(category)) + && !Arrays.asList(Const.UPLOAD_IMAGE_SUFFIX.split(",")).contains(suffix)) { + throw new ParameterException("请上传正确的图片"); + } - String daydir = CommonUtils.getSimpleDate(new Date(), "yyyyMM"); - if("icon".equals(category)) { // icon图上传一年1个目录 - daydir = CommonUtils.getSimpleDate(new Date(), "yyyy"); - }else if("video".equals(category)) { // 视频也是按一年1个目录 - daydir = CommonUtils.getSimpleDate(new Date(), "yyyy"); - } + if ("video".equals(category) && !Arrays.asList(Const.UPLOAD_VIDEO_SUFFIX.split(",")).contains(suffix)) { + throw new ParameterException("请上传正确的视频"); + } - String filename = CommonUtils.getSimpleDate(new Date(), "yyyyMMddHHmmss")+"_"+CommonUtils.getCode(5)+suffix; - // 组成的文件key eg. /casetype-h5/icons/xxx.jpg - String url = AliyunOSSUtils.uploadBytes("casetype-"+caseType+"/"+category+"s"+"/"+daydir, filename, file.getBytes()); + String daydir = CommonUtils.getSimpleDate(new Date(), "yyyyMM"); + if ("icon".equals(category)) { // icon图上传一年1个目录 + daydir = CommonUtils.getSimpleDate(new Date(), "yyyy"); + } else if ("video".equals(category)) { // 视频也是按一年1个目录 + daydir = CommonUtils.getSimpleDate(new Date(), "yyyy"); + } + + String filename = CommonUtils.getSimpleDate(new Date(), "yyyyMMddHHmmss") + "_" + CommonUtils.getCode(5) + suffix; + // 组成的文件key eg. /casetype-h5/icons/xxx.jpg + String url = AliyunOSSUtils.uploadBytes("casetype-" + caseType + "/" + category + "s" + "/" + daydir, filename, multipartFile.getBytes()); + OssFile ossFile = new OssFile(); + ossFile.setUrl(url); + ossFile.setOri_name(ori_name); + list.add(ossFile); + } JSONObject fileObj = new JSONObject(); - fileObj.put("url", url); - fileObj.put("ori_name", ori_name); - return Result.success(fileObj); +// fileObj.put("url", url); +// fileObj.put("ori_name", ori_name); + fileObj.put("list",list); + System.out.println(fileObj); + return Result.success2(fileObj); } catch (IOException e) { log.error("上传到OSS文件异常", e); return Result.error(e.getMessage()!=null ? e.getMessage() :"上传文件失败"); } + } } diff --git a/src/main/java/com/nbclass/vo/base/Result.java b/src/main/java/com/nbclass/vo/base/Result.java index 4b7dcfb..d2dfa96 100644 --- a/src/main/java/com/nbclass/vo/base/Result.java +++ b/src/main/java/com/nbclass/vo/base/Result.java @@ -18,6 +18,7 @@ public class Result { private String msg; private Object data; private Map map; + private Boolean success = true; public Result() { } @@ -28,13 +29,24 @@ public class Result { this.data = data; } + public Result(int ret,boolean success, Object data) { + this.ret = ret; + this.success = success; + this.data = data; + } + public static Result success() { return new Result(CoreConst.STATUS_SUCCESS, null, null); } - + public static Result success(Object data) { return new Result(CoreConst.STATUS_SUCCESS, null, data); } + + public static Result success2(Object data) { + return new Result(CoreConst.STATUS_SUCCESS,true, data); + } + public static Result success(Map map) { return new Result(CoreConst.STATUS_SUCCESS, null, map); } @@ -46,7 +58,7 @@ public class Result { public static Result error() { return new Result(CoreConst.STATUS_ERROR, null, null); } - + public static Result error(String msg) { return new Result(CoreConst.STATUS_ERROR, msg, null); } @@ -54,5 +66,5 @@ public class Result { public static Result error(int code, String msg) { return new Result(code, msg, null); } - + } diff --git a/src/main/resources/templates/content/edit2.html b/src/main/resources/templates/content/edit2.html index 698de06..dada74e 100644 --- a/src/main/resources/templates/content/edit2.html +++ b/src/main/resources/templates/content/edit2.html @@ -1,6 +1,95 @@ + + + +