From 699043a90869a77ccb9d48db96feb6edc1f61af3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十二月 2024 19:49:11 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 520 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 333 insertions(+), 187 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 987e74d..24ceeb7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -9,8 +9,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.DataSyncConfig;
-import com.doumee.config.Jwt.JwtPayLoad;
-import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -25,7 +23,6 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.*;
-import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
@@ -35,7 +32,6 @@
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dto.RegisterDriverDTO;
-import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.join.RetentionJoinMapper;
import com.doumee.dao.business.join.UserActionJoinMapper;
@@ -43,7 +39,6 @@
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
-import com.doumee.dao.web.reqeust.AccountLoginDTO;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
import com.doumee.dao.web.reqeust.VisitMemberDTO;
import com.doumee.dao.web.response.MemberVO;
@@ -52,6 +47,7 @@
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
+import com.doumee.service.system.SystemLoginService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.RandomStringUtils;
@@ -60,11 +56,13 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.*;
import java.util.stream.Collectors;
@@ -94,8 +92,8 @@
@Autowired
private EmpowerMapper empowerMapper;
-
@Autowired
+
private DeviceMapper deviceMapper;
@Autowired
@@ -122,8 +120,12 @@
private SystemUserMapper systemUserMapper;
@Autowired
+ @Lazy
private SmsEmailService smsEmailService;
+ @Autowired
+ private SystemLoginService systemLoginService;
+
@Value("${debug_model}")
private Boolean isDebug;
@Override
@@ -142,31 +144,38 @@
if(dealHkUserBiz(insert)){
memberMapper.insert(insert);
//鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
- if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
+// if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
//濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿
- systemUserMapper.insert(createSystemUser(insert));
+ systemUserMapper.insert(createSystemUser(insert,systemDictDataBiz));
//澶勭悊鍩硅鏈夋晥鏈熶笟鍔�
dealTrainTIme(member,0,loginUserInfo);
- }
+// }
}else{
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
+ }catch (BusinessException e){
+ //濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
+ deleteHkUserBiz(new String[]{insert.getHkId()});
+ throw e;
}catch (Exception e){
//濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
+ e.printStackTrace();
deleteHkUserBiz(new String[]{insert.getHkId()});
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鏂板缓澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
return insert;
}
- private SystemUser createSystemUser(Member insert) {
+ public static SystemUser createSystemUser(Member insert,SystemDictDataBiz systemDictDataBiz) {
SystemUser user = new SystemUser();
// 鐢熸垚瀵嗙爜鐩�
String salt = RandomStringUtils.randomAlphabetic(6);
// 鐢熸垚瀵嗙爜
user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
user.setSalt(salt);
+ user.setNeedChangePwd(Constants.ZERO);
// 鍒涘缓鐢ㄦ埛璁板綍
user.setType(insert.getType());
+ user.setAvatar(insert.getFaceImg());
user.setUsername(insert.getPhone());
user.setEmpNo(insert.getCode());
user.setRealname(insert.getName());
@@ -177,6 +186,7 @@
user.setUpdateUser(insert.getEditor());
user.setUpdateTime(insert.getEditDate());
user.setMemberId(insert.getId());
+ user.setSource(Constants.ZERO);
user.setDeleted(Boolean.FALSE);
user.setFixed(Boolean.FALSE);
user.setStatus(Constants.ZERO);
@@ -198,17 +208,22 @@
insert.setCode(member.getCode());
insert.setType(Constants.TWO);
insert.setHkDate(new Date());
- insert.setWorkStatus(Constants.ONE);//榛樿鍦ㄨ亴
+ insert.setWorkStatus(Constants.ZERO);//榛樿鍦ㄨ亴
insert.setCanVisit(Constants.ZERO);//榛樿涓嶅彲璁块棶
insert.setAuthStatus(Constants.ZERO);
insert.setName(member.getName());
insert.setHkId(UUID.randomUUID().toString().replace("-",""));
insert.setHkStatus(Constants.ONE);
insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
- insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
+ insert.setJobDate(member.getJobDate());
+ insert.setIsDangyuan(member.getIsDangyuan());
+ insert.setPositionId(member.getPositionId());
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
+ insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//韬唤璇佸彿鍔犲瘑
+ insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
+ }
insert.setPhone(member.getPhone());
- insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//韬唤璇佸彿鍔犲瘑
- insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
insert.setStatus(Constants.ZERO);
return insert;
}
@@ -232,7 +247,7 @@
* @return
*/
private boolean dealHkUserBiz(Member insert) {
- String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(insert,path,Constants.ZERO);
if(hkAddRequest == null){
@@ -240,7 +255,7 @@
}
//澶勭悊鏂板鏁版嵁
BaseResponse<UserAddResponse> result = HKService.addUser(hkAddRequest);
- if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
+ if(result!=null && StringUtils.equals(result.getCode(), HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
insert.setHkId(hkAddRequest.getPersonId());
insert.setFaceId(result.getData().getFaceId());
if(StringUtils.isNotBlank(insert.getFaceId())){
@@ -255,7 +270,7 @@
return false;
}
private boolean dealHkUserForUpdateBiz(Member update ) {
- String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(update,path,Constants.ONE);
@@ -323,16 +338,20 @@
if (StringUtils.isBlank(member.getPhone())||!PhoneUtil.isPhone(member.getPhone())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
}
- if (StringUtils.isBlank(member.getIdcardNo())||!IdcardUtil.isValidCard(member.getIdcardNo())){
+ if (StringUtils.isNotBlank(member.getIdcardNo()) && !IdcardUtil.isValidCard(member.getIdcardNo())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
}
- if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
- .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
- .eq(Member::getIsdeleted,Constants.ZERO)) >0){
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNo()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+ .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
+ .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
+ .eq(Member::getIsdeleted,Constants.ZERO)) >0){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNo()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ }
}
if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
.eq(Member::getPhone, member.getPhone())
+ .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
.eq(Member::getIsdeleted,Constants.ZERO) ) >0){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+member.getPhone()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
}
@@ -375,12 +394,14 @@
if(model ==null ||Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ュ憳宸ヤ俊鎭笉瀛樺湪锛岃鍒锋柊椤甸潰閲嶈瘯锛�");
}
+ member.setSex(model.getSex());//榛樿鏄師鏉ョ殑鎬у埆
if (StringUtils.isNotBlank(member.getPhone()) ){
if ( !PhoneUtil.isPhone(member.getPhone())) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鐢佃瘽鍙风爜鏍煎紡鏈夎");
}
if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
.eq(Member::getPhone,member.getPhone())
+ .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
.eq(Member::getIsdeleted,Constants.ZERO)
.ne(Member::getId,member.getId())) >0){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+member.getPhone()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
@@ -388,18 +409,19 @@
}
if (StringUtils.isNotBlank(member.getIdcardNoNew())){
String encrptNo = (DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNoNew()));//韬唤璇佸彿鍔犲瘑
- if(!isDebug && !StringUtils.equals(model.getIdcardNo(),encrptNo)&& !IdcardUtil.isValidCard(member.getIdcardNoNew())){
+ if(!isDebug && StringUtils.isNotBlank(member.getIdcardNoNew()) &&
+ !StringUtils.equals(model.getIdcardNo(),encrptNo)&& !IdcardUtil.isValidCard(member.getIdcardNoNew())){
//濡傛灉鍙戠敓鏀瑰彉锛屽苟涓斾笉鍚堟硶锛屾彁绀哄紓甯�
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇敼鐨勬柊韬唤璇佸彿鏍煎紡鏈夎");
}
if( !StringUtils.equals(model.getIdcardNo(),encrptNo) ){
if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
.eq(Member::getIdcardNo,encrptNo)
+ .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
.eq(Member::getIsdeleted,Constants.ZERO)
.ne(Member::getId,member.getId())) >0){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNoNew()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
}
-
member.setSex(Constants.getSexByCardNo( member.getIdcardNoNew()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
member.setIdcardDecode( Constants.getTuominStr(member.getIdcardNoNew()));
member.setIdcardNo(encrptNo);
@@ -444,15 +466,20 @@
member.setHkOrgId(company.getHkId());
isNeedUpdateUser = true;
}
+ if(StringUtils.isNotBlank(model.getFaceImg())){
+ isNeedUpdateUser=true;
+ }
if(isNeedUpdateUser){
//鏇存柊绯荤粺鐢ㄦ埛璐﹀彿淇℃伅
systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
.set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
.set(SystemUser::getUpdateTime,new Date())
- .set(StringUtils.isNotBlank(model.getPhone()),SystemUser::getMobile,member.getPhone())
- .set(StringUtils.isNotBlank(model.getName()),SystemUser::getRealname,member.getName())
- .set(model.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId())
- .set(StringUtils.isNotBlank(model.getCode()),SystemUser::getEmpNo,member.getCode())
+ .set(StringUtils.isNotBlank(member.getFaceImg()),SystemUser::getAvatar,member.getFaceImg())
+ .set(StringUtils.isNotBlank(member.getPhone()),SystemUser::getMobile,member.getPhone())
+ .set(StringUtils.isNotBlank(member.getPhone()),SystemUser::getUsername,member.getPhone())
+ .set(StringUtils.isNotBlank(member.getName()),SystemUser::getRealname,member.getName())
+ .set(member.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId())
+ .set(StringUtils.isNotBlank(member.getCode()),SystemUser::getEmpNo,member.getCode())
.eq(SystemUser::getMemberId,model.getId()));
}
if(Constants.equalsInteger(model.getCompanyType(),Constants.ZERO)
@@ -487,16 +514,7 @@
if (PhoneUtil.isPhone(member.getPhone())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
}
- if (IdcardUtil.isValidCard(member.getIdcardNo())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
- }
- if (IdcardUtil.getGenderByIdCard(member.getIdcardNo()) == member.getSex()){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎬у埆鏈夎");
- }
- //鑾峰彇鍑虹敓鏃ユ湡
- String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo());
- //鑴辨晱鎿嶄綔
- String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
+//
//杞崲鏃ユ湡
Member insert = new Member();
insert.setCreator(loginUserInfo.getId());
@@ -509,11 +527,23 @@
insert.setImgurl(member.getImgurl());
insert.setType(Constants.ZERO);
insert.setName(member.getName());
- insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
insert.setPhone(member.getPhone());
- insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
- IdcardUtil.isValidCard(member.getIdcardNo());
- insert.setIdcardDecode(hide);
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ if (IdcardUtil.isValidCard(member.getIdcardNo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
+ }
+ if (IdcardUtil.getGenderByIdCard(member.getIdcardNo()) == member.getSex()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎬у埆鏈夎");
+ }
+ //鑾峰彇鍑虹敓鏃ユ湡
+ String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo());
+ insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
+ insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
+ IdcardUtil.isValidCard(member.getIdcardNo());
+ //鑴辨晱鎿嶄綔
+ String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
+ insert.setIdcardDecode(hide);
+ }
insert.setStatus(Constants.ZERO);
insert.setParentId(member.getParentId());
memberMapper.insert(insert);
@@ -534,15 +564,27 @@
}
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
Member member=new Member();
member.setId(id);
- member.setIsdeleted(Constants.ZERO);
+ member.setIsdeleted(Constants.ONE);
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
member.setHkStatus(Constants.ZERO);
member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺");
memberMapper.updateById(member);
+
+ //鍒櫎绯荤粺鐧婚檰璐︽埛
+ SystemUser user = new SystemUser();
+ user.setMemberId(id);
+ systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getMemberId,id)
+ .set(SystemUser::getDeleted,Boolean.TRUE)
+ .set(SystemUser::getUpdateUser,member.getEditor())
+ .set(SystemUser::getUpdateTime,member.getEditDate())
+ );
+
saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
}
@@ -568,7 +610,7 @@
}else{
if( ! (Constants.equalsInteger(memberRole.getTimeType(),Constants.ZERO)
||Constants.equalsInteger(memberRole.getTimeType(),Constants.TWO)
- || (Constants.equalsObject(memberRole.getTimeType(),Constants.ONE)
+ || (Constants.equalsInteger(memberRole.getTimeType(),Constants.ONE)
&& memberRole.getStartTime() !=null && memberRole.getEndTime() != null ))){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -579,7 +621,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈夋晥鏈熸埅姝㈡棩鏈熶笉鑳藉皬浜庡紑濮嬫椂闂达紒");
}
}
- if(Constants.equalsObject(memberRole.getTimeType(),Constants.ZERO) ){
+ if(Constants.equalsInteger(memberRole.getTimeType(),Constants.ZERO) ){
memberRole.setStartTime(null);
memberRole.setEndTime(null);
}
@@ -589,7 +631,7 @@
//濡傛灉鍛樺伐淇℃伅涓嶅悎娉曠洿鎺ヨ烦杩�
continue;
}
- if(StringUtils.isNotBlank(member.getFaceId()) || !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
+ if(StringUtils.isBlank(member.getFaceId()) || !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+member.getName()+"銆戠殑浜鸿劯淇℃伅涓嶆弧瓒虫巿鏉冩潯浠讹紝璇疯繑鍥炲畬鍠勫悗鍐嶈繘琛岃鎿嶄綔锛�");
}
member.setStartTime(memberRole.getStartTime());
@@ -717,7 +759,7 @@
memberRole.setRoleId(deviceRole.getId());
memberRoleList.add(memberRole);
}
- memberRoleMapper.insertBatchSomeColumn(memberRoleList);
+ memberRoleMapper.insert(memberRoleList);
}
member.setRoleId(ids);
return 1;
@@ -753,7 +795,10 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- Member member=new Member();
+ for(Integer id : ids){
+ deleteById(id,loginUserInfo);
+ }
+ /* Member member=new Member();
ids.stream().forEach(s ->{
member.setId(s);
member.setIsdeleted(Constants.ONE);
@@ -763,7 +808,7 @@
member.setEditDate(new Date());
memberMapper.updateById(member);
saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
- });
+ });*/
}
@@ -781,8 +826,8 @@
}
for (Integer id:ids) {
Member member = memberMapper.selectById(id);
- if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
- member.setStatus(Constants.TWO);
+ if(!Objects.isNull(member)&&member.getStatus()!=Constants.TWO){
+ member.setStatus(Constants.TWO);//鎭㈠姝ｅ父鐘舵��
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
@@ -792,7 +837,6 @@
member.setEditor(loginUserInfo.getId());
//鍒犻櫎鍛樺伐闂ㄧ鏉冮檺
cancelAllMemberEmpower(member,memberRoleMapper,empowerMapper);
-
if(Constants.equalsInteger(type,Constants.ONE)){
saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.FREEZE,userActionJoinMapper,JSONObject.toJSONString(member));
}
@@ -816,8 +860,8 @@
}
for (Integer id:ids) {
Member member = memberMapper.selectById(id);
- if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
- member.setStatus(Constants.ONE);//鎭㈠姝ｅ父鐘舵��
+ if(!Objects.isNull(member)&&member.getStatus()==Constants.TWO){
+ member.setStatus(Constants.ZERO);//鎭㈠姝ｅ父鐘舵��
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
@@ -873,6 +917,10 @@
.set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
.set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
.set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
+ .set( updateMember.getPositionId()!=null,Member::getPositionId,updateMember.getPositionId())
+ .set( updateMember.getIsDangyuan()!=null,Member::getIsDangyuan,updateMember.getIsDangyuan())
+ .set( updateMember.getJobDate()!=null,Member::getJobDate,updateMember.getJobDate())
+ .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
.eq(Member::getId,updateMember.getId()));
dealTrainTIme(updateMember,1,loginUserInfo);
cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
@@ -905,6 +953,7 @@
}
public static void saveUserActionBiz(Member updateMember,LoginUserInfo user, Constants.UserActionType type,UserActionJoinMapper userActionMapper,String content) {
+ updateMember.setEditDate(updateMember.getEditDate()==null?new Date():updateMember.getEditDate());
UserAction userAction=new UserAction();
userAction.setIsdeleted(Constants.ZERO);
userAction.setCreateDate(updateMember.getEditDate());
@@ -913,7 +962,7 @@
userAction.setType(type.getKey());
userAction.setContent(content);
String info = type.getInfo();
- userAction.setRemark(info.replace("${param1}",user!=null?user.getRealname():"绯荤粺").replace("${param2}", com.doumee.core.utils.DateUtil.getPlusTime2(updateMember.getEditDate())));
+ userAction.setRemark(info.replace("${param1}",user!=null?user.getRealname():"绯荤粺").replace("${param2}", com.doumee.core.utils.DateUtil.getPlusTime2(updateMember.getEditDate()!=null?updateMember.getEditDate():new Date())));
userAction.setMemberId(updateMember.getId()+"");
userActionMapper.insert(userAction);
}
@@ -924,7 +973,7 @@
wrapper.lambda().ne(Member::getRemark,"浜鸿劯宸插悓姝ユ渶鏂�");
List<Member> list =memberMapper.selectList(wrapper);
if(list!=null){
- String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
for(Member m : list){
String faceId= HkSyncOrgUserToHKServiceImpl.dealMemberFace(m,path);
@@ -947,10 +996,10 @@
if(model ==null) {
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
}
- if(!Constants.equalsObject(model.getIsdeleted(),Constants.ONE)){
+ if(!Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鍙湁閽堝绂昏亴浜哄憳鍙繘琛岃鎿嶄綔锛�");
}
- if(Constants.equalsObject(model.getHkStatus(),Constants.ONE)){
+ if(Constants.equalsInteger(model.getHkStatus(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ汉鍛樺凡琚垹闄わ紒");
}
if(StringUtils.isBlank(model.getHkId())){
@@ -965,7 +1014,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
}
if(model.getCompanyId()!=null) {
- if(Constants.equalsObject(member.getHeadStatus(),Constants.ONE)){
+ if(Constants.equalsInteger(member.getHeadStatus(),Constants.ONE)){
//濡傛灉鏄彇娑堜富绠�
companyMapper.update(null,new UpdateWrapper<Company>().lambda()
.eq(Company::getId,model.getCompanyId())
@@ -1048,6 +1097,7 @@
update.setEditor(loginUserInfo.getId());
update.setCanVisit(member.getCanVisit());
memberMapper.updateById(update);
+ member.setEditDate(update.getEditDate());
//璁板綍鎿嶄綔鏃ュ織
saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getCanVisit(),Constants.ONE)?Constants.UserActionType.CANVISIT:Constants.UserActionType.CANCEL_VISIT,userActionJoinMapper,null);
}
@@ -1079,7 +1129,51 @@
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(Member.class)
.selectAs(Company::getName,Member::getCompanyName) ;
+ queryWrapper.selectAs(Position::getName,Member::getPositionName);
+ queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ if(StringUtils.isNotBlank(member.getName())){
+ queryWrapper.like(Member::getName,member.getName());
+ }
+ if(Objects.nonNull(member.getCompanyType())){
+ queryWrapper.eq(Company::getType,member.getCompanyType());
+ }
+ if(StringUtils.isNotBlank(member.getCompanyTypes())){
+ queryWrapper.in(Company::getType,Arrays.asList(member.getCompanyTypes().split(",")));
+ }
+ if(null != member.getType()) {
+ queryWrapper.eq(Member::getType,member.getType());
+ }
+ if(null != member.getCompanyId()) {
+ queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
+ }
+ if(null != member.getQuerySpecial() && Constants.equalsInteger(member.getQuerySpecial(),Constants.ONE)){
+ String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
+ if(StringUtils.isNotBlank(companySpecialId)){
+ queryWrapper.apply(" find_in_set('"+companySpecialId+"',REPLACE(t3.company_path,'/',',')) ");
+ }
+ }
+ queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
+ queryWrapper.eq(Member::getWorkStatus,Constants.ZERO);
+ List<Member> list = memberJoinMapper.selectJoinList(Member.class,queryWrapper);
+// if(list!=null){
+// for(Member m : list){
+// m.setName(StringUtils.defaultString(m.getName(),"")+"-"+StringUtils.defaultString(m.getCompanyName(),""));
+// }
+// }
+ return list;
+ }
+ @Override
+ public List<Member> findDriveList(Member member) {
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.selectAll(Member.class)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .eq(Member::getType,Constants.TWO)
+ .exists("select b.id from car_driver b where b.isdeleted=0 and b.member_id=t.id");
+ queryWrapper.selectAs(Position::getName,Member::getPositionName);
+ queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
if(null != member.getType()) {
queryWrapper.eq(Member::getType,member.getType());
}
@@ -1110,7 +1204,6 @@
if(pageWrap.getModel().getType() != null){
if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
queryWrapper.select(" * , (select v.COMPANY_NAME from visits v where v.MEMBER_ID = member.id and v.STATUS = 2 order by v.CREATE_DATE desc limit 1 ) as companyName , " +
- " (select v.STARTTIME from visits v where v.MEMBER_ID = member.id and v.STATUS = 2 order by v.CREATE_DATE desc limit 1 ) as lastVisitDate , " +
" (select count(1) from visits v where v.MEMBER_ID = member.id and v.STATUS = 2 ) as visitTimes ");
}
}
@@ -1157,6 +1250,9 @@
}
if (pageWrap.getModel().getName() != null) {
queryWrapper.lambda().eq(Member::getName, pageWrap.getModel().getName());
+ }
+ if (pageWrap.getModel().getPositionId() != null) {
+ queryWrapper.lambda().eq(Member::getPositionId, pageWrap.getModel().getPositionId());
}
if (pageWrap.getModel().getBirthday() != null) {
queryWrapper.lambda().ge(Member::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
@@ -1283,7 +1379,7 @@
public PageData<Member> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
-
+ pageWrap.getModel().setIsdeleted(Constants.formatIntegerNum(pageWrap.getModel().getIsdeleted()));
queryWrapper.selectAll(Member.class);
queryWrapper.selectAs(Company::getName,Member::getCompanyName);
queryWrapper.selectAs(SystemUser::getRealname,Member::getEditorName);
@@ -1292,9 +1388,22 @@
queryWrapper.selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath);
queryWrapper.selectAs(Company::getCompanyPath,Member::getCompanyPath);
queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and mc.member_id = t.id ) as memberCardCount ");
+ queryWrapper.select(" ( select max(tt.END_TIME) from train_time tt where tt.isdeleted = 0 and tt.member_id = t.id ) as trainEndTime ");
+
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Member::getEditor);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.selectAs(Position::getName,Member::getPositionName);
+ queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
queryWrapper.eq(Member::getType,pageWrap.getModel().getType());
+ LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
+ if(userInfo!=null && userInfo.getCompanyIdList()!=null){
+ if( userInfo.getCompanyIdList().size() ==0){
+ //鍙兘鐪嬭嚜宸�
+ queryWrapper.eq(Member::getId,userInfo.getMemberId());
+ }else{
+ queryWrapper.in(Company::getId,userInfo.getCompanyIdList());
+ }
+ }
// queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
Member::getCompanyId,pageWrap.getModel().getCompanyIds())
@@ -1307,14 +1416,16 @@
.eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),Member::getCanVisit,pageWrap.getModel().getCanVisit())
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
.eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getWorkStatus()),Member::getWorkStatus,pageWrap.getModel().getWorkStatus())
.eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO)
.eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
.eq(Objects.nonNull(pageWrap.getModel().getCompanyType()),Company::getType,pageWrap.getModel().getCompanyType())
+ .eq(Objects.nonNull(pageWrap.getModel().getPositionId()),Member::getPositionId,pageWrap.getModel().getPositionId())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
// .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
// .eq(Member::getType,Constants.memberType.internal)
.eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
- .orderByDesc(!Constants.equalsObject(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
+ .orderByDesc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
.orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
@@ -1354,6 +1465,19 @@
if(StringUtils.isNotBlank(memberInfoDTO.getImgurl())){
memberInfoDTO.setImgurlFull(prefixUrl + memberInfoDTO.getImgurl());
}
+ memberInfoDTO.setHasFace(memberInfoDTO.getFaceId()!=null?Constants.ONE:Constants.ZERO);
+ if(Constants.equalsInteger(Constants.ONE,memberInfoDTO.getAuthStatus())){
+ if(memberInfoDTO.getStartTime() ==null || memberInfoDTO.getEndTime() ==null ){
+ memberInfoDTO.setRoleTimeInfo("闀挎湡鏈夋晥");
+ }else{
+ memberInfoDTO.setRoleTimeInfo(DateUtil.getPlusTime2(memberInfoDTO.getStartTime())+"鑷�"+DateUtil.getPlusTime2(memberInfoDTO.getEndTime()));
+ }
+ }else{
+ memberInfoDTO.setRoleTimeInfo("-");
+ }
+ memberInfoDTO.setAuthStatus(Constants.formatIntegerNum(memberInfoDTO.getAuthStatus()));
+ memberInfoDTO.setWorkStatus(Constants.formatIntegerNum(memberInfoDTO.getWorkStatus()));
+ memberInfoDTO.setSex(Constants.formatIntegerNum(memberInfoDTO.getSex()));
}
}
return PageData.from(memberIPage);
@@ -1392,8 +1516,10 @@
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(Member.class)
.selectAs(Company::getName,Member::getCompanyName)
+ .selectAs(Position::getName,Member::getPositionName)
+ .leftJoin(Position.class,Position::getId,Member::getPositionId)
.selectAs(Member::getLastVisitDate,Member::getLastVisitDate)
- .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status in (7,8) ) as visitsCount");
+ .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status in (7,8) ) as visitTimes");
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
.like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
.and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ms->ms.like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName())
@@ -1421,12 +1547,11 @@
public PageData<Member> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ int actiontype =Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ONE)?Constants.UserActionType.BLACKLIST.getKey():Constants.UserActionType.FREEZE.getKey();
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(Member.class)
- .selectAs(Company::getName,Member::getCompanyName)
- .select(" (select ua.CREATE_DATE from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0 order by ua.CREATE_DATE desc limit 1) as optTime")
- .select(" (select s.REALNAME from user_action uac left join system_user s on uac.CREATOR = s.ID where uac.MEMBER_ID=t.id and uac.ISDELETED=0 order by uac.CREATE_DATE desc limit 1) as creatorName")
- .select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE desc limit 1) as visitsLastDate")
+ .selectAs(Company::getCompanyNamePath,Member::getCompanyName)
+ .select(" (select ua.remark from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0 and ua.type="+actiontype+" order by ua.CREATE_DATE desc limit 1) as optRemark")
.eq(Member::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCreaterId()),Member::getEditor,pageWrap.getModel().getCreaterId());
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Member::getType,pageWrap.getModel().getType());
@@ -1442,6 +1567,8 @@
.eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
.orderByDesc(Member::getCreateDate);
+ queryWrapper.selectAs(Position::getName,Member::getPositionName);
+ queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
return PageData.from(memberIPage);
@@ -1504,7 +1631,7 @@
list.add(model);
}
//瀵煎叆鏂板鐨勬巿鏉冧俊鎭�
- empowerMapper.insertBatchSomeColumn(list);
+ empowerMapper.insert(list);
}
}
}
@@ -1530,12 +1657,14 @@
}catch (Exception e){
}
- List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>()
- .lambda().eq(Member::getIsdeleted,Constants.ZERO)
- .eq(Member::getType,Constants.memberType.internal)
+ List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .eq(Company::getType,Constants.ZERO)
.eq(Member::getStatus,Constants.ZERO)
.isNotNull(Member::getHkId)
- .apply("to_days(lastVisitDate)+ "+days+" < to_days(now())" ));
+ .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" ));
if(CollectionUtils.isEmpty(memberList)){
return;
}
@@ -1571,52 +1700,95 @@
/**
* 寰俊鎺堟潈鎺ュ彛
* @param code
+ * 鏉ユ簮:0=鍙告満锛�1=璁垮锛�2=鍐呴儴鍛樺伐
* @return
*/
@Override
- public WxAuthorizeVO wxAuthorize(String code){
+ public WxAuthorizeVO wxAuthorize(String code, Integer source){
+ if(StringUtils.isBlank(code)||Objects.isNull(source)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
String appId = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode();
String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode();
String getTokenUrl = WXConstant.GET_USER_INFO_URL.replace("CODE", code)
.replace("APPID", appId).replace("SECRET", appSecret);
JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
- String openId = null;
- if(!Objects.isNull(tokenJson.get("access_token"))){
+ String openId = "";
+ if(Objects.nonNull(tokenJson)&&!Objects.isNull(tokenJson.get("access_token"))){
openId = tokenJson.getString("openid");
}
WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
- wxAuthorizeVO.setOpenid(openId);
- //鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
- Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
- .selectAll(Member.class)
- .selectAs(Company::getName,Member::getCompanyName)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .eq(Member::getOpenid,openId)
- .eq(Member::getIsdeleted,Constants.ZERO)
- .orderByDesc(Member::getCreateDate)
- .last(" limit 1 ")
- );
- //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
- if(!Objects.isNull(member)){
- if(member.getIsdeleted() == Constants.ONE){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
- }
- if(member.getStatus() != Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
- }
- if(StringUtils.isNotBlank(member.getIdcardNo())){
- member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
- }
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
- member.setPrefixUrl(prefixUrl);
- JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
- String token = JwtTokenUtil.generateToken(payLoad);
- //瀛樺偍token鑷硆edis
- RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
- wxAuthorizeVO.setToken(token);
- wxAuthorizeVO.setMember(member);
+ if(StringUtils.isBlank(openId)){
+ return wxAuthorizeVO;
}
+ wxAuthorizeVO.setOpenid(openId);
+ if(source==1){
+ //鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
+ Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(Member::getOpenid,openId)
+ .eq(Member::getType,source)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .orderByDesc(Member::getCreateDate)
+ .last(" limit 1 ")
+ );
+ //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+ if(!Objects.isNull(member)){
+ if(member.getIsdeleted() == Constants.ONE){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(member.getStatus() != Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
+ }
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ member.setPrefixUrl(prefixUrl);
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
+ SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
+ .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
+ if(Objects.nonNull(systemUser)){
+ String token = systemLoginService.loginByUserId(systemUser.getId());
+ wxAuthorizeVO.setToken(token);
+ }
+ }
+ }
+ }else{
+ //濡傛灉鏄徃鏈烘垨鑰呭唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getOpenid,openId)
+ .eq(SystemUser::getType,source)
+ .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .last(" limit 1 "));
+ //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+ if(!Objects.isNull(user)){
+ Member member = memberMapper.selectById(user.getMemberId());
+ if(member.getIsdeleted() == Constants.ONE){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(member.getStatus() != Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
+ }
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ member.setPrefixUrl(prefixUrl);
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ String token = systemLoginService.loginByUserId(user.getId());
+ wxAuthorizeVO.setToken(token);
+ }
+ }
+
+
return wxAuthorizeVO;
}
@@ -1624,30 +1796,30 @@
@Override
- public MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO){
- Integer validType = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.BEVISITED_USER_VALID).getCode());
- if(Objects.isNull(checkVisitedDTO)||StringUtils.isBlank(checkVisitedDTO.getMobile())||(validType.equals(Constants.ONE)&&StringUtils.isBlank(checkVisitedDTO.getName()))){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
- .eq(Member::getPhone,checkVisitedDTO.getMobile())
- .eq(validType.equals(Constants.ONE),Member::getName,checkVisitedDTO.getName())
+ public List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO){
+ List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .selectAs(Position::getName,Member::getPositionName)
+ .leftJoin(Position.class,Position::getId,Member::getPositionId)
+ .eq(StringUtils.isNotBlank(checkVisitedDTO.getMobile()),Member::getPhone,checkVisitedDTO.getMobile())
+ .eq(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
.eq(Member::getIsdeleted,Constants.ZERO)
-// .eq(Member::getStatus,Constants.ZERO)
+ .eq(Member::getStatus,Constants.ZERO)
+ .eq(Member::getWorkStatus,Constants.ZERO)
.eq(Member::getCanVisit,Constants.ONE)
- .eq(Member::getType,Constants.memberType.internal)
- .last(" limit 1 ")
+ .eq(Company::getType,Constants.ONE)
);
- MemberVO memberVO = new MemberVO();
- if(!Objects.isNull(member)){
- if(!member.getStatus().equals(Constants.ZERO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"琚浜鸿处鍙峰紓甯革紝璇风‘璁ゅ悗鍐嶈瘯");
+ List<MemberVO> memberVOList = new ArrayList<>();
+ if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
+ for (Member member:memberList) {
+ MemberVO memberVO = new MemberVO();
+ BeanUtils.copyProperties(member,memberVO);
+ memberVOList.add(memberVO);
}
- BeanUtils.copyProperties(member,memberVO);
- }else{
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"璇锋牳瀹炶璁夸汉淇℃伅!");
}
- return memberVO;
+ return memberVOList;
}
@@ -1689,50 +1861,6 @@
- @Override
- public WxAuthorizeVO accountLogin(AccountLoginDTO accountLoginDTO){
- if(accountLoginDTO.getAccount().length()!=18
- //&&!IdcardUtil.isValidCard(accountLoginDTO.getAccount())
- ){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝韬唤璇佸彿鐮佹湁璇紝璇锋牳瀹炲悗閲嶈瘯锛�");
- }
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
- .eq(Member::getIdcardNo, DESUtil.encrypt(Constants.EDS_PWD, accountLoginDTO.getAccount()))
- .ne(Member::getType,Constants.memberType.visitor)
- );
- if(Objects.isNull(member)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鐢ㄦ埛,璇疯仈绯荤鐞嗗憳");
- }
- if(member.getIsdeleted() == Constants.ONE){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
- }
- if(member.getStatus() != Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
- }
- String md5Password = DESUtil.encrypt(Constants.EDS_PWD, accountLoginDTO.getPassword());
- if(!md5Password.equals(member.getPassward())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璐︽埛瀵嗙爜閿欒!");
- }
- if(StringUtils.isNotBlank(accountLoginDTO.getOpenId())){
- //鍏堟竻绌哄師鏈夎瀹㈢殑openid缁戝畾鍏崇郴
- memberMapper.update(null, new UpdateWrapper<Member>().lambda()
- .ne(Member::getType,Constants.memberType.visitor)
- .eq(Member::getOpenid,accountLoginDTO.getOpenId())
- .set(Member::getOpenid,null)
- );
- //鏇存柊褰撳墠鐧诲綍鐢ㄦ埛 openId
- member.setOpenid(accountLoginDTO.getOpenId());
- memberMapper.updateById(member);
- }
- WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
- JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
- String token = JwtTokenUtil.generateToken(payLoad);
- //瀛樺偍token鑷硆edis
- RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
- wxAuthorizeVO.setToken(token);
- return wxAuthorizeVO;
- }
-
@Override
@@ -1741,7 +1869,7 @@
List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO));
if(CollectionUtils.isNotEmpty(memberList)){
stagingHeadVO.setWorkerCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.internal)).count());
- stagingHeadVO.setLwCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.lw_visitor)).count());
+ stagingHeadVO.setLwCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.driver)).count());
stagingHeadVO.setVisitorCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.visitor)).count());
}
//鍦ㄥ満杞﹁締
@@ -1765,7 +1893,7 @@
new MPJLambdaWrapper<Member>()
.select("count(1) as memberCount, t1.name as companyName")
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .eq(Member::getType,Constants.memberType.lw_visitor)
+ .eq(Member::getType,Constants.memberType.driver)
.groupBy(Company::getId,Company::getName)
);
List<Map<String,Object>> retentionMaps = retentionJoinMapper.selectMaps(new MPJLambdaWrapper<Retention>()
@@ -1790,7 +1918,7 @@
ExcelImporter ie = null;
List<MemberImport> dataList =null;
try {
- ie = new ExcelImporter(file,1,0);
+ ie = new ExcelImporter(file,2,0);
dataList = ie.getDataList(MemberImport.class,null);
} catch (Exception e) {
e.printStackTrace();
@@ -1807,6 +1935,8 @@
List<Member> newList = new ArrayList<>();
for(int i=0;i<dataList.size();i++){
MemberImport model = dataList.get(i);
+ model.setPhone(ScientificNotationTUtil.convertToString(model.getPhone()));
+ model.setIdcardNo(ScientificNotationTUtil.convertToString(model.getIdcardNo()));
if(StringUtils.isBlank(model.getName())
&&StringUtils.isBlank(model.getIdcardNo())
&&StringUtils.isBlank(model.getPhone())
@@ -1840,17 +1970,17 @@
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅銆�"+insert.getName()+"銆戝悓姝ュ畨闃插钩鍙板け璐ワ紝璇风◢鍚庨噸璇曪紒");
}
}
- memberMapper.insertBatchSomeColumn(newList);
+ memberMapper.insert(newList);
List<SystemUser> userList = new ArrayList<>();
for(Member insert: newList){
//鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
- if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){
+// if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){
//濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿
- userList.add(createSystemUser(insert));
- }
+ userList.add(createSystemUser(insert,systemDictDataBiz));
+// }
}
if(userList.size()>0){
- systemUserMapper.insertBatchSomeColumn(userList);
+ systemUserMapper.insert(userList);
}
}catch (Exception e){
//濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
@@ -1865,7 +1995,7 @@
,List<Company> companyList
,Integer companyType) {
if(StringUtils.isBlank(model.getName())
- ||StringUtils.isBlank(model.getIdcardNo())
+// ||StringUtils.isBlank(model.getIdcardNo())
||StringUtils.isBlank(model.getPhone())
||StringUtils.isBlank(model.getCompanyName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屼汉鍛樹俊鎭笉瀹屾暣锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
@@ -1873,12 +2003,22 @@
if (!PhoneUtil.isPhone(model.getPhone())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屾墜鏈哄彿銆�"+model.getPhone()+"銆戞牸寮忎笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
}
- if ( !isDebug && !IdcardUtil.isValidCard(model.getIdcardNo())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戞牸寮忎笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ if(model.getPhone().indexOf(".")>=Constants.ZERO){
+ model.setPhone(
+ String.valueOf(new BigDecimal(model.getPhone()).intValue())
+ );
}
+ if(StringUtils.isNotBlank(model.getIdcardNo())){
+ if ( !isDebug && !IdcardUtil.isValidCard(model.getIdcardNo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戞牸寮忎笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ }
+
for(Member member: newList){
- if(StringUtils.equals(model.getIdcardNo(),member.getIdcardNo())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戦噸澶嶅嚭鐜帮紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
+ if(StringUtils.isNotBlank(model.getIdcardNo())&&StringUtils.isNotBlank(member.getIdcardNo())) {
+ if (StringUtils.equals(model.getIdcardNo(), member.getIdcardNo())) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝绗�" + (index + 3) + "琛岃韩浠借瘉鍙枫��" + model.getIdcardNo() + "銆戦噸澶嶅嚭鐜帮紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
+ }
}
if(StringUtils.equals(model.getPhone(),member.getPhone())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屾墜鏈哄彿銆�"+model.getPhone()+"銆戦噸澶嶅嚭鐜帮紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
@@ -1888,13 +2028,16 @@
if(company == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岀粍缁囧悕绉般��"+model.getCompanyName()+"銆戜笉瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
}
- if(companyType != null && !Constants.equalsObject(companyType,company.getType())){
+ if(companyType != null && !Constants.equalsInteger(companyType,company.getType())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岀粍缁囧悕绉般��"+model.getCompanyName()+"銆戠被鍨嬩笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
}
String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo());
- if(findMemberFromListByIdcard(candNo,memberList ) !=null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戝凡瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ if(StringUtils.isNotBlank(model.getIdcardNo())){
+ if(findMemberFromListByIdcard(candNo,memberList ) !=null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戝凡瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
}
+
if(findMemberFromListByPhone(model.getPhone(),memberList ) !=null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屾墜鏈哄彿銆�"+model.getPhone()+"銆戝凡瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
}
@@ -1954,6 +2097,7 @@
}
if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
.eq(Member::getIsdeleted,Constants.ZERO)
+ .ne(Member::getType,Constants.memberType.visitor)
.eq(Member::getPhone,registerDriverDTO.getPhone())
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵嬫満鍙峰凡娉ㄥ唽!");
@@ -1964,14 +2108,13 @@
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵嬫満鍙峰凡娉ㄥ唽!");
};
-
smsEmailService.validateCode(registerDriverDTO.getValidCode(),registerDriverDTO.getPhone());
String salt = RandomStringUtils.randomAlphabetic(6);
;
Member member = new Member();
member.setCreateDate(new Date());
member.setIsdeleted(Constants.ZERO);
- member.setType(Constants.TWO);
+ member.setType(Constants.memberType.driver);
member.setName(registerDriverDTO.getName());
member.setPhone(registerDriverDTO.getPhone());
member.setStatus(Constants.ZERO);
@@ -1985,9 +2128,12 @@
systemUser.setUsername(registerDriverDTO.getPhone());
systemUser.setRealname(registerDriverDTO.getName());
systemUser.setMemberId(member.getId());
+ systemUser.setMobile(registerDriverDTO.getPhone());
systemUser.setSalt(salt);
systemUser.setPassword(member.getPassward());
systemUser.setStatus(Constants.ZERO);
+ systemUser.setType(Constants.memberType.driver);
+ systemUser.setSource(Constants.TWO);
systemUserMapper.insert(systemUser);
}
--
Gitblit v1.9.3