Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
78b51194
Commit
78b51194
authored
Dec 19, 2019
by
zuoyh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
员工信息修改_APP用户列表联动更新
parent
6ab6cc5c
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
159 additions
and
50 deletions
+159
-50
AppUserPositionTempFindDTO.java
...xiaoqi/security/admin/dto/AppUserPositionTempFindDTO.java
+1
-0
AppUserDetailBiz.java
...m/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java
+46
-20
AppUserPositionChangeRecordBiz.java
...qi/security/admin/biz/AppUserPositionChangeRecordBiz.java
+24
-4
AppUserPositionTempBiz.java
...ub/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java
+43
-5
AppUsersManageController.java
...wxiaoqi/security/admin/rest/AppUsersManageController.java
+43
-18
AppUserPositionController.java
.../security/admin/rest/admin/AppUserPositionController.java
+2
-3
No files found.
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempFindDTO.java
View file @
78b51194
...
...
@@ -15,4 +15,5 @@ public class AppUserPositionTempFindDTO extends PageParam {
private
String
name
;
private
Integer
status
;
private
Integer
companyId
;
private
Integer
positionId
;
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java
View file @
78b51194
...
...
@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
import
com.github.wxiaoqi.security.admin.dto.AccountBindDTO
;
import
com.github.wxiaoqi.security.admin.dto.StaffStatisticsFindDTO
;
import
com.github.wxiaoqi.security.admin.entity.AppUserDetail
;
import
com.github.wxiaoqi.security.admin.entity.AppUserLogin
;
import
com.github.wxiaoqi.security.admin.mapper.AppUserDetailMapper
;
import
com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService
;
import
com.github.wxiaoqi.security.admin.vo.AppUserInfoVo
;
...
...
@@ -16,6 +17,7 @@ import com.xxfc.platform.im.utils.BeanUtil;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
tk.mybatis.mapper.entity.Example
;
...
...
@@ -36,6 +38,15 @@ import java.util.stream.Collectors;
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
class
AppUserDetailBiz
extends
BaseBiz
<
AppUserDetailMapper
,
AppUserDetail
>
{
@Autowired
AppUserPositionTempBiz
appUserPositionTempBiz
;
@Autowired
AppUserLoginBiz
appUserLoginBiz
;
@Autowired
AppUserDetailBiz
appUserDetailBiz
;
@Override
@CacheClear
(
pre
=
"user{1.userid}"
)
public
void
updateSelectiveById
(
AppUserDetail
entity
)
{
...
...
@@ -95,13 +106,13 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
AppUserDetail
entity
=
new
AppUserDetail
();
Example
example
=
new
Example
(
AppUserDetail
.
class
);
Example
.
Criteria
criteria
=
example
.
createCriteria
();
criteria
.
andEqualTo
(
"userid"
,
userVo
.
getUserid
());
criteria
.
andEqualTo
(
"userid"
,
userVo
.
getUserid
());
try
{
BeanUtils
.
copyProperties
(
entity
,
userVo
);
if
(
entity
!=
null
)
{
entity
.
setUpdHost
(
AppPermissionService
.
getIp
());
entity
.
setUpdatetime
(
Instant
.
now
().
toEpochMilli
()
/
1000L
);
mapper
.
updateByExampleSelective
(
entity
,
example
);
mapper
.
updateByExampleSelective
(
entity
,
example
);
}
}
catch
(
Exception
e
)
{
...
...
@@ -132,10 +143,6 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
mapper
.
deleteByExample
(
example
);
}
@CacheClear
(
pre
=
"user{1}"
)
public
void
updateUserPositionByUserId
(
Integer
userId
,
Integer
positionId
)
{
mapper
.
updateUserPositionByUserId
(
userId
,
positionId
);
}
public
AppUserInfoVo
findUserInfoByCode
(
String
code
)
{
AppUserInfoVo
appUserInfoVo
=
new
AppUserInfoVo
();
...
...
@@ -144,7 +151,7 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
appUserDetail
.
setCode
(
code
);
AppUserDetail
userDetail
=
mapper
.
selectOne
(
appUserDetail
);
if
(
userDetail
==
null
)
{
if
(
userDetail
==
null
)
{
return
appUserInfoVo
;
}
appUserInfoVo
.
setHeadimgurl
(
userDetail
.
getHeadimgurl
());
...
...
@@ -156,19 +163,19 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
return
mapper
.
getUserIdByUsername
(
keywords
);
}
public
void
updateByUserId
(
AccountBindDTO
accountBindDTO
,
Integer
userId
)
{
public
void
updateByUserId
(
AccountBindDTO
accountBindDTO
,
Integer
userId
)
{
AppUserDetail
appUserDetail
=
new
AppUserDetail
();
if
(
accountBindDTO
.
getType
().
equals
(
"wx"
)){
if
(
accountBindDTO
.
getType
().
equals
(
"wx"
))
{
appUserDetail
.
setWxNickname
(
accountBindDTO
.
getNickName
());
}
if
(
accountBindDTO
.
getType
().
equals
(
"q"
))
{
if
(
accountBindDTO
.
getType
().
equals
(
"q"
))
{
appUserDetail
.
setQqNickname
(
accountBindDTO
.
getNickName
());
}
Example
example
=
new
Example
(
AppUserDetail
.
class
);
Example
.
Criteria
criteria
=
example
.
createCriteria
();
criteria
.
andEqualTo
(
"userid"
,
userId
);
mapper
.
updateByExampleSelective
(
appUserDetail
,
example
);
criteria
.
andEqualTo
(
"userid"
,
userId
);
mapper
.
updateByExampleSelective
(
appUserDetail
,
example
);
}
public
List
<
AppUserVo
>
getUserByUserIds
(
List
<
Integer
>
ids
)
{
...
...
@@ -177,21 +184,21 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
public
List
<
UserStaffBo
>
findAllStaffs
()
{
List
<
UserStaffBo
>
userStaffBos
=
mapper
.
selectAllStaffs
();
return
CollectionUtils
.
isEmpty
(
userStaffBos
)
?
Collections
.
EMPTY_LIST
:
userStaffBos
;
return
CollectionUtils
.
isEmpty
(
userStaffBos
)
?
Collections
.
EMPTY_LIST
:
userStaffBos
;
}
public
List
<
AppUserVo
>
getUserByUserIdList
(
List
<
Integer
>
userIds
)
{
List
<
AppUserVo
>
appUserVos
=
mapper
.
getUserByUserIdList
(
userIds
);
return
CollectionUtils
.
isEmpty
(
appUserVos
)
?
Collections
.
EMPTY_LIST
:
appUserVos
;
return
CollectionUtils
.
isEmpty
(
appUserVos
)
?
Collections
.
EMPTY_LIST
:
appUserVos
;
}
public
PageDataVO
<
UserStaffBo
>
findAllStaffsByCompanyIdAndPostionIdWithPage
(
StaffStatisticsFindDTO
staffStatisticsFindDTO
)
{
return
PageDataVO
.
pageInfo
(
staffStatisticsFindDTO
.
getPage
(),
staffStatisticsFindDTO
.
getLimit
(),()->
mapper
.
findAllStaffsByCompanyIdAndPostionId
(
staffStatisticsFindDTO
));
return
PageDataVO
.
pageInfo
(
staffStatisticsFindDTO
.
getPage
(),
staffStatisticsFindDTO
.
getLimit
(),
()
->
mapper
.
findAllStaffsByCompanyIdAndPostionId
(
staffStatisticsFindDTO
));
}
public
List
<
UserStaffBo
>
findStaffsByIdsAndCompanyAndPostion
(
StaffStatisticsFindDTO
staffStatisticsFindDTO
)
{
List
<
UserStaffBo
>
staffBos
=
mapper
.
findAllStaffsByCompanyIdAndPostionId
(
staffStatisticsFindDTO
);
return
CollectionUtils
.
isEmpty
(
staffBos
)
?
Collections
.
EMPTY_LIST
:
staffBos
;
return
CollectionUtils
.
isEmpty
(
staffBos
)
?
Collections
.
EMPTY_LIST
:
staffBos
;
}
public
AppUserVo
findByCode
(
String
code
)
{
...
...
@@ -199,7 +206,26 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
AppUserDetail
appUserDetail
=
new
AppUserDetail
();
appUserDetail
.
setCode
(
code
);
appUserDetail
=
mapper
.
selectOne
(
appUserDetail
);
org
.
springframework
.
beans
.
BeanUtils
.
copyProperties
(
appUserDetail
,
appUserVo
);
org
.
springframework
.
beans
.
BeanUtils
.
copyProperties
(
appUserDetail
,
appUserVo
);
return
appUserVo
;
}
@CacheClear
(
pre
=
"user{1}"
)
public
void
updateUserPositionByUserId
(
Integer
userId
,
Integer
positionId
)
{
mapper
.
updateUserPositionByUserId
(
userId
,
positionId
);
}
@CacheClear
(
pre
=
"user{1}"
)
public
void
updateUserPosition
(
Integer
userId
,
Integer
positionId
,
Integer
operatorId
)
{
AppUserLogin
appUserLogin
=
new
AppUserLogin
();
if
(
appUserLoginBiz
.
selectById
(
userId
)
!=
null
)
{
appUserLogin
=
appUserLoginBiz
.
selectById
(
userId
);
if
(
appUserLogin
!=
null
)
{
String
phone
=
appUserLogin
.
getUsername
();
appUserPositionTempBiz
.
findUserPositionTemp
(
phone
,
positionId
,
operatorId
);
}
}
mapper
.
updateUserPositionByUserId
(
userId
,
positionId
);
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionChangeRecordBiz.java
View file @
78b51194
...
...
@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
import
com.github.wxiaoqi.security.admin.mapper.AppUserPositionChangeRecordMapper
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
lombok.NonNull
;
import
org.apache.commons.lang3.StringUtils
;
import
org.jsoup.select.Evaluator
;
import
org.springframework.beans.BeanUtils
;
...
...
@@ -39,7 +40,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
public
static
final
int
POSITION_CHANGE
=
3
;
public
static
final
int
COMPANY_CHANGE
=
4
;
public
static
final
int
USER_LEAVE_COMPANT
=
5
;
public
static
final
int
USER_AND_ADD_COMPANY
=
6
;
public
static
final
int
USER_AND_ADD_COMPANY
=
6
;
/**
* 变更记录表插入
...
...
@@ -103,12 +104,16 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
/**
* 员工复职
*
* @param userPositionTemp
* @param updUserId
*/
public
void
andAddJoinJobRecord
(
AppUserPositionTempDTO
userPositionTemp
,
Integer
updUserId
)
{
AppUserPositionChangeRecord
appUserPositionChangeRecord
=
new
AppUserPositionChangeRecord
();
appUserPositionChangeRecord
.
setPhone
(
userPositionTemp
.
getPhone
());
if
(
userPositionTemp
.
getPositionId
()
!=
null
)
{
appUserPositionChangeRecord
.
setNewPositionId
(
userPositionTemp
.
getPositionId
());
}
appUserPositionChangeRecord
.
setUserName
(
userPositionTemp
.
getName
());
appUserPositionChangeRecord
.
setRelTime
(
userPositionTemp
.
getRelTime
());
appUserPositionChangeRecord
.
setCrtTime
(
new
Timestamp
(
System
.
currentTimeMillis
()));
...
...
@@ -117,9 +122,24 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
mapper
.
insert
(
appUserPositionChangeRecord
);
}
/**
* APP用户修改身份
*
* @param userPositionTemp
* @param updUserId
*/
public
void
andAddJoinJobRecord
(
AppUserPositionTemp
userPositionTemp
,
Integer
updUserId
)
{
AppUserPositionChangeRecord
appUserPositionChangeRecord
=
new
AppUserPositionChangeRecord
();
appUserPositionChangeRecord
.
setPhone
(
userPositionTemp
.
getPhone
());
if
(
userPositionTemp
.
getPositionId
()
!=
null
)
{
appUserPositionChangeRecord
.
setNewPositionId
(
userPositionTemp
.
getPositionId
());
}
appUserPositionChangeRecord
.
setUserName
(
userPositionTemp
.
getName
());
appUserPositionChangeRecord
.
setCrtTime
(
new
Timestamp
(
System
.
currentTimeMillis
()));
appUserPositionChangeRecord
.
setJobRemark
(
USER_AND_ADD_COMPANY
);
appUserPositionChangeRecord
.
setOperatorId
(
updUserId
);
mapper
.
insert
(
appUserPositionChangeRecord
);
}
/**
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java
View file @
78b51194
...
...
@@ -3,10 +3,7 @@ package com.github.wxiaoqi.security.admin.biz;
import
com.github.wxiaoqi.security.admin.dto.AppUserPositionChangeRecordDTO
;
import
com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO
;
import
com.github.wxiaoqi.security.admin.dto.AppUserPositionTempFindDTO
;
import
com.github.wxiaoqi.security.admin.entity.AppUserJobLevel
;
import
com.github.wxiaoqi.security.admin.entity.AppUserLogin
;
import
com.github.wxiaoqi.security.admin.entity.AppUserPosition
;
import
com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp
;
import
com.github.wxiaoqi.security.admin.entity.*
;
import
com.github.wxiaoqi.security.admin.mapper.AppUserPositionTempMapper
;
import
com.github.wxiaoqi.security.admin.vo.AppUserPositionTempVo
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
...
...
@@ -15,8 +12,10 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.google.common.collect.Lists
;
import
com.xxfc.platform.im.utils.BeanUtil
;
import
com.xxfc.platform.vehicle.entity.BranchCompany
;
import
com.xxfc.platform.vehicle.feign.VehicleFeign
;
import
io.swagger.models.auth.In
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
...
...
@@ -28,6 +27,7 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
tk.mybatis.mapper.entity.Example
;
import
java.sql.Timestamp
;
import
java.time.Instant
;
import
java.util.*
;
import
java.util.stream.Collectors
;
...
...
@@ -65,6 +65,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
@Autowired
AppUserJobLevelBiz
jobLevelBiz
;
@Autowired
AppUserDetailBiz
appUserDetailBiz
;
@Autowired
AppUserPositionChangeRecordBiz
appUserPositionChangeRecordBiz
;
...
...
@@ -136,6 +139,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
if
(
Objects
.
nonNull
(
appUserPositionTempFindDTO
.
getCompanyId
()))
{
criteria
.
andEqualTo
(
"companyId"
,
appUserPositionTempFindDTO
.
getCompanyId
());
}
if
(
Objects
.
nonNull
(
appUserPositionTempFindDTO
.
getPositionId
()))
{
criteria
.
andEqualTo
(
"positionId"
,
appUserPositionTempFindDTO
.
getPositionId
());
}
if
(
Objects
.
nonNull
(
appUserPositionTempFindDTO
.
getStatus
()))
{
if
(
DataStatus
.
USERED
.
code
==
appUserPositionTempFindDTO
.
getStatus
())
{
criteria
.
andNotEqualTo
(
"userId"
,
0
);
...
...
@@ -356,7 +362,6 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
return
mapper
.
getUserIdByParentCompany
(
parentCompanyId
);
}
/**
* 员工信息修改,插入变更记录表
* zuoyh
...
...
@@ -400,6 +405,11 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
updateSelectiveById
(
userPositionTemp
);
appUserPositionChangeRecordBiz
.
addPositionChangeRecord
(
userPositionTemp
,
oldData
,
operatorId
,
appUserPositionTempDTO
.
getRelTime
());
}
//用户表更改其身份
AppUserLogin
userLogin
=
loginBiz
.
checkeUserLogin
(
userPositionTemp
.
getPhone
());
if
(
userLogin
!=
null
)
{
appUserDetailBiz
.
updateUserPosition
(
userLogin
.
getId
(),
appUserPositionTempDTO
.
getPositionId
(),
operatorId
);
}
return
ObjectRestResponse
.
succ
();
}
...
...
@@ -415,6 +425,12 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
updateSelectiveById
(
userPositionTemp
);
userPositionTemp
.
setUpdTime
(
System
.
currentTimeMillis
());
appUserPositionChangeRecordBiz
.
andAddJoinJobRecord
(
appUserPositionTempDTO
,
operatorId
);
//用户表更改其身份
AppUserLogin
userLogin
=
loginBiz
.
checkeUserLogin
(
userPositionTemp
.
getPhone
());
if
(
userLogin
!=
null
)
{
AppUserDetail
appUserDetail
=
new
AppUserDetail
();
appUserDetailBiz
.
updateUserPosition
(
userLogin
.
getId
(),
appUserPositionTempDTO
.
getPositionId
(),
operatorId
);
}
return
ObjectRestResponse
.
succ
();
}
...
...
@@ -427,4 +443,26 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
return
appUserPositionChangeRecordBiz
.
findPositionChangeRecord
(
userPositionTemp
);
}
/**
* zuoyh
* app用户表修改职位,员工记录表对应查询
*/
public
void
findUserPositionTemp
(
String
phone
,
Integer
positionId
,
Integer
operatorId
)
{
Timestamp
relTime
=
new
Timestamp
(
System
.
currentTimeMillis
());
Example
example
=
new
Example
(
AppUserPositionTemp
.
class
);
example
.
createCriteria
().
andEqualTo
(
"phone"
,
phone
);
List
<
AppUserPositionTemp
>
list
=
mapper
.
selectByExample
(
example
);
AppUserPositionTemp
newAppUserPositionTemp
=
new
AppUserPositionTemp
();
if
(
list
.
size
()>
0
)
{
newAppUserPositionTemp
=
list
.
get
(
0
);
if
(
newAppUserPositionTemp
!=
null
)
{
AppUserPositionTemp
odlAppUserPositionTemp
=
new
AppUserPositionTemp
();
BeanUtils
.
copyProperties
(
newAppUserPositionTemp
,
odlAppUserPositionTemp
);
newAppUserPositionTemp
.
setPositionId
(
positionId
);
newAppUserPositionTemp
.
setUpdTime
(
System
.
currentTimeMillis
());
mapper
.
updateByPrimaryKey
(
newAppUserPositionTemp
);
appUserPositionChangeRecordBiz
.
addPositionChangeRecord
(
newAppUserPositionTemp
,
odlAppUserPositionTemp
,
operatorId
,
relTime
);
}
}
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java
View file @
78b51194
...
...
@@ -12,22 +12,28 @@ import com.github.wxiaoqi.security.admin.entity.User;
import
com.github.wxiaoqi.security.admin.vo.AppUserManageVo
;
import
com.github.wxiaoqi.security.admin.vo.AppUserVo
;
import
com.github.wxiaoqi.security.auth.client.config.UserAuthConfig
;
import
com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil
;
import
com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo
;
import
com.github.wxiaoqi.security.common.exception.BaseException
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
import
com.xxfc.platform.vehicle.feign.VehicleFeign
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.Set
;
/**
* app用户管理类
*
* @author Administrator
*/
@Slf4j
@RestController
@RequestMapping
(
"appUsersManage"
)
public
class
AppUsersManageController
extends
BaseController
<
AppUserManageBiz
,
AppUserManage
>
{
public
class
AppUsersManageController
extends
BaseController
<
AppUserManageBiz
,
AppUserManage
>
{
@Autowired
private
AppUserLoginBiz
appUserLoginBiz
;
...
...
@@ -44,9 +50,14 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
@Autowired
private
VehicleFeign
vehicleFeign
;
private
Integer
ALL_PERMISSIONS
=
1
;
@Autowired
private
UserAuthUtil
userAuthUtil
;
private
Integer
ALL_PERMISSIONS
=
1
;
/**
* 查询所有
*
* @return
*/
@PostMapping
(
"/findAll"
)
...
...
@@ -54,7 +65,7 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
String
token
=
userAuthConfig
.
getToken
(
request
);
ObjectRestResponse
objectRestResponse
=
publicController
.
userinfoByToken
(
token
);
User
user
=
(
User
)
objectRestResponse
.
getData
();
if
(
user
==
null
)
{
if
(
user
==
null
)
{
throw
new
BaseException
(
"User error!"
);
}
if
(
ALL_PERMISSIONS
.
equals
(
user
.
getDataAll
()))
{
...
...
@@ -68,42 +79,47 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
/**
* 根据用户id获取用户详情
*
* @param userId
* @return
*/
@GetMapping
(
"/user_info/{id}"
)
public
ObjectRestResponse
<
AppUserManageVo
>
findUserInfo
(
@PathVariable
(
value
=
"id"
)
Integer
userId
){
public
ObjectRestResponse
<
AppUserManageVo
>
findUserInfo
(
@PathVariable
(
value
=
"id"
)
Integer
userId
)
{
AppUserManageVo
appUserManageVo
=
baseBiz
.
findUserInfoById
(
userId
);
return
ObjectRestResponse
.
succ
(
appUserManageVo
);
}
/**
* 查询一条
*
* @param id
* @return
*/
@GetMapping
(
"/findOneById/{id}"
)
public
ObjectRestResponse
<
AppUserVo
>
findOneById
(
@PathVariable
Integer
id
){
public
ObjectRestResponse
<
AppUserVo
>
findOneById
(
@PathVariable
Integer
id
)
{
return
ObjectRestResponse
.
succ
(
baseBiz
.
findOneById
(
id
));
}
/**
* 保存
*
* @param appUserVo
* @return
*/
@PostMapping
(
"/save"
)
public
ObjectRestResponse
save
(
@RequestBody
AppUserVo
appUserVo
)
{
public
ObjectRestResponse
save
(
@RequestBody
AppUserVo
appUserVo
)
{
baseBiz
.
save
(
appUserVo
);
return
ObjectRestResponse
.
succ
();
}
/**
* 禁用
*
* @param appUserId
* @return
*/
@PutMapping
(
"/disable/{appUserId}"
)
public
ObjectRestResponse
disable
(
@PathVariable
(
"appUserId"
)
Integer
appUserId
){
public
ObjectRestResponse
disable
(
@PathVariable
(
"appUserId"
)
Integer
appUserId
)
{
AppUserLogin
appUserLogin
=
new
AppUserLogin
();
appUserLogin
.
setStatus
(
Status
.
FORBIDDEN
);
appUserLogin
.
setId
(
appUserId
);
...
...
@@ -113,11 +129,12 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
/**
* 取消禁用
*
* @param appUserId
* @return
*/
@PutMapping
(
"/available/{appUserId}"
)
public
ObjectRestResponse
available
(
@PathVariable
(
"appUserId"
)
Integer
appUserId
){
public
ObjectRestResponse
available
(
@PathVariable
(
"appUserId"
)
Integer
appUserId
)
{
AppUserLogin
appUserLogin
=
new
AppUserLogin
();
appUserLogin
.
setStatus
(
Status
.
AVAILABLE
);
appUserLogin
.
setId
(
appUserId
);
...
...
@@ -127,19 +144,27 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
/**
* 删除用户
*
* @param id
* @return
*/
@DeleteMapping
(
"/deleteById/{id}"
)
public
ObjectRestResponse
deleteById
(
@PathVariable
Integer
id
){
public
ObjectRestResponse
deleteById
(
@PathVariable
Integer
id
)
{
appUserLoginBiz
.
deleteAppUserById
(
id
);
return
ObjectRestResponse
.
succ
();
}
@PutMapping
(
"/user_position"
)
public
ObjectRestResponse
<
Void
>
setUserPositionById
(
@RequestParam
(
"id"
)
Integer
id
,
@RequestParam
(
"positionId"
)
Integer
positionId
){
appUserDetailBiz
.
updateUserPositionByUserId
(
id
,
positionId
);
public
ObjectRestResponse
<
Void
>
setUserPositionById
(
@RequestParam
(
"id"
)
Integer
id
,
@RequestParam
(
"positionId"
)
Integer
positionId
,
HttpServletRequest
request
)
{
try
{
IJWTInfo
infoFromToken
=
userAuthUtil
.
getInfoFromToken
(
userAuthConfig
.
getToken
(
request
));
Integer
operatorId
=
Integer
.
valueOf
(
infoFromToken
.
getId
());
appUserDetailBiz
.
updateUserPosition
(
id
,
positionId
,
operatorId
);
return
ObjectRestResponse
.
succ
();
}
catch
(
Exception
e
)
{
log
.
error
(
"修改失败【{}】"
,
e
);
throw
new
BaseException
(
"修改失败"
);
}
}
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java
View file @
78b51194
...
...
@@ -114,8 +114,7 @@ public class AppUserPositionController {
try
{
IJWTInfo
infoFromToken
=
userAuthUtil
.
getInfoFromToken
(
userAuthConfig
.
getToken
(
request
));
Integer
operatorId
=
Integer
.
valueOf
(
infoFromToken
.
getId
());
appUserPositionTempBiz
.
addUserPositionChangeRecord
(
appUserPositionTempDTO
.
getChangeStatus
(),
appUserPositionTempDTO
,
operatorId
);
return
ObjectRestResponse
.
succ
();
return
ObjectRestResponse
.
succ
(
appUserPositionTempBiz
.
addUserPositionChangeRecord
(
appUserPositionTempDTO
.
getChangeStatus
(),
appUserPositionTempDTO
,
operatorId
))
;
}
catch
(
Exception
e
)
{
log
.
error
(
"修改失败【{}】"
,
e
);
throw
new
BaseException
(
"修改失败"
);
...
...
@@ -139,7 +138,7 @@ public class AppUserPositionController {
try
{
IJWTInfo
infoFromToken
=
userAuthUtil
.
getInfoFromToken
(
userAuthConfig
.
getToken
(
request
));
Integer
operatorId
=
Integer
.
valueOf
(
infoFromToken
.
getId
());
appUserPositionTempBiz
.
andAddUserPositionChangeRecord
(
appUserPositionTempDTO
,
operatorId
);
appUserPositionTempBiz
.
andAddUserPositionChangeRecord
(
appUserPositionTempDTO
,
operatorId
);
return
ObjectRestResponse
.
succ
();
}
catch
(
Exception
e
)
{
log
.
error
(
"修改失败【{}】"
,
e
);
...
...
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