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
邬吉朋
ops
Commits
7890bfe7
Commit
7890bfe7
authored
Feb 20, 2025
by
朱翔
Browse files
用户增删改查接口,增加用户扩展信息表
parent
88d3dbd3
Changes
11
Show whitespace changes
Inline
Side-by-side
pom.xml
View file @
7890bfe7
...
...
@@ -63,32 +63,7 @@
<artifactId>
javax.mail
</artifactId>
<version>
1.6.2
</version>
</dependency>
<dependency>
<groupId>
io.springfox
</groupId>
<artifactId>
springfox-swagger2
</artifactId>
<version>
2.6.0
</version>
</dependency>
<!-- 接口API生成html文档 -->
<dependency>
<groupId>
io.springfox
</groupId>
<artifactId>
springfox-swagger-ui
</artifactId>
<version>
2.6.0
</version>
</dependency>
<dependency>
<groupId>
io.github.swagger2markup
</groupId>
<artifactId>
swagger2markup
</artifactId>
<version>
1.3.1
</version>
</dependency>
<dependency>
<groupId>
io.swagger
</groupId>
<artifactId>
swagger-core
</artifactId>
<version>
1.5.16
</version>
</dependency>
<dependency>
<groupId>
io.swagger
</groupId>
<artifactId>
swagger-models
</artifactId>
<version>
1.5.16
</version>
</dependency>
<!-- 阿里短信 -->
<dependency>
<groupId>
com.aliyun
</groupId>
...
...
@@ -112,6 +87,18 @@
<artifactId>
pagehelper-spring-boot-starter
</artifactId>
<version>
1.3.0
</version>
</dependency>
<dependency>
<groupId>
com.ruzhoukj
</groupId>
<artifactId>
common-swagger
</artifactId>
<version>
1.0.0
</version>
</dependency>
<dependency>
<groupId>
com.ruzhoukj
</groupId>
<artifactId>
common-core
</artifactId>
<version>
1.0.2
</version>
</dependency>
</dependencies>
<repositories>
...
...
src/main/java/com/ruzhoukj/sms/controller/UserController.java
View file @
7890bfe7
...
...
@@ -2,6 +2,7 @@ package com.ruzhoukj.sms.controller;
import
com.ruzhoukj.sms.common.Result
;
import
com.ruzhoukj.sms.entity.UserEntity
;
import
com.ruzhoukj.sms.model.UserDTO
;
import
com.ruzhoukj.sms.service.UserService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
...
...
@@ -26,26 +27,29 @@ public class UserController {
@ApiOperation
(
"新增用户"
)
@PostMapping
(
"/save"
)
public
Result
saveUser
(
@RequestBody
UserEntity
user
)
{
return
Result
.
success
(
userService
.
save
(
user
));
public
Result
saveUser
(
@RequestBody
UserDTO
user
)
{
userService
.
saveUser
(
user
);
return
Result
.
success
();
}
@ApiOperation
(
"修改用户"
)
@PostMapping
(
"/update"
)
public
Result
updateUser
(
@RequestBody
UserEntity
user
)
{
return
Result
.
success
(
userService
.
updateById
(
user
));
public
Result
updateUser
(
@RequestBody
UserDTO
user
)
{
userService
.
updateUser
(
user
);
return
Result
.
success
();
}
@ApiOperation
(
"删除用户"
)
@DeleteMapping
(
"/{id}"
)
public
Result
deleteUser
(
@PathVariable
String
id
)
{
return
Result
.
success
(
userService
.
removeById
(
id
));
userService
.
removeUser
(
id
);
return
Result
.
success
();
}
@ApiOperation
(
"根据用户id查询用户详情"
)
@GetMapping
(
"/{id}"
)
public
Result
getUserById
(
@PathVariable
String
id
)
{
return
Result
.
success
(
userService
.
get
ById
(
id
));
return
Result
.
success
(
userService
.
get
UserInfo
(
id
));
}
@ApiOperation
(
"根据用户id查询用户有权查看的项目"
)
...
...
src/main/java/com/ruzhoukj/sms/dao/UserExtendDao.java
0 → 100644
View file @
7890bfe7
package
com.ruzhoukj.sms.dao
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.ruzhoukj.sms.entity.UserExtend
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.dao
* @Project:OA
* @name:UserExtendMapper
* @Date:2025/2/20 13:45
* @Filename:UserExtendMapper
*/
@Mapper
public
interface
UserExtendDao
extends
BaseMapper
<
UserExtend
>
{
}
src/main/java/com/ruzhoukj/sms/entity/UserEntity.java
View file @
7890bfe7
package
com.ruzhoukj.sms.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
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
java.math.BigInteger
;
import
java.util.Date
;
/**
...
...
@@ -20,11 +20,63 @@ public class UserEntity {
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
private
String
id
;
private
String
name
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
createTime
;
private
String
departments
;
private
String
email
;
private
String
password
;
@TableField
(
"phone"
)
private
String
phone
;
@TableField
(
"id_card"
)
private
String
idCard
;
@TableField
(
"fn"
)
private
String
fn
;
@TableField
(
"work_no"
)
private
String
workNo
;
@TableField
(
"sex"
)
private
Integer
sex
;
@TableField
(
"birth_date"
)
private
Date
birthDate
;
@TableField
(
"birth"
)
private
String
birth
;
@TableField
(
"age"
)
private
Integer
age
;
@TableField
(
"nation"
)
private
String
nation
;
@TableField
(
"company_name"
)
private
String
companyName
;
@TableField
(
"post"
)
private
String
post
;
@TableField
(
"post_rank"
)
private
String
postRank
;
@TableField
(
"sequence"
)
private
String
sequence
;
@TableField
(
"join_date"
)
private
Date
joinDate
;
@TableField
(
"second_dept"
)
private
String
secondDept
;
@TableField
(
"third_dept"
)
private
String
thirdDept
;
@TableField
(
"password"
)
private
String
password
;
@TableField
(
"email"
)
private
String
email
;
}
src/main/java/com/ruzhoukj/sms/entity/UserExtend.java
0 → 100644
View file @
7890bfe7
package
com.ruzhoukj.sms.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
lombok.Data
;
import
java.util.Date
;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.entity
* @Project:OA
* @name:UserExtend
* @Date:2025/2/20 11:59
* @Filename:UserExtend
*/
@Data
@TableName
(
"user_extend"
)
public
class
UserExtend
{
@TableId
(
value
=
"id"
,
type
=
IdType
.
ASSIGN_ID
)
private
String
id
;
@TableField
(
value
=
"user_id"
)
private
String
userId
;
@TableField
(
"work_year"
)
private
String
workYear
;
@TableField
(
"work_year_in_company"
)
private
String
workYearInCompany
;
@TableField
(
"try_out_date_line"
)
private
String
tryOutDateLine
;
@TableField
(
"full_member_date"
)
private
Date
fullMemberDate
;
@TableField
(
"actual_full_member_date"
)
private
Date
actualFullMemberDate
;
@TableField
(
"contract_type"
)
private
String
contractType
;
@TableField
(
"contract_term"
)
private
String
contractTerm
;
@TableField
(
"contract_start_time"
)
private
Date
contractStartTime
;
@TableField
(
"contract_end_time"
)
private
Date
contractEndTime
;
@TableField
(
"renew_flag"
)
private
Boolean
renewFlag
;
@TableField
(
"renew_times"
)
private
Integer
renewTimes
;
@TableField
(
"renew_contract_start_time"
)
private
Date
renewContractStartTime
;
@TableField
(
"renew_contract_end_time"
)
private
Date
renewContractEndTime
;
@TableField
(
"politics"
)
private
String
politics
;
@TableField
(
"army_flag"
)
private
Boolean
armyFlag
;
@TableField
(
"last_school"
)
private
String
lastSchool
;
@TableField
(
"education"
)
private
String
education
;
@TableField
(
"modality"
)
private
String
modality
;
@TableField
(
"major"
)
private
String
major
;
@TableField
(
"finish_date"
)
private
Date
finishDate
;
@TableField
(
"marriage"
)
private
String
marriage
;
@TableField
(
"native"
)
private
String
nativePlace
;
@TableField
(
"id_card_address"
)
private
String
idCardAddress
;
@TableField
(
"now_address"
)
private
String
nowAddress
;
@TableField
(
"urgency_user"
)
private
String
urgencyUser
;
@TableField
(
"urgency_phone"
)
private
String
urgencyPhone
;
@TableField
(
"post_transfer"
)
private
String
postTransfer
;
@TableField
(
"cert"
)
private
String
cert
;
@TableField
(
"social_security_company"
)
private
String
socialSecurityCompany
;
@TableField
(
"social_security_start_date"
)
private
Date
socialSecurityStartDate
;
@TableField
(
"social_security_no"
)
private
String
socialSecurityNo
;
@TableField
(
"accumulation_fund_no"
)
private
String
accumulationFundNo
;
@TableField
(
"bank_no"
)
private
String
bankNo
;
@TableField
(
"remark"
)
private
String
remark
;
}
src/main/java/com/ruzhoukj/sms/model/UserDTO.java
0 → 100644
View file @
7890bfe7
package
com.ruzhoukj.sms.model
;
import
com.ruzhoukj.sms.entity.UserEntity
;
import
com.ruzhoukj.sms.entity.UserExtend
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.model
* @Project:OA
* @name:UserDTO
* @Date:2025/2/20 13:48
* @Filename:UserDTO
*/
@EqualsAndHashCode
(
callSuper
=
true
)
@Data
public
class
UserDTO
extends
UserEntity
{
@ApiModelProperty
(
value
=
"用户扩展信息"
)
private
UserExtend
userExtend
;
}
src/main/java/com/ruzhoukj/sms/model/vo/UserVO.java
0 → 100644
View file @
7890bfe7
package
com.ruzhoukj.sms.model.vo
;
import
com.ruzhoukj.sms.entity.UserEntity
;
import
com.ruzhoukj.sms.entity.UserExtend
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.model.vo
* @Project:OA
* @name:UserVO
* @Date:2025/2/20 13:57
* @Filename:UserVO
*/
@EqualsAndHashCode
(
callSuper
=
true
)
@Data
public
class
UserVO
extends
UserEntity
{
@ApiModelProperty
(
value
=
"用户扩展信息"
)
private
UserExtend
userExtend
;
}
src/main/java/com/ruzhoukj/sms/service/UserExtendService.java
0 → 100644
View file @
7890bfe7
package
com.ruzhoukj.sms.service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.ruzhoukj.sms.entity.UserExtend
;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.service
* @Project:OA
* @name:UserExtendService
* @Date:2025/2/20 13:46
* @Filename:UserExtendService
*/
public
interface
UserExtendService
extends
IService
<
UserExtend
>
{
void
removeByUserId
(
String
id
);
/**
* 根据用户Id查看拓展信息
* @param id userId
* @return UserExtend
*/
UserExtend
getbyUserId
(
String
id
);
}
src/main/java/com/ruzhoukj/sms/service/UserService.java
View file @
7890bfe7
...
...
@@ -3,6 +3,8 @@ package com.ruzhoukj.sms.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.ruzhoukj.sms.entity.ProjectEntity
;
import
com.ruzhoukj.sms.entity.UserEntity
;
import
com.ruzhoukj.sms.model.UserDTO
;
import
com.ruzhoukj.sms.model.vo.UserVO
;
import
java.util.List
;
...
...
@@ -25,4 +27,26 @@ public interface UserService extends IService<UserEntity> {
* @return List<ProjectEntity>
*/
List
<
ProjectEntity
>
listProjectByUserId
(
String
id
);
void
saveUser
(
UserDTO
user
);
/**
* 修改用户
* @param user user
*/
void
updateUser
(
UserDTO
user
);
/**
* 删除用户
* @param id id
* @return String
*/
void
removeUser
(
String
id
);
/**
* 根据用户id查询用户详情
* @param id id
* @return UserVO
*/
UserVO
getUserInfo
(
String
id
);
}
src/main/java/com/ruzhoukj/sms/service/impl/UserExtendServiceImpl.java
0 → 100644
View file @
7890bfe7
package
com.ruzhoukj.sms.service.impl
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.ruzhoukj.sms.dao.UserExtendDao
;
import
com.ruzhoukj.sms.entity.UserExtend
;
import
com.ruzhoukj.sms.service.UserExtendService
;
import
org.springframework.stereotype.Service
;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.service.impl
* @Project:OA
* @name:UserExtendServiceImpl
* @Date:2025/2/20 13:46
* @Filename:UserExtendServiceImpl
*/
@Service
public
class
UserExtendServiceImpl
extends
ServiceImpl
<
UserExtendDao
,
UserExtend
>
implements
UserExtendService
{
@Override
public
void
removeByUserId
(
String
id
)
{
baseMapper
.
delete
(
new
LambdaQueryWrapper
<
UserExtend
>().
eq
(
UserExtend:
:
getUserId
,
id
));
}
@Override
public
UserExtend
getbyUserId
(
String
id
)
{
return
baseMapper
.
selectOne
(
new
LambdaQueryWrapper
<
UserExtend
>()
.
eq
(
UserExtend:
:
getUserId
,
id
));
}
}
src/main/java/com/ruzhoukj/sms/service/impl/UserServiceImpl.java
View file @
7890bfe7
package
com.ruzhoukj.sms.service.impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.platform.exception.BusinessException
;
import
com.platform.utils.DozerUtils
;
import
com.ruzhoukj.sms.dao.UserDao
;
import
com.ruzhoukj.sms.entity.ProjectEntity
;
import
com.ruzhoukj.sms.entity.UserEntity
;
import
com.ruzhoukj.sms.entity.UserExtend
;
import
com.ruzhoukj.sms.model.UserDTO
;
import
com.ruzhoukj.sms.model.vo.UserVO
;
import
com.ruzhoukj.sms.service.UserExtendService
;
import
com.ruzhoukj.sms.service.UserService
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
import
java.util.List
;
/**
...
...
@@ -16,6 +24,9 @@ import java.util.List;
*/
@Service
public
class
UserServiceImpl
extends
ServiceImpl
<
UserDao
,
UserEntity
>
implements
UserService
{
@Resource
private
UserExtendService
userExtendService
;
@Override
public
List
<
UserEntity
>
getUserList
(
String
name
,
Integer
page
,
Integer
pageSize
)
{
return
baseMapper
.
getUserList
(
name
,
page
,
pageSize
);
...
...
@@ -30,4 +41,41 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
public
List
<
ProjectEntity
>
listProjectByUserId
(
String
id
)
{
return
baseMapper
.
listProjectByUserId
(
id
);
}
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
saveUser
(
UserDTO
user
)
{
if
(
save
(
user
)){
UserExtend
userExtend
=
user
.
getUserExtend
();
//保存用户扩展信息
userExtendService
.
save
(
userExtend
);
}
}
@Override
public
void
updateUser
(
UserDTO
user
)
{
if
(
updateById
(
user
)){
UserExtend
userExtend
=
user
.
getUserExtend
();
//保存用户扩展信息
userExtendService
.
updateById
(
userExtend
);
}
}
@Override
public
void
removeUser
(
String
id
)
{
if
(
removeById
(
id
)){
userExtendService
.
removeByUserId
(
id
);
}
}
@Override
public
UserVO
getUserInfo
(
String
id
)
{
UserVO
userVO
=
DozerUtils
.
convertBean
(
getById
(
id
),
UserVO
.
class
);
if
(
userVO
==
null
){
throw
new
BusinessException
(
"用户ID有误"
);
}
UserExtend
userExtend
=
userExtendService
.
getbyUserId
(
id
);
userVO
.
setUserExtend
(
userExtend
);
return
userVO
;
}
}
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