shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
张良(004796)
2024-04-22 11:06:35 +08:00
parent 3ce06a8ede
commit d631388b85
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java
View File

@@ -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("用户不存在");

2
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/AddUserReq.java
View File

@@ -21,5 +21,5 @@ public class AddUserReq {
private Integer marriage;
private String profession;
private Integer annualIncome;
private List<String> picturesList;
private String pictures;
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java
View File

@@ -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);

7
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java
View File

@@ -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);

10
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
View File

@@ -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();
}