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 18:52:44 +08:00
parent 280159225b
commit 2945b511c3
8 changed files with 85 additions and 1 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

@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserPictures;
import com.ruoyi.xq.dto.admin.common.AuditFailReq;
import com.ruoyi.xq.dto.admin.user.UserPicturesAdminMergeVo;
import com.ruoyi.xq.dto.admin.user.UserPicturesAdminVo;
import com.ruoyi.xq.dto.app.common.IdsReq;
import com.ruoyi.xq.enums.common.AuditEnum;
@@ -54,6 +55,13 @@ public class UserPicturesController extends BaseController {
return TableDataInfo.build(page);
}
@SaCheckPermission("xq:userPictures:merge")
@GetMapping("/list/merge")
public TableDataInfo<UserPicturesAdminMergeVo> listMerge(UserPicturesAdminMergeVo bo, PageQuery pageQuery) {
Page<UserPicturesAdminMergeVo> page = userPicturesService.pageAdminManager(pageQuery, bo);
return TableDataInfo.build(page);
}
/**
* 获取用户相册管理详细信息
*

17
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserPicturesAdminMergeVo.java Normal file
View File

@@ -0,0 +1,17 @@
package com.ruoyi.xq.dto.admin.user;
import com.ruoyi.xq.domain.UserPictures;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class UserPicturesAdminMergeVo implements Serializable {
private Long userId;
private String usercode;
private String nickname;
private String mobile;
private String avatar;
private List<UserPictures> userPictureList;
}

1
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserPicturesAdminVo.java
View File

@@ -7,6 +7,5 @@ import lombok.Data;
public class UserPicturesAdminVo extends UserPictures {
private String nickname;
private String mobile;
private String avatar;
}

1
ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
View File

@@ -103,6 +103,7 @@ public class CurrentUserManager {
vo.setBirthday(user.getBirthday());
vo.setAge(AgeUtil.getAge(user.getBirthday()));
vo.setResidenceCityName(user.getResidenceCityName());
vo.setResidenceCityCode(user.getResidenceCityCode());
vo.setResidenceCode(user.getResidenceCode());
vo.setResidenceName(user.getResidenceName());
vo.setAddressCode(user.getAddressCode());

3
ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserPicturesMapper.java
View File

@@ -3,6 +3,7 @@ package com.ruoyi.xq.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.xq.domain.UserPictures;
import com.ruoyi.xq.dto.admin.user.UserPicturesAdminMergeVo;
import com.ruoyi.xq.dto.admin.user.UserPicturesAdminVo;
import org.apache.ibatis.annotations.Param;
@@ -15,4 +16,6 @@ import org.apache.ibatis.annotations.Param;
public interface UserPicturesMapper extends BaseMapper<UserPictures> {
Page<UserPicturesAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UserPicturesAdminVo bo);
Page<UserPicturesAdminMergeVo> pageAdminManager(@Param("build") Page<Object> build, @Param("bo") UserPicturesAdminMergeVo bo);
}

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserPictures;
import com.ruoyi.xq.dto.admin.user.UserPicturesAdminMergeVo;
import com.ruoyi.xq.dto.admin.user.UserPicturesAdminVo;
import java.util.List;
@@ -30,4 +31,6 @@ public interface UserPicturesService extends IService<UserPictures> {
void auditFail(Long id,String auditRemark);
void addPictures(List<String> picturesList, User user);
Page<UserPicturesAdminMergeVo> pageAdminManager(PageQuery pageQuery, UserPicturesAdminMergeVo bo);
}

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

@@ -8,16 +8,20 @@ import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserPictures;
import com.ruoyi.xq.dto.admin.user.UserPicturesAdminMergeVo;
import com.ruoyi.xq.dto.admin.user.UserPicturesAdminVo;
import com.ruoyi.xq.enums.common.AuditEnum;
import com.ruoyi.xq.mapper.UserPicturesMapper;
import com.ruoyi.xq.service.UserPicturesService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 用户相册管理Service业务层处理
@@ -53,6 +57,23 @@ public class UserPicturesServiceImpl extends ServiceImpl<UserPicturesMapper,User
return baseMapper.pageAdmin(pageQuery.build(),bo);
}
@Override
public Page<UserPicturesAdminMergeVo> pageAdminManager(PageQuery pageQuery, UserPicturesAdminMergeVo bo) {
Page<UserPicturesAdminMergeVo> page = baseMapper.pageAdminManager(pageQuery.build(), bo);
List<UserPicturesAdminMergeVo> records = page.getRecords();
if(CollectionUtils.isEmpty(records)){
return page;
}
List<Long> userIds = records.stream().map(UserPicturesAdminMergeVo::getUserId).collect(Collectors.toList());
List<UserPictures> list = this.list(Wrappers.lambdaQuery(UserPictures.class)
.in(UserPictures::getUserId, userIds));
Map<Long, List<UserPictures>> userIdPictursMap = list.stream().collect(Collectors.groupingBy(UserPictures::getUserId));
for (UserPicturesAdminMergeVo record : records) {
record.setUserPictureList(userIdPictursMap.getOrDefault(record.getUserId(), Collections.emptyList()));
}
return page;
}
@Override
public void auditSuccess(String ids) {
String[] idArray = ids.split(",");
@@ -94,4 +115,6 @@ public class UserPicturesServiceImpl extends ServiceImpl<UserPicturesMapper,User
this.save(userPictures);
}
}
}