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
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/biz/AppUserPositionTempBiz.java
View file @ 31cb7b89
...@@ -12,13 +12,11 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; ...@@ -12,13 +12,11 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.process.ResultCode; import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.github.wxiaoqi.security.common.vo.PageDataVO; import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.google.common.collect.Lists; 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.entity.BranchCompany;
import com.xxfc.platform.vehicle.feign.VehicleFeign; import com.xxfc.platform.vehicle.feign.VehicleFeign;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -65,27 +63,24 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -65,27 +63,24 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
@Autowired @Autowired
AppUserJobLevelBiz jobLevelBiz; AppUserJobLevelBiz jobLevelBiz;
@Autowired
AppUserDetailBiz appUserDetailBiz;
@Autowired @Autowired
AppUserPositionChangeRecordBiz appUserPositionChangeRecordBiz; AppUserPositionChangeRecordBiz appUserPositionChangeRecordBiz;
public ObjectRestResponse add(AppUserPositionTempDTO appUserPositionTempDTO, Integer updUserId) { public ObjectRestResponse add(AppUserPositionTempDTO appUserPositionTempDTO) {
if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName()) if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName())
|| appUserPositionTempDTO.getPositionId() == null || appUserPositionTempDTO.getPositionId() == 0) { || appUserPositionTempDTO.getPositionId() == null || appUserPositionTempDTO.getPositionId() == 0) {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空"); return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
} }
Integer companyId = appUserPositionTempDTO.getCompanyId(); Integer companyId=appUserPositionTempDTO.getCompanyId();
String companyName = appUserPositionTempDTO.getCompanyName(); String companyName=appUserPositionTempDTO.getCompanyName();
if (!(companyId != null && companyId > 0 && StringUtils.isNotBlank(companyName))) if (!(companyId!=null&&companyId>0&&StringUtils.isNotBlank(companyName)))
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在"); return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
BranchCompany branchCompany = vehicleFeign.companyId(companyName); BranchCompany branchCompany=vehicleFeign.companyId(companyName);
if (branchCompany == null) { if (branchCompany==null){
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在"); return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
} }
companyId = branchCompany.getId(); companyId=branchCompany.getId();
companyName = branchCompany.getName(); companyName=branchCompany.getName();
String phone = appUserPositionTempDTO.getPhone(); String phone = appUserPositionTempDTO.getPhone();
Integer id = appUserPositionTempDTO.getId() == null ? 0 : appUserPositionTempDTO.getId(); Integer id = appUserPositionTempDTO.getId() == null ? 0 : appUserPositionTempDTO.getId();
Example example = new Example(AppUserPositionTemp.class); Example example = new Example(AppUserPositionTemp.class);
...@@ -110,11 +105,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -110,11 +105,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
} else { } else {
updateSelectiveById(userPositionTemp); updateSelectiveById(userPositionTemp);
} }
if (userId != 0) { if (userId!=0){
detailBiz.updateUserPositionByUserId(userId, appUserPositionTempDTO.getPositionId()); detailBiz.updateUserPositionByUserId(userId,appUserPositionTempDTO.getPositionId());
} }
//记录表插入
appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempDTO, updUserId);
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
} }
...@@ -133,24 +126,21 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -133,24 +126,21 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
if (StringUtils.isNotEmpty(appUserPositionTempFindDTO.getName())) { if (StringUtils.isNotEmpty(appUserPositionTempFindDTO.getName())) {
criteria.andLike("name", String.format("%%%s%%", appUserPositionTempFindDTO.getName().trim())); criteria.andLike("name", String.format("%%%s%%", appUserPositionTempFindDTO.getName().trim()));
} }
if (Objects.nonNull(appUserPositionTempFindDTO.getPositionId())) {
criteria.andEqualTo("positionId", appUserPositionTempFindDTO.getPositionId());
}
if (StringUtils.isNotEmpty(appUserPositionTempFindDTO.getPhone())) { if (StringUtils.isNotEmpty(appUserPositionTempFindDTO.getPhone())) {
criteria.andEqualTo("phone", appUserPositionTempFindDTO.getPhone()); criteria.andEqualTo("phone", appUserPositionTempFindDTO.getPhone());
} }
if (Objects.nonNull(appUserPositionTempFindDTO.getCompanyId())) {
criteria.andEqualTo("companyId", appUserPositionTempFindDTO.getCompanyId());
}
if (Objects.nonNull(appUserPositionTempFindDTO.getPositionId())) { if (Objects.nonNull(appUserPositionTempFindDTO.getPositionId())) {
criteria.andEqualTo("positionId", appUserPositionTempFindDTO.getPositionId()); criteria.andEqualTo("positionId", appUserPositionTempFindDTO.getPositionId());
} }
if (Objects.nonNull(appUserPositionTempFindDTO.getStatus())) { if (Objects.nonNull(appUserPositionTempFindDTO.getCompanyId())) {
criteria.andEqualTo("companyId", appUserPositionTempFindDTO.getCompanyId());
}
if(Objects.nonNull(appUserPositionTempFindDTO.getStatus())) {
if (DataStatus.USERED.code == appUserPositionTempFindDTO.getStatus()) { if (DataStatus.USERED.code == appUserPositionTempFindDTO.getStatus()) {
criteria.andNotEqualTo("userId", 0); criteria.andNotEqualTo("userId",0);
} }
if (DataStatus.NO_USERED.code == appUserPositionTempFindDTO.getStatus()) { if (DataStatus.NO_USERED.code == appUserPositionTempFindDTO.getStatus()) {
criteria.andEqualTo("userId", 0); criteria.andEqualTo("userId",0);
} }
} }
example.setOrderByClause("upd_time desc"); example.setOrderByClause("upd_time desc");
...@@ -172,14 +162,14 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -172,14 +162,14 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
for (AppUserPositionTemp appUserPositionTemp : data) { for (AppUserPositionTemp appUserPositionTemp : data) {
appUserPositionTempVo = new AppUserPositionTempVo(); appUserPositionTempVo = new AppUserPositionTempVo();
BeanUtils.copyProperties(appUserPositionTemp, appUserPositionTempVo); BeanUtils.copyProperties(appUserPositionTemp, appUserPositionTempVo);
String postionName = postionMap == null ? "" : postionMap.get(appUserPositionTemp.getPositionId()) == null ? "" : postionMap.get(appUserPositionTemp.getPositionId()).getName(); String postionName = postionMap == null ? "" : postionMap.get(appUserPositionTemp.getPositionId())==null?"":postionMap.get(appUserPositionTemp.getPositionId()).getName();
String jobName = jobMap == null ? "" : jobMap.get(appUserPositionTemp.getJobId()) == null ? "" : jobMap.get(appUserPositionTemp.getJobId()).getName(); String jobName = jobMap == null ? "" : jobMap.get(appUserPositionTemp.getJobId())==null?"":jobMap.get(appUserPositionTemp.getJobId()).getName();
appUserPositionTempVo.setPositionName(postionName); appUserPositionTempVo.setPositionName(postionName);
appUserPositionTempVo.setJobName(jobName); appUserPositionTempVo.setJobName(jobName);
appUserPositionTempVo.setIsQuit(appUserPositionTemp.getIsQuit()); appUserPositionTempVo.setStatus(appUserPositionTemp.getUserId() == null ? DataStatus.NO_USERED.code : appUserPositionTemp.getUserId()==0?DataStatus.NO_USERED.code:DataStatus.USERED.code);
appUserPositionTempVo.setStatus(appUserPositionTemp.getUserId() == null ? DataStatus.NO_USERED.code : appUserPositionTemp.getUserId() == 0 ? DataStatus.NO_USERED.code : DataStatus.USERED.code);
appUserPositionTempVos.add(appUserPositionTempVo); appUserPositionTempVos.add(appUserPositionTempVo);
} }
dataVO.setData(appUserPositionTempVos); dataVO.setData(appUserPositionTempVos);
dataVO.setPageSize(pageDataVO.getPageSize()); dataVO.setPageSize(pageDataVO.getPageSize());
dataVO.setPageNum(pageDataVO.getPageNum()); dataVO.setPageNum(pageDataVO.getPageNum());
...@@ -188,8 +178,8 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -188,8 +178,8 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
return dataVO; return dataVO;
} }
public Map<String, Object> importUserPostion(List<String[]> userPostionData) { public Map<String,Object> importUserPostion(List<String[]> userPostionData) {
Map<String, Object> result = new HashMap<>(2); Map<String,Object> result = new HashMap<>(2);
List<Map<String, Object>> errorResult = Lists.newArrayList(); List<Map<String, Object>> errorResult = Lists.newArrayList();
Map<String, Object> errorResultMap; Map<String, Object> errorResultMap;
...@@ -198,37 +188,37 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -198,37 +188,37 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
for (int i = 0; i < userPostionData.size(); i++) { for (int i = 0; i < userPostionData.size(); i++) {
String[] data = userPostionData.get(i); String[] data = userPostionData.get(i);
Integer postionId = null; Integer postionId = null;
String name = ""; String name="";
String phone = ""; String phone="";
String postionName = ""; String postionName="";
try { try {
name = data[0]; name = data[0];
phone = data[1]; phone = data[1];
if (StringUtils.isEmpty(phone)) { if (StringUtils.isEmpty(phone)){
throw new BaseException("手机号为空"); throw new BaseException("手机号为空");
} }
postionName = data[2]; postionName = data[2];
if (StringUtils.isEmpty(postionName)) { if (StringUtils.isEmpty(postionName)){
throw new BaseException("身份为空"); throw new BaseException("身份为空");
} }
if (StringUtils.isNotBlank(name)) { if (StringUtils.isNotBlank(name)){
name.replaceAll(" ", ""); name.replaceAll(" ","");
} }
Example example = new Example(AppUserPositionTemp.class); Example example = new Example(AppUserPositionTemp.class);
example.createCriteria().andEqualTo("phone", phone).andEqualTo("isDel", 0); example.createCriteria().andEqualTo("phone", phone).andEqualTo("isDel", 0);
List<AppUserPositionTemp> list = selectByExample(example); List<AppUserPositionTemp> list = selectByExample(example);
Integer id = 0; Integer id=0;
Integer userId = 0; Integer userId=0;
if (list.size() > 0) { if (list.size()>0){
AppUserPositionTemp appUserPositionTemp1 = list.get(0); AppUserPositionTemp appUserPositionTemp1= list.get(0);
id = appUserPositionTemp1.getId(); id=appUserPositionTemp1.getId();
userId = appUserPositionTemp1.getUserId(); userId=appUserPositionTemp1.getUserId();
} }
if (userId == null || userId == 0) { if (userId==null||userId==0){
//根据手机号查询userId //根据手机号查询userId
AppUserLogin userLogin = loginBiz.checkeUserLogin(phone); AppUserLogin userLogin = loginBiz.checkeUserLogin(phone);
if (Objects.nonNull(userLogin)) { if (Objects.nonNull(userLogin)) {
userId = userLogin.getId(); userId=userLogin.getId();
} }
} }
for (Map.Entry<Integer, String> integerStringEntry : entrySet) { for (Map.Entry<Integer, String> integerStringEntry : entrySet) {
...@@ -237,21 +227,21 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -237,21 +227,21 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
break; break;
} }
} }
String companyName = data[3]; String companyName=data[3];
Integer companyId = 0; Integer companyId=0;
if (StringUtils.isNotBlank(companyName)) { if (StringUtils.isNotBlank(companyName)){
BranchCompany branchCompany = vehicleFeign.companyId(companyName); BranchCompany branchCompany=vehicleFeign.companyId(companyName);
if (branchCompany != null) { if (branchCompany!=null){
companyId = branchCompany.getId(); companyId=branchCompany.getId();
companyName = branchCompany.getName(); companyName=branchCompany.getName();
} else { }else {
companyName = null; companyName=null;
} }
} }
String jobName = data[4]; String jobName=data[4];
Integer jobId = 2; Integer jobId=2;
if (StringUtils.isNotBlank(jobName) && jobName.contains("销售")) { if (StringUtils.isNotBlank(jobName)&&jobName.contains("销售")){
jobId = 1; jobId=1;
} }
appUserPositionTemp = new AppUserPositionTemp(); appUserPositionTemp = new AppUserPositionTemp();
appUserPositionTemp.setName(name); appUserPositionTemp.setName(name);
...@@ -260,50 +250,48 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -260,50 +250,48 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
appUserPositionTemp.setCompanyId(companyId); appUserPositionTemp.setCompanyId(companyId);
appUserPositionTemp.setCompanyName(companyName); appUserPositionTemp.setCompanyName(companyName);
appUserPositionTemp.setJobId(jobId); appUserPositionTemp.setJobId(jobId);
if (userId != null && userId > 0) { if (userId!=null&&userId>0) {
//更新用户身份信息 //更新用户身份信息
detailBiz.updateUserPositionByUserId(userId, postionId); detailBiz.updateUserPositionByUserId(userId, postionId);
appUserPositionTemp.setUserId(userId); appUserPositionTemp.setUserId(userId);
} }
if (id != null && id > 0) { if (id!=null&&id>0){
appUserPositionTemp.setId(id); appUserPositionTemp.setId(id);
updateSelectiveById(appUserPositionTemp); updateSelectiveById(appUserPositionTemp);
} else { }else {
insertSelective(appUserPositionTemp); insertSelective(appUserPositionTemp);
} }
} catch (BaseException ex) { } catch (BaseException ex) {
errorResultMap = new HashMap<>(1); errorResultMap = new HashMap<>(1);
errorResultMap.put("num", i); errorResultMap.put("num", i);
errorResultMap.put("msg", ex.getMessage()); errorResultMap.put("msg",ex.getMessage());
errorResult.add(errorResultMap); errorResult.add(errorResultMap);
} catch (ArrayIndexOutOfBoundsException ex) { }catch (ArrayIndexOutOfBoundsException ex){
errorResultMap = new HashMap<>(1); errorResultMap = new HashMap<>(1);
errorResultMap.put("num", i); errorResultMap.put("num", i);
String msg = ""; String msg= "";
if (StringUtils.isEmpty(phone)) { if(StringUtils.isEmpty(phone)){
msg += "手机号码缺失"; msg+="手机号码缺失";
} }
if (StringUtils.isEmpty(postionName)) { if (StringUtils.isEmpty(postionName)){
msg += ",身份信息缺失"; msg+=",身份信息缺失";
} }
errorResultMap.put("msg", msg); errorResultMap.put("msg",msg);
errorResult.add(errorResultMap); errorResult.add(errorResultMap);
} catch (Exception ex) { } catch (Exception ex){
errorResultMap = new HashMap<>(1); errorResultMap = new HashMap<>(1);
errorResultMap.put("num", i); errorResultMap.put("num", i);
errorResultMap.put("msg", "数据" + Arrays.toString(data) + "保存失败"); errorResultMap.put("msg","数据"+Arrays.toString(data)+"保存失败");
errorResult.add(errorResultMap); errorResult.add(errorResultMap);
} }
} }
result.put("success", userPostionData.size() - errorResult.size()); result.put("success",userPostionData.size()-errorResult.size());
result.put("error", errorResult.size()); result.put("error",errorResult.size());
result.put("data", errorResult); result.put("data",errorResult);
return result; return result;
} }
private enum DataStatus { private enum DataStatus {
USERED(1), NO_USERED(0); USERED(1), NO_USERED(0);
private int code; private int code;
...@@ -319,66 +307,52 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -319,66 +307,52 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
} }
public void setPostionIdByPhone(String phone) { public void setPostionIdByPhone(String phone){
try { try {
Example example = new Example(AppUserPositionTemp.class); Example example = new Example(AppUserPositionTemp.class);
example.createCriteria().andEqualTo("phone", phone).andEqualTo("isDel", 0); example.createCriteria().andEqualTo("phone", phone).andEqualTo("isDel", 0);
List<AppUserPositionTemp> list = selectByExample(example); List<AppUserPositionTemp> list = selectByExample(example);
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)){
log.info("----用户无身份----phone===" + phone); log.info("----用户无身份----phone==="+phone);
return; return;
} }
AppUserPositionTemp positionTemp = list.get(0); AppUserPositionTemp positionTemp=list.get(0);
if (positionTemp.getUserId() > 0) { if (positionTemp.getUserId()>0){
log.info("----用户已存在身份----phone===" + phone); log.info("----用户已存在身份----phone==="+phone);
return; return;
} }
//根据手机号查询userId //根据手机号查询userId
AppUserLogin userLogin = loginBiz.checkeUserLogin(phone); AppUserLogin userLogin = loginBiz.checkeUserLogin(phone);
if (userLogin == null) { if (userLogin==null) {
log.info("----用户不存在----phone===" + phone); log.info("----用户不存在----phone==="+phone);
return; return;
} }
Integer userId = userLogin.getId(); Integer userId=userLogin.getId();
positionTemp.setUserId(userId); positionTemp.setUserId(userId);
int num = updateSelectiveByIdRe(positionTemp); int num=updateSelectiveByIdRe(positionTemp);
if (num > 0) { if (num>0){
Integer postionId = positionTemp.getPositionId(); Integer postionId=positionTemp.getPositionId();
log.info("----用户---postionId====" + postionId + "----phone===" + phone); log.info("----用户---postionId===="+postionId+"----phone==="+phone);
detailBiz.updateUserPositionByUserId(userId, postionId); detailBiz.updateUserPositionByUserId(userId, postionId);
} }
} catch (Exception e) { }catch (Exception e){
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
} }
public AppUserPositionTemp getOne(Integer userId) { public AppUserPositionTemp getOne(Integer userId){
Example example = new Example(AppUserPositionTemp.class); Example example = new Example(AppUserPositionTemp.class);
example.createCriteria().andEqualTo("userId", userId).andEqualTo("isDel", 0); example.createCriteria().andEqualTo("userId", userId).andEqualTo("isDel", 0);
List<AppUserPositionTemp> list = selectByExample(example); List<AppUserPositionTemp> list=selectByExample(example);
if (list.size() > 0) { if (list.size()>0){
return list.get(0); return list.get(0);
} }
return null; return null;
} }
/**
*
* @return
*/
public ObjectRestResponse updateUserPositon(T obj) {
Example example = new Example(AppUserPositionTemp.class);
Integer userId = 888;
example.createCriteria().andEqualTo("userId", userId);
List<AppUserPositionTemp> list = selectByExample(example);
System.out.println(list);
mapper.deleteByExample(example);
return ObjectRestResponse.succ("成功:" + list);
}
public List<Integer> getUserIdByParentCompany(List<Integer> parentCompanyId) { public List<Integer> getUserIdByParentCompany(List<Integer> parentCompanyId) {
return mapper.getUserIdByParentCompany(parentCompanyId); return mapper.getUserIdByParentCompany(parentCompanyId);
} }
/** /**
...@@ -426,9 +400,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -426,9 +400,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId, appUserPositionTempDTO.getRelTime()); appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId, appUserPositionTempDTO.getRelTime());
} }
//用户表更改其身份 //用户表更改其身份
AppUserLogin userLogin = loginBiz.checkeUserLogin(userPositionTemp.getPhone()); AppUserDetail appUserDetail = detailBiz.checkeIsAppUser(userPositionTemp.getUserId());
if (userLogin != null) { if (appUserDetail != null) {
loginBiz.updateUserPosition(userLogin.getId(), appUserPositionTempDTO.getPositionId()); loginBiz.updateUserPosition(appUserDetail.getId(), appUserPositionTempDTO.getPositionId());
} }
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
} }
...@@ -446,10 +420,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -446,10 +420,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
userPositionTemp.setUpdTime(System.currentTimeMillis()); userPositionTemp.setUpdTime(System.currentTimeMillis());
appUserPositionChangeRecordBiz.andAddJoinJobRecord(appUserPositionTempDTO, operatorId); appUserPositionChangeRecordBiz.andAddJoinJobRecord(appUserPositionTempDTO, operatorId);
//用户表更改其身份 //用户表更改其身份
AppUserLogin userLogin = loginBiz.checkeUserLogin(userPositionTemp.getPhone()); AppUserDetail appUserDetail = detailBiz.checkeIsAppUser(userPositionTemp.getUserId());
if (userLogin != null) { if (appUserDetail != null) {
AppUserDetail appUserDetail = new AppUserDetail(); loginBiz.updateUserPosition(appUserDetail.getId(), appUserPositionTempDTO.getPositionId());
loginBiz.updateUserPosition(userLogin.getId(), appUserPositionTempDTO.getPositionId(), operatorId);
} }
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
} }
...@@ -467,14 +440,14 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -467,14 +440,14 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
* zuoyh * zuoyh
* app用户表修改职位，员工记录表对应查询 * app用户表修改职位，员工记录表对应查询
*/ */
public void findUserPositionTemp(String phone, Integer positionId, Integer operatorId) { public void findUserPositionTemp(Integer userId, Integer positionId, Integer operatorId) {
Timestamp relTime = new Timestamp(System.currentTimeMillis()); Timestamp relTime = new Timestamp(System.currentTimeMillis());
Example example = new Example(AppUserPositionTemp.class); Example example = new Example(AppUserPositionTemp.class);
example.createCriteria().andEqualTo("phone", phone); example.createCriteria().andEqualTo("userId", userId);
List<AppUserPositionTemp> list = mapper.selectByExample(example); List<AppUserPositionTemp> list = mapper.selectByExample(example);
AppUserPositionTemp newAppUserPositionTemp = new AppUserPositionTemp(); AppUserPositionTemp newAppUserPositionTemp = new AppUserPositionTemp();
if (list.size()>0) { if (list.size() != 0) {
newAppUserPositionTemp =list.get(0); newAppUserPositionTemp = list.get(0);
if (newAppUserPositionTemp != null) { if (newAppUserPositionTemp != null) {
AppUserPositionTemp odlAppUserPositionTemp = new AppUserPositionTemp(); AppUserPositionTemp odlAppUserPositionTemp = new AppUserPositionTemp();
BeanUtils.copyProperties(newAppUserPositionTemp, odlAppUserPositionTemp); BeanUtils.copyProperties(newAppUserPositionTemp, odlAppUserPositionTemp);
...@@ -485,4 +458,6 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -485,4 +458,6 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
} }
} }
} }
} }
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