Commit 90a15a1e authored by wujipeng's avatar wujipeng
Browse files

用户关系表

parent 8b58ecae
package com.platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.platform.model.entity.UserRelationEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* @author : wujipeng
* @date : 2025/8/1 14:28
* @Version: 1.0
* @Desc : 描述信息
*/
@Mapper
public interface UserRelationMapper extends BaseMapper<UserRelationEntity> {
}
...@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.platform.model.dto.RelationShipDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -39,11 +38,7 @@ public class UserEntity { ...@@ -39,11 +38,7 @@ public class UserEntity {
private String basicInfo; private String basicInfo;
@ApiModelProperty("关系")
@TableField("relation_ship")
private String relationShip;
@ApiModelProperty("关系,方便解析和会回显") @ApiModelProperty("关系,方便解析和会回显")
@TableField(exist = false) @TableField(exist = false)
private List<RelationShipDTO> relationShipList; private List<UserRelationEntity> relationShipList;
} }
package com.platform.model.dto; package com.platform.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
* @author : wujipeng * @author : wujipeng
* @date : 2025/8/1 11:26 * @date : 2025/8/1 14:26
* @Version: 1.0 * @Version: 1.0
* @Desc : 描述信息 * @Desc : 描述信息
*/ */
@TableName("user_relation")
@Data @Data
public class RelationShipDTO { public class UserRelationEntity {
@ApiModelProperty(value = "id") @TableId(type = IdType.AUTO)
private Integer id; private Integer id;
@ApiModelProperty(value = "用户id")
@TableField("user_id")
private Integer userId;
@ApiModelProperty(value = "对方id")
@TableField("other_id")
private Integer otherId;
@ApiModelProperty(value = "用户名") @ApiModelProperty(value = "用户名")
@TableField("user_name")
private String userName; private String userName;
@ApiModelProperty(value = "关系") @ApiModelProperty(value = "关系")
@TableField("relation_ship")
private String relationShip; private String relationShip;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
......
package com.platform.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.platform.model.entity.UserRelationEntity;
/**
* @author : wujipeng
* @date : 2025/8/1 14:28
* @Version: 1.0
* @Desc : 描述信息
*/
public interface UserRelationService extends IService<UserRelationEntity> {
}
package com.platform.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.platform.mapper.UserRelationMapper;
import com.platform.model.entity.UserRelationEntity;
import com.platform.service.UserRelationService;
import org.springframework.stereotype.Service;
/**
* @author : wujipeng
* @date : 2025/8/1 14:28
* @Version: 1.0
* @Desc : 描述信息
*/
@Service
public class UserRelationServiceImpl extends ServiceImpl<UserRelationMapper, UserRelationEntity> implements UserRelationService {
}
package com.platform.service.impl; package com.platform.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.platform.mapper.UserMapper; import com.platform.mapper.UserMapper;
import com.platform.model.dto.RelationShipDTO;
import com.platform.model.dto.UserDTO; import com.platform.model.dto.UserDTO;
import com.platform.model.entity.UserAccountEntity; import com.platform.model.entity.UserAccountEntity;
import com.platform.model.entity.UserEntity; import com.platform.model.entity.UserEntity;
import com.platform.model.entity.UserRelationEntity;
import com.platform.model.vo.UserVO; import com.platform.model.vo.UserVO;
import com.platform.service.UserAccountService; import com.platform.service.UserAccountService;
import com.platform.service.UserRelationService;
import com.platform.service.UserService; import com.platform.service.UserService;
import com.platform.utils.DozerUtils; import com.platform.utils.DozerUtils;
import com.platform.utils.IdCardUtils; import com.platform.utils.IdCardUtils;
import com.platform.utils.StringUtils;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -32,6 +28,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -32,6 +28,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
@Resource @Resource
private UserAccountService userAccountService; private UserAccountService userAccountService;
@Resource
private UserRelationService userRelationService;
@Override @Override
public UserVO getDetail(String userName) { public UserVO getDetail(String userName) {
...@@ -43,21 +41,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -43,21 +41,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
List<UserAccountEntity> userAccountEntityList = userAccountService.queryListByUserName(userName); List<UserAccountEntity> userAccountEntityList = userAccountService.queryListByUserName(userName);
userVO.setUserAccountList(userAccountEntityList); userVO.setUserAccountList(userAccountEntityList);
} }
String relationShip = userEntity.getRelationShip(); List<UserRelationEntity> relationShipList = userRelationService.list(new LambdaQueryWrapper<UserRelationEntity>().eq(UserRelationEntity::getUserId, userEntity.getId()));
if(StringUtils.isNotEmpty(relationShip)){ if(!ObjectUtils.isEmpty(relationShipList)){
List<RelationShipDTO> relationShipDTOS = JSON.parseArray(relationShip, RelationShipDTO.class); userVO.setRelationShipList(relationShipList);
if(!relationShipDTOS.isEmpty()){
userVO.setRelationShipList(relationShipDTOS);
}
} }
return userVO; return userVO;
} }
@Override @Override
public boolean updateUser(UserDTO userDTO) { public boolean updateUser(UserDTO userDTO) {
List<RelationShipDTO> relationShipList = userDTO.getRelationShipList(); List<UserRelationEntity> relationShipList = userDTO.getRelationShipList();
if(!ObjectUtils.isEmpty(relationShipList)){ if(!ObjectUtils.isEmpty(relationShipList)){
userDTO.setRelationShip(JSON.toJSONString(relationShipList)); userRelationService.saveOrUpdateBatch(relationShipList);
} }
updateById(userDTO); updateById(userDTO);
//先删除账户信息 //先删除账户信息
...@@ -72,9 +67,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -72,9 +67,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
} }
@Override @Override
@Transactional
public Boolean add(UserDTO userDTO) { public Boolean add(UserDTO userDTO) {
//数据转化成json
List<RelationShipDTO> relationShipList = userDTO.getRelationShipList();
//解析身份证号 //解析身份证号
Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(userDTO.getIdCard()); Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(userDTO.getIdCard());
if(MapUtil.isNotEmpty(idCardInfo)){ if(MapUtil.isNotEmpty(idCardInfo)){
...@@ -82,30 +76,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -82,30 +76,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
userDTO.setSex(idCardInfo.get("sex")); userDTO.setSex(idCardInfo.get("sex"));
userDTO.setIdType("身份证"); userDTO.setIdType("身份证");
} }
if(!relationShipList.isEmpty()){
userDTO.setRelationShip(JSON.toJSONString(relationShipList));
}
save(userDTO); save(userDTO);
//更新被选中人的关系
if(!relationShipList.isEmpty()){ List<UserRelationEntity> relationShipList = userDTO.getRelationShipList();
for (RelationShipDTO relationShipDTO : relationShipList) { for (UserRelationEntity userRelationEntity : relationShipList) {
UserEntity user = getById(relationShipDTO.getId()); userRelationEntity.setOtherId(userDTO.getId());
String relationShip = user.getRelationShip();
//关系反转
relationShipDTO.setId(userDTO.getId());
if(StringUtils.isNotEmpty(relationShip)){
String oldRelationShip = user.getRelationShip();
List<RelationShipDTO> oldRelationShipList = JSON.parseArray(oldRelationShip, RelationShipDTO.class);
oldRelationShipList.add(relationShipDTO);
user.setRelationShip(JSON.toJSONString(oldRelationShipList));
}else {
List<RelationShipDTO> relationShipList1 = Lists.newArrayList();
relationShipList1.add(relationShipDTO);
user.setRelationShip(JSON.toJSONString(relationShipList1));
}
updateById(user);
} }
userRelationService.saveBatch(relationShipList);
for (UserRelationEntity userRelationEntity : relationShipList) {
userRelationEntity.setOtherId(userRelationEntity.getUserId());
userRelationEntity.setUserId(userDTO.getId());
userRelationEntity.setId(null);
} }
userRelationService.saveBatch(relationShipList);
return Boolean.TRUE; return Boolean.TRUE;
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment