From 34c651e15a914051111bac5f66c1d8fa090447b8 Mon Sep 17 00:00:00 2001 From: 777 <123@qwe.com> Date: Mon, 28 Apr 2025 14:08:13 +0800 Subject: [PATCH] 123 --- .../controller/cai/admin/UserController.java | 3 +- .../admin/query/dynamic/DynamicCreateVo.java | 4 +- .../cai/service/impl/DynamicServiceImpl.java | 41 +++++++++---------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java index cc27e6d6..948b7e1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java @@ -76,12 +76,13 @@ public class UserController extends BaseController { } @GetMapping("/listByUserCode") - public R> listByUserCode(String usercode,int limit){ + public R> listByUserCode(Integer isAnchor, String usercode,int limit){ if(limit == 0){ limit = 40; } List users = userService.list(Wrappers.lambdaQuery(User.class) .select(User::getUsercode) + .eq(isAnchor != null, User::getIsAnchor, isAnchor) .like(StringUtils.isNotEmpty(usercode), User::getUsercode, usercode) .last("limit " + limit)); return R.ok(users.stream().map(User::getUsercode).collect(Collectors.toList())); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/dynamic/DynamicCreateVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/dynamic/DynamicCreateVo.java index 5f20621b..09dcf764 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/dynamic/DynamicCreateVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/dynamic/DynamicCreateVo.java @@ -7,7 +7,7 @@ import java.util.List; @Data public class DynamicCreateVo { - private List imageList; + private String imageList; private String content; - private Long usercode; + private String usercode; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java index 5d86bec2..71f1c4d9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java @@ -112,13 +112,17 @@ public class DynamicServiceImpl extends ServiceImpl impl @Override public void createAdmin(DynamicCreateVo bo) { - if(CollectionUtil.isEmpty(bo.getImageList()) || StringUtils.isEmpty(bo.getContent())){ + if(StringUtils.isEmpty(bo.getImageList()) || StringUtils.isEmpty(bo.getContent())){ throw new ServiceException("动态内容和图片必须上传"); } - if(bo.getImageList() != null && bo.getImageList().size() > 9){ + String[] imageArrays = bo.getImageList().split(","); + if(imageArrays.length > 9){ throw new ServiceException("最多只能发送9张照片哦"); } - User user = userService.getById(bo.getUsercode()); + User user = userService.getByUserCode(bo.getUsercode()); + if(user == null){ + throw new ServiceException("主播不存在"); + } if(user.getIsAnchor() == null || user.getIsAnchor() != 1){ throw new ServiceException("只有主播可以发布动态哦"); } @@ -132,28 +136,21 @@ public class DynamicServiceImpl extends ServiceImpl impl } else { dynamic.setCity(citysService.getByCityId(dynamic.getCityId())); } - if(CollectionUtil.isNotEmpty(bo.getImageList())){ - dynamic.setIsAttach(1); - }else{ - dynamic.setIsAttach(0); - } + dynamic.setIsAttach(1); this.save(dynamic); List dynamicImages = new ArrayList<>(); - List imageList = bo.getImageList(); - if(CollectionUtil.isNotEmpty(imageList)){ - for (String image : imageList) { - CaiFileUtils.FileSize fileSize = CaiFileUtils.getFastFileSize(image); - DynamicImages po = new DynamicImages(); - po.setUserId(dynamic.getUserId()); - po.setDynamicId(dynamic.getId()); - po.setUrl(image); - po.setWidth(fileSize.getWidth()); - po.setHeight(fileSize.getHeight()); - po.setExts(fileSize.getSuffix()); - dynamicImages.add(po); - } - dynamicImagesService.saveBatch(dynamicImages); + for (String image : imageArrays) { + CaiFileUtils.FileSize fileSize = CaiFileUtils.getFastFileSize(image); + DynamicImages po = new DynamicImages(); + po.setUserId(dynamic.getUserId()); + po.setDynamicId(dynamic.getId()); + po.setUrl(image); + po.setWidth(fileSize.getWidth()); + po.setHeight(fileSize.getHeight()); + po.setExts(fileSize.getSuffix()); + dynamicImages.add(po); } + dynamicImagesService.saveBatch(dynamicImages); } @Override