Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
relation
Commits
9c02f656
Commit
9c02f656
authored
Aug 01, 2025
by
zhuxiang
Browse files
Merge remote-tracking branch 'origin/dev' into dev
parents
82f4598b
90a15a1e
Changes
9
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/platform/controller/UserController.java
View file @
9c02f656
...
@@ -3,6 +3,7 @@ package com.platform.controller;
...
@@ -3,6 +3,7 @@ package com.platform.controller;
import
com.platform.model.dto.UserDTO
;
import
com.platform.model.dto.UserDTO
;
import
com.platform.model.resp.Result
;
import
com.platform.model.resp.Result
;
import
com.platform.service.UserService
;
import
com.platform.service.UserService
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -26,4 +27,10 @@ public class UserController extends BaseController {
...
@@ -26,4 +27,10 @@ public class UserController extends BaseController {
public
Result
update
(
@RequestBody
UserDTO
userDTO
)
{
public
Result
update
(
@RequestBody
UserDTO
userDTO
)
{
return
toAjax
(
userService
.
updateUser
(
userDTO
));
return
toAjax
(
userService
.
updateUser
(
userDTO
));
}
}
@ApiModelProperty
(
value
=
"新增"
)
@PostMapping
(
"/add"
)
public
Result
<
Boolean
>
add
(
@RequestBody
UserDTO
userDTO
)
{
return
Result
.
data
(
userService
.
add
(
userDTO
));
}
}
}
src/main/java/com/platform/mapper/UserRelationMapper.java
0 → 100644
View file @
9c02f656
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
>
{
}
src/main/java/com/platform/model/dto/UserDTO.java
View file @
9c02f656
...
@@ -2,6 +2,7 @@ package com.platform.model.dto;
...
@@ -2,6 +2,7 @@ package com.platform.model.dto;
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
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
...
@@ -12,4 +13,5 @@ import java.util.List;
...
@@ -12,4 +13,5 @@ import java.util.List;
public
class
UserDTO
extends
UserEntity
{
public
class
UserDTO
extends
UserEntity
{
private
List
<
UserAccountEntity
>
userAccountList
;
private
List
<
UserAccountEntity
>
userAccountList
;
}
}
src/main/java/com/platform/model/entity/UserEntity.java
View file @
9c02f656
...
@@ -10,6 +10,8 @@ import lombok.Builder;
...
@@ -10,6 +10,8 @@ import lombok.Builder;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
java.util.List
;
@Data
@Data
@TableName
(
"user"
)
@TableName
(
"user"
)
@AllArgsConstructor
@AllArgsConstructor
...
@@ -35,4 +37,8 @@ public class UserEntity {
...
@@ -35,4 +37,8 @@ public class UserEntity {
private
String
idType
;
private
String
idType
;
private
String
basicInfo
;
private
String
basicInfo
;
@ApiModelProperty
(
"关系,方便解析和会回显"
)
@TableField
(
exist
=
false
)
private
List
<
UserRelationEntity
>
relationShipList
;
}
}
src/main/java/com/platform/model/entity/UserRelationEntity.java
0 → 100644
View file @
9c02f656
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
lombok.Data
;
/**
* @author : wujipeng
* @date : 2025/8/1 14:26
* @Version: 1.0
* @Desc : 描述信息
*/
@TableName
(
"user_relation"
)
@Data
public
class
UserRelationEntity
{
@TableId
(
type
=
IdType
.
AUTO
)
private
Integer
id
;
@ApiModelProperty
(
value
=
"用户id"
)
@TableField
(
"user_id"
)
private
Integer
userId
;
@ApiModelProperty
(
value
=
"对方id"
)
@TableField
(
"other_id"
)
private
Integer
otherId
;
@ApiModelProperty
(
value
=
"用户名"
)
@TableField
(
"user_name"
)
private
String
userName
;
@ApiModelProperty
(
value
=
"关系"
)
@TableField
(
"relation_ship"
)
private
String
relationShip
;
@ApiModelProperty
(
value
=
"备注"
)
private
String
remark
;
}
src/main/java/com/platform/service/UserRelationService.java
0 → 100644
View file @
9c02f656
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
>
{
}
src/main/java/com/platform/service/UserService.java
View file @
9c02f656
...
@@ -10,5 +10,10 @@ public interface UserService extends IService<UserEntity> {
...
@@ -10,5 +10,10 @@ public interface UserService extends IService<UserEntity> {
boolean
updateUser
(
UserDTO
userDTO
);
boolean
updateUser
(
UserDTO
userDTO
);
/**
* 新增用户
* @param userDTO userDTO
* @return Boolean
*/
Boolean
add
(
UserDTO
userDTO
);
}
}
src/main/java/com/platform/service/impl/UserRelationServiceImpl.java
0 → 100644
View file @
9c02f656
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
{
}
src/main/java/com/platform/service/impl/UserServiceImpl.java
View file @
9c02f656
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.map.MapUtil
;
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.platform.mapper.UserMapper
;
import
com.platform.mapper.UserMapper
;
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
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.ObjectUtils
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
@Service
@Service
public
class
UserServiceImpl
extends
ServiceImpl
<
UserMapper
,
UserEntity
>
implements
UserService
{
public
class
UserServiceImpl
extends
ServiceImpl
<
UserMapper
,
UserEntity
>
implements
UserService
{
@Resource
@Resource
private
UserAccountService
userAccountService
;
private
UserAccountService
userAccountService
;
@Resource
private
UserRelationService
userRelationService
;
@Override
@Override
public
UserVO
getDetail
(
String
userName
)
{
public
UserVO
getDetail
(
String
userName
)
{
...
@@ -32,11 +41,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
...
@@ -32,11 +41,19 @@ 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
);
}
}
List
<
UserRelationEntity
>
relationShipList
=
userRelationService
.
list
(
new
LambdaQueryWrapper
<
UserRelationEntity
>().
eq
(
UserRelationEntity:
:
getUserId
,
userEntity
.
getId
()));
if
(!
ObjectUtils
.
isEmpty
(
relationShipList
)){
userVO
.
setRelationShipList
(
relationShipList
);
}
return
userVO
;
return
userVO
;
}
}
@Override
@Override
public
boolean
updateUser
(
UserDTO
userDTO
)
{
public
boolean
updateUser
(
UserDTO
userDTO
)
{
List
<
UserRelationEntity
>
relationShipList
=
userDTO
.
getRelationShipList
();
if
(!
ObjectUtils
.
isEmpty
(
relationShipList
)){
userRelationService
.
saveOrUpdateBatch
(
relationShipList
);
}
updateById
(
userDTO
);
updateById
(
userDTO
);
//先删除账户信息
//先删除账户信息
userAccountService
.
deleteByUserName
(
userDTO
.
getUserName
());
userAccountService
.
deleteByUserName
(
userDTO
.
getUserName
());
...
@@ -49,4 +66,29 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
...
@@ -49,4 +66,29 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
return
Boolean
.
TRUE
;
return
Boolean
.
TRUE
;
}
}
@Override
@Transactional
public
Boolean
add
(
UserDTO
userDTO
)
{
//解析身份证号
Map
<
String
,
String
>
idCardInfo
=
IdCardUtils
.
parseIdCardInfo
(
userDTO
.
getIdCard
());
if
(
MapUtil
.
isNotEmpty
(
idCardInfo
)){
userDTO
.
setAge
(
Integer
.
parseInt
(
idCardInfo
.
get
(
"age"
)));
userDTO
.
setSex
(
idCardInfo
.
get
(
"sex"
));
userDTO
.
setIdType
(
"身份证"
);
}
save
(
userDTO
);
List
<
UserRelationEntity
>
relationShipList
=
userDTO
.
getRelationShipList
();
for
(
UserRelationEntity
userRelationEntity
:
relationShipList
)
{
userRelationEntity
.
setOtherId
(
userDTO
.
getId
());
}
userRelationService
.
saveBatch
(
relationShipList
);
for
(
UserRelationEntity
userRelationEntity
:
relationShipList
)
{
userRelationEntity
.
setOtherId
(
userRelationEntity
.
getUserId
());
userRelationEntity
.
setUserId
(
userDTO
.
getId
());
userRelationEntity
.
setId
(
null
);
}
userRelationService
.
saveBatch
(
relationShipList
);
return
Boolean
.
TRUE
;
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment