ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhang-content/src/main/java/com/ruoyi/domain/ZfRelation.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhang-content/src/main/java/com/ruoyi/domain/dto/UserRelationDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhang-content/src/main/java/com/ruoyi/mapper/ZfRelationMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhang-content/src/main/java/com/ruoyi/service/ZfRelationService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhang-content/src/main/java/com/ruoyi/service/impl/ZfRelationServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -142,5 +142,20 @@ } /** * 查询家庭主要成员及关系 */ @GetMapping("/relation") public AjaxResult listMyRelation(){ SysUser user = SecurityUtils.getLoginUser().getUser(); Long userId = user.getUserId(); return zInfoUserService.searchMyRelation(userId); } } zhang-content/src/main/java/com/ruoyi/domain/ZfRelation.java
New file @@ -0,0 +1,22 @@ package com.ruoyi.domain; import lombok.Data; import lombok.ToString; import java.io.Serializable; /** * @Version 1.0 * @Author Jin_quan Ou * @Date 2023-03-25 10:31 */ @Data @ToString public class ZfRelation implements Serializable { private static final long serialVersionUID = 1L; private Long id; private Long myId; private Long otherId; private String relation; } zhang-content/src/main/java/com/ruoyi/domain/dto/UserRelationDto.java
New file @@ -0,0 +1,44 @@ package com.ruoyi.domain.dto; import com.ruoyi.common.annotation.Excel; import lombok.Data; import lombok.ToString; import java.io.Serializable; /** * @Version 1.0 * @Author Jin_quan Ou * @Date 2023-03-25 11:08 */ @Data @ToString public class UserRelationDto implements Serializable { private static final long serialVersionUID = 1L; /** * 名字 */ private String nickName; /** * 关系 */ private String relation; /** * 所在单位/学校 */ private String unit; /** * 职务/身份 */ private String position; /** * 政治面貌 */ private String politicalOutlook; } zhang-content/src/main/java/com/ruoyi/mapper/ZfRelationMapper.java
New file @@ -0,0 +1,14 @@ package com.ruoyi.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.domain.ZfRelation; import org.apache.ibatis.annotations.Mapper; /** * @Version 1.0 * @Author Jin_quan Ou * @Date 2023-03-25 10:32 */ @Mapper public interface ZfRelationMapper extends BaseMapper<ZfRelation> { } zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -18,4 +18,6 @@ AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize); List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser); AjaxResult searchMyRelation(Long userId); } zhang-content/src/main/java/com/ruoyi/service/ZfRelationService.java
New file @@ -0,0 +1,14 @@ package com.ruoyi.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.domain.ZfRelation; import org.springframework.stereotype.Service; /** * @Version 1.0 * @Author Jin_quan Ou * @Date 2023-03-25 10:33 */ public interface ZfRelationService extends IService<ZfRelation> { } zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -10,13 +10,20 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.domain.ZInfoUser; import com.ruoyi.domain.ZfEvent; import com.ruoyi.domain.ZfRelation; import com.ruoyi.domain.dto.UserRelationDto; import com.ruoyi.mapper.ZInfoUserMapper; import com.ruoyi.service.ZInfoUserService; import com.ruoyi.service.ZfRelationService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; /** * <p> @@ -29,6 +36,9 @@ @Service @Slf4j public class ZInfoUserServiceImpl extends ServiceImpl<ZInfoUserMapper, ZInfoUser> implements ZInfoUserService { @Autowired private ZfRelationService zfRelationService; @Override public AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize) { @@ -75,4 +85,28 @@ return list; } @Override public AjaxResult searchMyRelation(Long userId) { LambdaQueryWrapper<ZfRelation> lqw = new LambdaQueryWrapper<>(); lqw.eq(ZfRelation::getMyId,userId); List<ZfRelation> relationList = zfRelationService.list(lqw); ArrayList<UserRelationDto> otherUserList = new ArrayList<>(); relationList.stream().map( (relation)->{ Long otherId = relation.getOtherId(); ZInfoUser otherUser = getById(otherId); UserRelationDto userRelationDto = new UserRelationDto(); BeanUtils.copyProperties(otherUser,userRelationDto); userRelationDto.setRelation(relation.getRelation()); otherUserList.add(userRelationDto); return relation; } ).collect(Collectors.toList()); return AjaxResult.success(otherUserList); } } zhang-content/src/main/java/com/ruoyi/service/impl/ZfRelationServiceImpl.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.domain.ZfRelation; import com.ruoyi.mapper.ZfRelationMapper; import com.ruoyi.service.ZfRelationService; import org.springframework.stereotype.Service; /** * @Version 1.0 * @Author Jin_quan Ou * @Date 2023-03-25 10:33 */ @Service public class ZfRelationServiceImpl extends ServiceImpl<ZfRelationMapper, ZfRelation> implements ZfRelationService { }