Skip to content

C
cloud-platform
Commit 31cb7b89 authored by zuoyh's avatar zuoyh
Browse files
Options

Merge branch 'new-emploee-upd' into dev 

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempDTO.java
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempFindDTO.java
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPositionChangeRecord.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLoginBiz.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java
parents 3abc7c7c 5b793b16
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 176 deletions
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempDTO.java
View file @ 31cb7b89
...@@ -26,7 +26,8 @@ public class AppUserPositionTempDTO { ...@@ -26,7 +26,8 @@ public class AppUserPositionTempDTO {
@ApiModelProperty(value = "姓名") @ApiModelProperty(value = "姓名")
private String name; private String name;
@ApiModelProperty(value = "身份id")
@ApiModelProperty(value = "身份id")
private Integer positionId; private Integer positionId;
@ApiModelProperty(value = "员工职位id") @ApiModelProperty(value = "员工职位id")
...@@ -54,4 +55,5 @@ public class AppUserPositionTempDTO { ...@@ -54,4 +55,5 @@ public class AppUserPositionTempDTO {
private Integer userId; private Integer userId;
} }
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempFindDTO.java
View file @ 31cb7b89
...@@ -15,5 +15,5 @@ public class AppUserPositionTempFindDTO extends PageParam { ...@@ -15,5 +15,5 @@ public class AppUserPositionTempFindDTO extends PageParam {
private String name; private String name;
private Integer status; private Integer status;
private Integer companyId; private Integer companyId;
private Integer positionId; private Integer positionId;
} }
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPositionTemp.java
View file @ 31cb7b89
...@@ -75,6 +75,10 @@ public class AppUserPositionTemp implements Serializable { ...@@ -75,6 +75,10 @@ public class AppUserPositionTemp implements Serializable {
@ApiModelProperty(value = "是否删除：0-正常；1-删除") @ApiModelProperty(value = "是否删除：0-正常；1-删除")
private Integer isDel; private Integer isDel;
@Column(name = "is_quit")
@ApiModelProperty(value = "员工职位状态：0-正常；1-离职")
private Integer isQuit;
@Column(name = "is_quit") @Column(name = "is_quit")
@ApiModelProperty(value = "员工职位状态：0-正常；1-离职") @ApiModelProperty(value = "员工职位状态：0-正常；1-离职")
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java
View file @ 31cb7b89
...@@ -2,7 +2,6 @@ package com.github.wxiaoqi.security.admin.biz; ...@@ -2,7 +2,6 @@ package com.github.wxiaoqi.security.admin.biz;
import com.ace.cache.annotation.Cache; import com.ace.cache.annotation.Cache;
import com.ace.cache.annotation.CacheClear; import com.ace.cache.annotation.CacheClear;
import com.github.wxiaoqi.security.admin.bo.UserBo;
import com.github.wxiaoqi.security.admin.bo.UserStaffBo; import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
import com.github.wxiaoqi.security.admin.dto.AccountBindDTO; import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
import com.github.wxiaoqi.security.admin.dto.StaffStatisticsFindDTO; import com.github.wxiaoqi.security.admin.dto.StaffStatisticsFindDTO;
...@@ -13,6 +12,7 @@ import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo; ...@@ -13,6 +12,7 @@ import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
import com.github.wxiaoqi.security.admin.vo.AppUserVo; import com.github.wxiaoqi.security.admin.vo.AppUserVo;
import com.github.wxiaoqi.security.common.biz.BaseBiz; import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.vo.PageDataVO; import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.im.utils.BeanUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
...@@ -36,10 +36,6 @@ import java.util.stream.Collectors; ...@@ -36,10 +36,6 @@ import java.util.stream.Collectors;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail> { public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail> {
@Override @Override
@CacheClear(pre = "user{1.userid}") @CacheClear(pre = "user{1.userid}")
public void updateSelectiveById(AppUserDetail entity) { public void updateSelectiveById(AppUserDetail entity) {
...@@ -217,4 +213,19 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail ...@@ -217,4 +213,19 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
return CollectionUtils.isEmpty(userBoList)?Collections.emptyList():userBoList; return CollectionUtils.isEmpty(userBoList)?Collections.emptyList():userBoList;
} }
/**
* 判断员工是否是APP用户
*
* @return
*/
public AppUserDetail checkeIsAppUser(Integer userid) {
Example example = new Example(AppUserDetail.class);
example.createCriteria().andEqualTo("userid", userid);
List<AppUserDetail> appUserDetailList = mapper.selectByExample(example);
if (appUserDetailList != null && appUserDetailList.size() != 0) {
return appUserDetailList.get(0);
}
return null;
}
} }
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLoginBiz.java
View file @ 31cb7b89
...@@ -349,8 +349,9 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> { ...@@ -349,8 +349,9 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
} }
public List<AppUserLogin> getUserByUsernameAndRealName(String username, String realName) { public List<AppUserLogin> getUserByUsernameAndRealName(String username, String realName) {
return mapper.getUserByUsernameAndRealName(username,realName);
return mapper.getUserByUsernameAndRealName(username, realName);
} }
...@@ -425,7 +426,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> { ...@@ -425,7 +426,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
public List<Integer> findAppuser(String phone, String leaderPhone, String name) { public List<Integer> findAppuser(String phone, String leaderPhone, String name) {
List<Integer> memberIds = null; List<Integer> memberIds = null;
//1.根据leader手机号查询userid //1.根据leader手机号查询userid
boolean isNoNullLeaderPhone = StringUtils.isNotEmpty(leaderPhone) && leaderPhone.trim().length() > 0; boolean isNoNullLeaderPhone = StringUtils.isNotEmpty(leaderPhone) && leaderPhone.trim().length()>0;
if (isNoNullLeaderPhone) { if (isNoNullLeaderPhone) {
List<AppUserLogin> appUserLogins = mapper.selectbyPhones(Arrays.asList(leaderPhone)); List<AppUserLogin> appUserLogins = mapper.selectbyPhones(Arrays.asList(leaderPhone));
Integer leaderId = null; Integer leaderId = null;
...@@ -433,34 +434,34 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> { ...@@ -433,34 +434,34 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
leaderId = appUserLogins.get(0).getId(); leaderId = appUserLogins.get(0).getId();
//2.根据leader userId查询下级 userid //2.根据leader userId查询下级 userid
if (Objects.nonNull(leaderId)) { if (Objects.nonNull(leaderId)) {
memberIds = appUserSellingWaterBiz.findMemberIdByLeaderIdAndOrdreType(leaderId, 3); memberIds = appUserSellingWaterBiz.findMemberIdByLeaderIdAndOrdreType(leaderId,3);
if (CollectionUtils.isEmpty(memberIds)) { if(CollectionUtils.isEmpty(memberIds)){
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
}
} }
} }
}
List<Integer> userIds = mapper.findAppUser(phone, name, memberIds); List<Integer> userIds = mapper.findAppUser(phone, name, memberIds);
return userIds == null ? Collections.EMPTY_LIST : userIds; return userIds==null?Collections.EMPTY_LIST:userIds;
} }
public List<UserBo> findUserDetailInfo(List<UserBo> userBos) { public List<UserBo> findUserDetailInfo(List<UserBo> userBos) {
Map<String, Integer> userIdAndFacilitateIdMap = userBos.stream().filter(x -> Objects.nonNull(x.getFacilitateId())).collect(Collectors.toMap(UserBo::getOrderNo, UserBo::getFacilitateId)); Map<String, Integer> userIdAndFacilitateIdMap = userBos.stream().filter(x->Objects.nonNull(x.getFacilitateId())).collect(Collectors.toMap(UserBo::getOrderNo, UserBo::getFacilitateId));
List<Integer> userIdList = userBos.stream().map(UserBo::getUserId).distinct().collect(Collectors.toList()); List<Integer> userIdList = userBos.stream().map(UserBo::getUserId).distinct().collect(Collectors.toList());
//查询上级人 //查询上级人
List<AppUserRelation> appUserRelationList = appUserRelationBiz.findLeaderByUserIds(userIdList); List<AppUserRelation> appUserRelationList = appUserRelationBiz.findLeaderByUserIds(userIdList);
Map<Integer, Integer> memberIdAndParentMap = appUserRelationList.stream().collect(Collectors.toMap(AppUserRelation::getUserId, AppUserRelation::getParentId)); Map<Integer, Integer> memberIdAndParentMap = appUserRelationList.stream().collect(Collectors.toMap(AppUserRelation::getUserId, AppUserRelation::getParentId));
List<Integer> uids = new ArrayList<>(); List<Integer> uids = new ArrayList<>();
uids.addAll(userIdAndFacilitateIdMap == null ? Collections.EMPTY_LIST : userIdList); uids.addAll(userIdAndFacilitateIdMap==null?Collections.EMPTY_LIST:userIdList);
uids.addAll(userIdAndFacilitateIdMap == null ? Collections.EMPTY_LIST : userIdAndFacilitateIdMap.values()); uids.addAll(userIdAndFacilitateIdMap==null?Collections.EMPTY_LIST:userIdAndFacilitateIdMap.values());
uids.addAll(memberIdAndParentMap == null ? Collections.EMPTY_LIST : memberIdAndParentMap.values()); uids.addAll(memberIdAndParentMap==null?Collections.EMPTY_LIST:memberIdAndParentMap.values());
List<UserBo> userBoList = mapper.selectByUserIds(uids); List<UserBo> userBoList = mapper.selectByUserIds(uids);
Map<Integer, UserBo> userMap = userBoList == null ? Collections.EMPTY_MAP : userBoList.stream().collect(Collectors.toMap(UserBo::getUserId, Function.identity())); Map<Integer, UserBo> userMap = userBoList==null?Collections.EMPTY_MAP:userBoList.stream().collect(Collectors.toMap(UserBo::getUserId, Function.identity()));
if (userMap.isEmpty()) { if (userMap.isEmpty()){
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
...@@ -483,14 +484,12 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> { ...@@ -483,14 +484,12 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
} }
return userBos; return userBos;
} }
@CacheClear(pre = "user{1}")
@CacheClear(pre = "user{1}")
public void updateUserPosition(Integer userId, Integer positionId, Integer operatorId) { public void updateUserPosition(Integer userId, Integer positionId, Integer operatorId) {
AppUserLogin appUserLogin = selectById(userId); AppUserLogin appUserLogin = selectById(userId);
if (appUserLogin != null) { if (appUserLogin != null) {
String phone = appUserLogin.getUsername(); String phone = appUserLogin.getUsername();
appUserPositionTempBiz.findUserPositionTemp(phone, positionId, operatorId); appUserPositionTempBiz.findUserPositionTemp(userId, positionId, operatorId);
} }
appUserDetailBiz.updateUserPositionByUserId(userId, positionId); appUserDetailBiz.updateUserPositionByUserId(userId, positionId);
} }
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java
View file @ 31cb7b89
...@@ -27,13 +27,12 @@ import java.util.Set; ...@@ -27,13 +27,12 @@ import java.util.Set;
/** /**
* app用户管理类 * app用户管理类
*
* @author Administrator * @author Administrator
*/ */
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("appUsersManage") @RequestMapping("appUsersManage")
public class AppUsersManageController extends BaseController<AppUserManageBiz, AppUserManage> { public class AppUsersManageController extends BaseController<AppUserManageBiz,AppUserManage> {
@Autowired @Autowired
private AppUserLoginBiz appUserLoginBiz; private AppUserLoginBiz appUserLoginBiz;
...@@ -53,45 +52,41 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A ...@@ -53,45 +52,41 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A
@Autowired @Autowired
private UserAuthUtil userAuthUtil; private UserAuthUtil userAuthUtil;
private Integer ALL_PERMISSIONS = 1;
private Integer ALL_PERMISSIONS=1;
/** /**
* 查询所有 * 查询所有
*
* @return * @return
*/ */
@PostMapping("/findAll") @PostMapping("/findAll")
public ObjectRestResponse<PageInfo<AppUserManageVo>> findAllByQuery(@RequestBody AppUserManageDTO appUserManageDTO) throws Exception { public ObjectRestResponse<PageInfo<AppUserManageVo>> findAllByQuery(@RequestBody AppUserManageDTO appUserManageDTO) throws Exception {
String token = userAuthConfig.getToken(request); String token = userAuthConfig.getToken(request);
ObjectRestResponse objectRestResponse = publicController.userinfoByToken(token); ObjectRestResponse objectRestResponse = publicController.userinfoByToken(token);
User user = (User) objectRestResponse.getData(); User user = (User) objectRestResponse.getData();
if (user == null) { if (user==null){
throw new BaseException("User error!"); throw new BaseException("User error!");
} }
if (ALL_PERMISSIONS.equals(user.getDataAll())) { if (ALL_PERMISSIONS.equals(user.getDataAll())) {
return ObjectRestResponse.succ(baseBiz.findAllByQuery(appUserManageDTO)); return ObjectRestResponse.succ(baseBiz.findAllByQuery(appUserManageDTO));
} }
ObjectRestResponse<Set<Integer>> setObjectRestResponse = vehicleFeign.corporationCity(user.getDataZone(), user.getDataCompany()); ObjectRestResponse<Set<Integer>> setObjectRestResponse = vehicleFeign.corporationCity(user.getDataZone(), user.getDataCompany());
Set<Integer> cityList = setObjectRestResponse.getData(); Set<Integer> cityList = setObjectRestResponse.getData();
appUserManageDTO.setCitySet(cityList); appUserManageDTO.setCitySet(cityList);
return ObjectRestResponse.succ(baseBiz.findAllByQueryAndCity(appUserManageDTO)); return ObjectRestResponse.succ(baseBiz.findAllByQueryAndCity(appUserManageDTO));
} }
/** /**
* 根据用户id获取用户详情 * 根据用户id获取用户详情
*
* @param userId * @param userId
* @return * @return
*/ */
@GetMapping("/user_info/{id}") @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); AppUserManageVo appUserManageVo = baseBiz.findUserInfoById(userId);
return ObjectRestResponse.succ(appUserManageVo); return ObjectRestResponse.succ(appUserManageVo);
} }
/** /**
* 查询一条 * 查询一条
*
* @param id * @param id
* @return * @return
*/ */
...@@ -102,24 +97,22 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A ...@@ -102,24 +97,22 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A
/** /**
* 保存 * 保存
*
* @param appUserVo * @param appUserVo
* @return * @return
*/ */
@PostMapping("/save") @PostMapping("/save")
public ObjectRestResponse save(@RequestBody AppUserVo appUserVo) { public ObjectRestResponse save(@RequestBody AppUserVo appUserVo){
baseBiz.save(appUserVo); baseBiz.save(appUserVo);
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
} }
/** /**
* 禁用 * 禁用
*
* @param appUserId * @param appUserId
* @return * @return
*/ */
@PutMapping("/disable/{appUserId}") @PutMapping("/disable/{appUserId}")
public ObjectRestResponse disable(@PathVariable("appUserId") Integer appUserId) { public ObjectRestResponse disable(@PathVariable("appUserId") Integer appUserId){
AppUserLogin appUserLogin = new AppUserLogin(); AppUserLogin appUserLogin = new AppUserLogin();
appUserLogin.setStatus(Status.FORBIDDEN); appUserLogin.setStatus(Status.FORBIDDEN);
appUserLogin.setId(appUserId); appUserLogin.setId(appUserId);
...@@ -129,12 +122,11 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A ...@@ -129,12 +122,11 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A
/** /**
* 取消禁用 * 取消禁用
*
* @param appUserId * @param appUserId
* @return * @return
*/ */
@PutMapping("/available/{appUserId}") @PutMapping("/available/{appUserId}")
public ObjectRestResponse available(@PathVariable("appUserId") Integer appUserId) { public ObjectRestResponse available(@PathVariable("appUserId") Integer appUserId){
AppUserLogin appUserLogin = new AppUserLogin(); AppUserLogin appUserLogin = new AppUserLogin();
appUserLogin.setStatus(Status.AVAILABLE); appUserLogin.setStatus(Status.AVAILABLE);
appUserLogin.setId(appUserId); appUserLogin.setId(appUserId);
...@@ -144,12 +136,11 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A ...@@ -144,12 +136,11 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A
/** /**
* 删除用户 * 删除用户
*
* @param id * @param id
* @return * @return
*/ */
@DeleteMapping("/deleteById/{id}") @DeleteMapping("/deleteById/{id}")
public ObjectRestResponse deleteById(@PathVariable Integer id) { public ObjectRestResponse deleteById(@PathVariable Integer id){
appUserLoginBiz.deleteAppUserById(id); appUserLoginBiz.deleteAppUserById(id);
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
} }
...@@ -168,3 +159,4 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A ...@@ -168,3 +159,4 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz, A
} }
} }
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