From 37c4294055b75cb5e5a97a24b7605e4316b09d90 Mon Sep 17 00:00:00 2001 From: YXY <932687738@qq.com> Date: Thu, 24 Aug 2023 21:14:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=A2=9E=E5=8A=A0=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E5=92=8C=E6=97=B6=E9=97=B4=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/flyingbook/CosHelper/CosHelper.java | 2 +- .../flyingbook/controller/LarkActiveController.java | 2 +- .../domain/larkactive/LarkActiveCommentVo.java | 1 + .../service/ILarkUserActiveRelatoinService.java | 2 +- .../impl/LarkUserActiveCommentServiceImpl.java | 1 + .../impl/LarkUserActiveRelatoinServiceImpl.java | 12 ++++++++---- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/CosHelper/CosHelper.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/CosHelper/CosHelper.java index 74bd927..d064f6d 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/CosHelper/CosHelper.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/CosHelper/CosHelper.java @@ -75,7 +75,7 @@ public class CosHelper { Map headers = new HashMap(); HttpMethodName method = HttpMethodName.GET; URL url = cosClient.generatePresignedUrl(bucketName, key, expirationDate, method, headers, params); - System.out.println(url.toString()); + return url.toString(); }catch (Exception e){ log.info("upload file error",e); }finally { diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/LarkActiveController.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/LarkActiveController.java index 1955b5c..3cef7ce 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/LarkActiveController.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/LarkActiveController.java @@ -97,7 +97,7 @@ public class LarkActiveController extends BaseController { * 上传活动图片 */ @PostMapping("/uploadActiveFile") - public ResponseVo uploadActiveFile(@RequestBody LarkActiveUserRelationRequest request) { + public ResponseVo uploadActiveFile(@RequestBody LarkActiveUserRelationRequest request) { return larkUserActiveRelatoinService.commitFile(request); } diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveCommentVo.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveCommentVo.java index 389b66b..b97d7a0 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveCommentVo.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveCommentVo.java @@ -15,5 +15,6 @@ public class LarkActiveCommentVo extends LarkUserActiveComment { private String userName; private String image; + private String dateStr; } diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveRelatoinService.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveRelatoinService.java index 267010c..ad524ed 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveRelatoinService.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveRelatoinService.java @@ -33,7 +33,7 @@ public interface ILarkUserActiveRelatoinService { public List selectLarkUserActiveRelatoinList(LarkUserActiveRelatoin larkUserActiveRelatoin); public ResponseVo queryPage(LarkActiveUserRelationRequest request); - public ResponseVo commitFile(LarkActiveUserRelationRequest request); + public ResponseVo commitFile(LarkActiveUserRelationRequest request); public ResponseVo submit(LarkActiveUserRelationRequest request); /** diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveCommentServiceImpl.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveCommentServiceImpl.java index fce2ad8..98f99f7 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveCommentServiceImpl.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveCommentServiceImpl.java @@ -207,6 +207,7 @@ public class LarkUserActiveCommentServiceImpl implements ILarkUserActiveCommentS larkActiveCommentVo.setUserName(userInfo.getUserName()); larkActiveCommentVo.setImage(userInfo.getImageUrl()); larkActiveCommentVo.setRemark(r.getRemark()); + larkActiveCommentVo.setDateStr(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,r.getCreateTime())); } return larkActiveCommentVo; }).collect(Collectors.groupingBy(LarkActiveCommentVo::getRemark)); diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveRelatoinServiceImpl.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveRelatoinServiceImpl.java index 7dd5e8c..32c0c91 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveRelatoinServiceImpl.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveRelatoinServiceImpl.java @@ -195,18 +195,20 @@ public class LarkUserActiveRelatoinServiceImpl implements ILarkUserActiveRelatoi } @Override - public ResponseVo commitFile(LarkActiveUserRelationRequest request) { + public ResponseVo commitFile(LarkActiveUserRelationRequest request) { + ResponseVo responseVo = new ResponseVo(); List larkActives = larkActiveMapper.selectLarkActiveByName(request.getLarkActiveName(), FlagStatus.OK.getCode()); if (CollectionUtils.isEmpty(larkActives)){ - return new ResponseVo(); + return responseVo; } LarkActive active = larkActives.get(0); LarkUserActiveRelatoin relatoin = queryUserActiveRelation(request.getCompanyName(),request.getUserName(), active.getId()); if (relatoin == null) { - return new ResponseVo(); + return responseVo; } Integer totalCount = userActiveCount(relatoin,request.getImageBase64()) + 1; LarkActive larkActive = larkActiveMapper.selectLarkActiveById(relatoin.getActiveId()); + String url = null; if (StringUtils.isNotBlank(request.getImageBase64())) { File file = base642File(request.getImageBase64()); String name = file.getName(); @@ -216,6 +218,8 @@ public class LarkUserActiveRelatoinServiceImpl implements ILarkUserActiveRelatoi key = String.join(".", split); cosHelper.upload(BUCKET_NAME, key, file); buildUserActiveImage(relatoin, key,null); + url = cosHelper.previewUrl(BUCKET_NAME, key); + responseVo.setData(url); }else { buildUserActiveImage(relatoin,null, request.getRemark()); } @@ -224,7 +228,7 @@ public class LarkUserActiveRelatoinServiceImpl implements ILarkUserActiveRelatoi larkUserActiveRelatoinMapper.updateLarkUserActiveRelatoin(relatoin); larkUserActiveInviteRelatoinService.inviteSuccess(Arrays.asList(request.getUserName())); } - return new ResponseVo(); + return responseVo; } @Override