From c5da68dc47e072f99f91b563db2c6624904b3198 Mon Sep 17 00:00:00 2001 From: xupei Date: Wed, 21 Aug 2024 14:31:10 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=8E=B7=E5=8F=96=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E3=80=81=E7=B2=89=E4=B8=9D=E5=88=97=E8=A1=A8=E3=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E8=AF=A6=E7=BB=86=20=E8=BF=94=E5=9B=9E=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=BB=9F=E4=B8=80=202=E3=80=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E7=B3=BB=E7=BB=9F=20=E6=8C=89=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E6=88=96=E7=94=A8=E6=88=B7=E9=82=AE=E7=AE=B1=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7design=E9=A2=91=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ConvenientInquiryController.java | 5 +++-- .../com/ai/da/mapper/primary/DesignMapper.java | 2 +- .../java/com/ai/da/model/vo/AccountFollowVO.java | 15 ++++++++++++--- .../java/com/ai/da/model/vo/NotificationVO.java | 12 +++++++++--- .../da/service/impl/MessageCenterServiceImpl.java | 6 +++--- .../ai/da/service/impl/PortfolioServiceImpl.java | 4 ++-- .../resources/mapper/primary/DesignMapper.xml | 6 ++++++ .../resources/mapper/primary/UserFollowMapper.xml | 8 ++++---- 8 files changed, 40 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java index 119baa5a..c1ff0f2d 100644 --- a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java +++ b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java @@ -51,7 +51,8 @@ public class ConvenientInquiryController { @ApiOperation("获取指定时间区间内所有用户design的使用情况") @GetMapping("/getDesignStatistic") - public Response> getDesignStatistic(@RequestParam String startTime, @RequestParam String endTime) { + public Response> getDesignStatistic(@RequestParam String startTime, @RequestParam String endTime, + @RequestParam(required = false) String userName, @RequestParam(required = false) String email) { Long accountId = UserContext.getUserHolder().getId(); if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)) { if (StringUtil.isNullOrEmpty(startTime)) startTime = "2024-02-01 00:00:00"; @@ -60,7 +61,7 @@ public class ConvenientInquiryController { Date date = new Date(); endTime = simpleDateFormat.format(date); } - List designStatistic = designMapper.getDesignStatistic(startTime, endTime); + List designStatistic = designMapper.getDesignStatistic(startTime, endTime, userName, email); return Response.success(designStatistic); } else { return Response.fail("Sorry, you don't have permission"); diff --git a/src/main/java/com/ai/da/mapper/primary/DesignMapper.java b/src/main/java/com/ai/da/mapper/primary/DesignMapper.java index e6b1aa58..7db2a609 100644 --- a/src/main/java/com/ai/da/mapper/primary/DesignMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/DesignMapper.java @@ -18,5 +18,5 @@ public interface DesignMapper extends CommonMapper { //返回插入数据后生成的主键 Long insertDesign(Design design); - List getDesignStatistic(String startTime, String endTime); + List getDesignStatistic(String startTime, String endTime, String userName, String email); } diff --git a/src/main/java/com/ai/da/model/vo/AccountFollowVO.java b/src/main/java/com/ai/da/model/vo/AccountFollowVO.java index 5680ed76..39a4e708 100644 --- a/src/main/java/com/ai/da/model/vo/AccountFollowVO.java +++ b/src/main/java/com/ai/da/model/vo/AccountFollowVO.java @@ -11,14 +11,23 @@ import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor public class AccountFollowVO { - private Long userId; + /** + * userId + */ + private Long senderId; private String userName; private String avatar; + /** + * followTime + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private LocalDateTime followTime; + private LocalDateTime createTime; - private Integer mutualFollowing; + /** + * mutualFollowing 互粉 + */ + private Integer isFollow; } diff --git a/src/main/java/com/ai/da/model/vo/NotificationVO.java b/src/main/java/com/ai/da/model/vo/NotificationVO.java index cd4eaedd..32699ce6 100644 --- a/src/main/java/com/ai/da/model/vo/NotificationVO.java +++ b/src/main/java/com/ai/da/model/vo/NotificationVO.java @@ -8,13 +8,19 @@ import lombok.EqualsAndHashCode; @Data public class NotificationVO extends Notification { - private String senderUserName; + /** + * senderUserName + */ + private String userName; - private String senderUserAvatar; +// private String senderUserAvatar; private String portfolioName; - private String senderAvatar; + /** + * sender头像 + */ + private String avatar; private Integer isFollow; diff --git a/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java b/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java index e1f5638a..83d719d6 100644 --- a/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java @@ -82,8 +82,8 @@ public class MessageCenterServiceImpl extends ServiceImpl convert = notificationPage.convert(o -> { NotificationVO notificationVO = CopyUtil.copyObject(o, NotificationVO.class); Account senderAccount = accountService.getById(notificationVO.getSenderId()); - notificationVO.setSenderUserName(senderAccount.getUserName()); - notificationVO.setSenderUserAvatar(StringUtils.isNullOrEmpty(senderAccount.getAvatar()) ? null : minioUtil.getPreSignedUrl(senderAccount.getAvatar(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); + notificationVO.setUserName(senderAccount.getUserName()); +// notificationVO.setSenderUserAvatar(StringUtils.isNullOrEmpty(senderAccount.getAvatar()) ? null : minioUtil.getPreSignedUrl(senderAccount.getAvatar(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); notificationVO.setPortfolioName(Objects.isNull(notificationVO.getPortfolioId()) ? null : portfolioService.getById(notificationVO.getPortfolioId()).getPortfolioName()); // 设置单个人 系统消息是否已读 if (notificationVO.getType().equals("system")){ @@ -94,7 +94,7 @@ public class MessageCenterServiceImpl extends ServiceImpl { String avatar = StringUtil.isNullOrEmpty(follower.getAvatar()) ? CommonConstant.DEFAULT_AVATAR : follower.getAvatar(); follower.setAvatar(minioUtil.getPreSignedUrl(avatar, CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); - follower.setMutualFollowing(Objects.isNull(followeeMap.get(follower.getUserId())) ? 0 : 1); - follower.setFollowTime(followeeMap.get(follower.getUserId())); + follower.setIsFollow(Objects.isNull(followeeMap.get(follower.getSenderId())) ? 0 : 1); +// follower.setFollowTime(followeeMap.get(follower.getUserId())); }); return followerList; } diff --git a/src/main/resources/mapper/primary/DesignMapper.xml b/src/main/resources/mapper/primary/DesignMapper.xml index 6fc69739..0c33c320 100644 --- a/src/main/resources/mapper/primary/DesignMapper.xml +++ b/src/main/resources/mapper/primary/DesignMapper.xml @@ -39,6 +39,12 @@ and b.create_date not like '%:01' and b.create_date not like '%:02' + + and a.user_name = #{userName} + + + and a.user_email = #{email} + GROUP BY b.account_id ORDER BY b.account_id asc) d left join trial_order c on d.user_email = c.email diff --git a/src/main/resources/mapper/primary/UserFollowMapper.xml b/src/main/resources/mapper/primary/UserFollowMapper.xml index 06e40a81..60b7a588 100644 --- a/src/main/resources/mapper/primary/UserFollowMapper.xml +++ b/src/main/resources/mapper/primary/UserFollowMapper.xml @@ -2,7 +2,7 @@