From d631388b85c26d5f43fd2a84a6ec9fbc04f060d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= <zhanglian.zl@fcbox.com>
Date: Mon, 22 Apr 2024 11:06:35 +0800
Subject: [PATCH] init

---
 .../ruoyi/xq/controller/UserPicturesController.java    |  8 +++++++-
 .../com/ruoyi/xq/dto/admin/user/req/AddUserReq.java    |  2 +-
 .../java/com/ruoyi/xq/service/UserPicturesService.java |  2 ++
 .../ruoyi/xq/service/impl/UserPicturesServiceImpl.java |  7 +++++++
 .../com/ruoyi/xq/service/impl/UserServiceImpl.java     | 10 +++++-----
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java
index 29cb024..b239707 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java
@@ -66,6 +66,12 @@ public class UserPicturesController extends BaseController {
         return R.ok(userPicturesService.getById(id));
     }
 
+    @GetMapping("/listByUserId")
+    public R<UserPictures> listByUserId(Long userId){
+        userPicturesService.listByUserIdAll(userId);
+        return R.ok();
+    }
+
     /**
      * 新增用户相册管理
      */
@@ -73,7 +79,7 @@ public class UserPicturesController extends BaseController {
     @Log(title = "用户相册管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserPictures bo) {
+    public R<Void> addOrUpdate(@Validated(AddGroup.class) @RequestBody UserPictures bo) {
         User user = userService.getByUsercode(bo.getUsercode());
         if(user == null){
             return R.fail("用户不存在");
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/AddUserReq.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/AddUserReq.java
index 4d80ca6..607c168 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/AddUserReq.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/AddUserReq.java
@@ -21,5 +21,5 @@ public class AddUserReq {
     private Integer marriage;
     private String profession;
     private Integer annualIncome;
-    private List<String> picturesList;
+    private String pictures;
 }
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java
index cd88dde..d8b42b1 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java
@@ -21,6 +21,8 @@ public interface UserPicturesService extends IService<UserPictures>  {
 
     List<UserPictures> listByUserIdSuccess(Long userId);
 
+    List<UserPictures> listByUserIdAll(Long userId);
+
     Page<UserPicturesAdminVo> pageAdmin(PageQuery pageQuery, UserPicturesAdminVo bo);
 
     void auditSuccess(String ids);
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java
index a3bdc06..0d71113 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -41,6 +42,12 @@ public class UserPicturesServiceImpl extends ServiceImpl<UserPicturesMapper,User
                 .in(UserPictures::getAuditStatus, AuditEnum.AUDITING.getCode(), AuditEnum.SUCCESS.getCode()));
     }
 
+    @Override
+    public List<UserPictures> listByUserIdAll(Long userId) {
+        return this.list(Wrappers.lambdaQuery(UserPictures.class)
+                .eq(UserPictures::getUserId, userId));
+    }
+
     @Override
     public Page<UserPicturesAdminVo> pageAdmin(PageQuery pageQuery, UserPicturesAdminVo bo) {
         return baseMapper.pageAdmin(pageQuery.build(),bo);
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
index d47870f..b68b60b 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
@@ -45,10 +45,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -346,7 +343,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
             updateUser.setId(user.getId());
             UserService userService = SpringUtil.getBean(UserService.class);
             userService.updateBaseUser(updateUser);
-            userPicturesService.addPictures(bo.getPicturesList(),user);
+            if(StringUtils.isNotEmpty(bo.getPictures())){
+                List<String> picturesList = Arrays.stream(bo.getPictures().split(",")).collect(Collectors.toList());
+                userPicturesService.addPictures(picturesList,user);
+            }
         }finally {
             lock.unlock();
         }