From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 15:59:38 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 1396 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 1,059 insertions(+), 337 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 65ac052..7316080 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
@@ -1,14 +1,14 @@
package com.doumee.service.business.impl;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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;
@@ -22,40 +22,32 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DESUtil;
-import com.doumee.core.utils.HttpsUtil;
-import com.doumee.core.utils.Utils;
-import com.doumee.core.utils.redis.RedisUtil;
+import com.doumee.core.utils.*;
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
+import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.request.MemberQuery;
-import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dto.RegisterDriverDTO;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.join.RetentionJoinMapper;
import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemUserMapper;
-import com.doumee.dao.system.model.SystemDepartment;
-import com.doumee.dao.system.model.SystemDepartmentUser;
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;
import com.doumee.dao.web.response.WxAuthorizeVO;
import com.doumee.service.business.MemberService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -63,10 +55,14 @@
import org.apache.shiro.SecurityUtils;
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.util.Date;
import java.util.*;
import java.util.stream.Collectors;
@@ -95,8 +91,8 @@
@Autowired
private EmpowerMapper empowerMapper;
-
@Autowired
+
private DeviceMapper deviceMapper;
@Autowired
@@ -122,7 +118,15 @@
@Autowired
private SystemUserMapper systemUserMapper;
+ @Autowired
+ @Lazy
+ private SmsEmailService smsEmailService;
+ @Autowired
+ private SystemLoginService systemLoginService;
+
+ @Value("${debug_model}")
+ private Boolean isDebug;
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Member create(Member member) {
@@ -135,31 +139,37 @@
//鑴辨晱鎿嶄綔
Member insert = initAddMemberModel(member,loginUserInfo);
//娴峰悍浜哄憳鏂板涓氬姟
- if(dealHkUserBiz(insert)){
- try {
+ try {
+ if(dealHkUserBiz(insert)){
memberMapper.insert(insert);
//鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
- createSystemUser(insert);
- }catch (Exception e){
- //濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
- deleteHkUserBiz(insert.getHkId());
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鏂板缓澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+// if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
+ //濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿
+ systemUserMapper.insert(createSystemUser(insert,systemDictDataBiz));
+ //澶勭悊鍩硅鏈夋晥鏈熶笟鍔�
+ dealTrainTIme(member,0,loginUserInfo);
+// }
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
- }else{
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+ }catch (Exception e){
+ //濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
+ e.printStackTrace();
+ deleteHkUserBiz(new String[]{insert.getHkId()});
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鏂板缓澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
return insert;
}
- private void 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.setType(insert.getType());
+ user.setAvatar(insert.getFaceImg());
user.setUsername(insert.getPhone());
user.setEmpNo(insert.getCode());
user.setRealname(insert.getName());
@@ -170,11 +180,13 @@
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);
- systemUserMapper.insert(user);
+ return user;
}
+
private Member initAddMemberModel(Member member, LoginUserInfo loginUserInfo) {
Member insert= new Member();
@@ -182,6 +194,7 @@
insert.setCreateDate(new Date());
insert.setEditor(loginUserInfo.getId());
insert.setEditDate(new Date());
+ insert.setHkOrgId(member.getHkOrgId());
insert.setIsdeleted(Constants.ZERO);
insert.setCompanyId(member.getCompanyId());
insert.setFaceImg(member.getFaceImg());
@@ -189,24 +202,33 @@
insert.setCode(member.getCode());
insert.setType(Constants.TWO);
insert.setHkDate(new Date());
+ insert.setWorkStatus(Constants.ONE);//榛樿鍦ㄨ亴
+ insert.setCanVisit(Constants.ZERO);//榛樿涓嶅彲璁块棶
+ insert.setAuthStatus(Constants.ZERO);
insert.setName(member.getName());
+ insert.setHkId(UUID.randomUUID().toString().replace("-",""));
insert.setHkStatus(Constants.ONE);
- insert.setSex(IdcardUtil.getGenderByIdCard(member.getIdcardNo()) ==1?Constants.TWO:Constants.ONE);//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
- insert.setBirthday( DateUtil.parse(IdcardUtil.getBirthByIdCard(member.getIdcardNo()), "yyyyMMdd"));
+ insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
+ 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;
}
/**
* 鍒犻櫎娴峰悍浜哄憳淇℃伅
- * @param hkId
+ * @param hkIds
*/
- private void deleteHkUserBiz(String hkId) {
+ private void deleteHkUserBiz(String[] hkIds) {
+ if(hkIds ==null || hkIds.length == 0){
+ return;
+ }
UserDelRequest request = new UserDelRequest();
- request.setPersonIds(new String[]{hkId});
+ request.setPersonIds(hkIds);
BaseResponse<List<UserDelResponse>> result = HKService.delBatchUser(request);
}
@@ -218,21 +240,13 @@
private boolean dealHkUserBiz(Member insert) {
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
- Company company = companyMapper.selectById(insert.getCompanyId());
- if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
- }
- if(StringUtils.isBlank(company.getHkId())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭湭鍚屾瀹夐槻骞冲彴锛岃鍏堝墠寰�銆愮粍缁囩鐞嗐�戣彍鍗曡繘琛岀淮鎶わ紒");
- }
- insert.setHkOrgId(company.getHkId());
UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(insert,path,Constants.ZERO);
if(hkAddRequest == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝浜鸿劯鐓х墖鏈夎锛岃灏濊瘯閲嶆柊涓婁紶锛�");
}
//澶勭悊鏂板鏁版嵁
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())){
@@ -246,33 +260,243 @@
}
return false;
}
+ private boolean dealHkUserForUpdateBiz(Member update ) {
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+
+ UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(update,path,Constants.ONE);
+
+ //澶勭悊鏂板鏁版嵁
+ BaseResponse<UserAddResponse> result = HKService.editUser(hkAddRequest);
+ if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
+ update.setHkStatus(Constants.ONE);//宸插悓姝�
+ update.setRemark("浜哄憳淇℃伅宸插悓姝ユ垚鍔�");
+ if(StringUtils.isNotBlank(update.getFaceImg()) && Constants.equalsInteger(update.getFaceStatus(),Constants.ZERO)){
+ //濡傛灉鏈変汉鑴哥収鐗囷紝澶勭悊浜鸿劯鐓х墖鍚屾
+ String faceid = HkSyncOrgUserToHKServiceImpl.dealMemberFace(update,path);
+ if(StringUtils.isBlank(faceid)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍛樺伐浜鸿劯淇℃伅涓嶅悎鏍硷紝璇锋洿鎹汉鑴哥収鐗囬噸璇曪紒");
+ }else{
+ update.setFaceId(faceid);
+ update.setFaceStatus(Constants.ONE);
+ //濡傛灉浜鸿劯璺熶綘锛岄噸鏂颁笅鍙戞潈闄愭暟鎹�
+ update.setRemark("浜哄憳鍜屼汉鑴镐俊鎭悓姝ユ垚鍔�"+result.getMsg());
+ //閲嶆柊鎺堟潈璁惧鏉冮檺
+// HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,update,deviceRoleMapper,empowerMapper,deviceMapper);
+ }
+ }
+ update.setHkDate(update.getEditDate());
+ return true;
+ }else if(result!=null ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍚屾瀹夐槻骞冲彴澶辫触銆�"+result.getMsg()+"銆戯紝璇疯仈绯荤鐞嗗憳锛�");
+ }
+ return false;
+ }
+
+ /**
+ * 娓呴櫎鍛樺伐鐨勮澶囨潈闄�
+ * @param member
+ */
+ public static void cancelAllMemberEmpower(Member member,MemberRoleMapper memberRoleMapper,EmpowerMapper empowerMapper) {
+ //鍒犻櫎鍏ㄩ儴鏉冮檺
+ memberRoleMapper.update(null,new UpdateWrapper<MemberRole>().lambda()
+ .eq(MemberRole::getMemberId,member.getId())
+ .set(MemberRole::getIsdeleted,Constants.ONE)
+ .set(MemberRole::getEdirot,member.getEditor())
+ .set(MemberRole::getEditDate,member.getEditDate()));
+ //鎶婃墍鏈夊緟涓嬪彂鐨勪换鍔℃敼鎴� 宸插彇娑�
+ empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .eq(Empower::getSendStatus,Constants.EmpowerStatus.wait)
+ .set(Empower::getIsdeleted,Constants.ONE)
+ .set(Empower::getSendStatus,Constants.EmpowerStatus.cancel));
+ //鎵�鏈変笅鍙戣繃鐨勪换鍔★紝鏀逛负寰呭垹闄ゆ潈闄�
+ empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .set(Empower::getIsdeleted,Constants.ONE)
+ .notIn(Empower::getSendStatus,Constants.EmpowerStatus.fail)
+ .set(Empower::getRemark,"绛夊緟鍚屾鍒犻櫎瀹夐槻骞冲彴")
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .set(Empower::getSendStatus,Constants.ZERO));
+ }
private void isMemberParamValid(Member member) {
- if (!PhoneUtil.isPhone(member.getPhone())){
+ if(member.getCompanyId() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if (StringUtils.isBlank(member.getPhone())||!PhoneUtil.isPhone(member.getPhone())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
}
- if (!IdcardUtil.isValidCard(member.getIdcardNo())){
+ if (StringUtils.isNotBlank(member.getIdcardNo()) && !IdcardUtil.isValidCard(member.getIdcardNo())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
}
-
- SystemUser systemUser = new SystemUser();
- SystemUser queryUserDto = new SystemUser();
- queryUserDto.setUsername(member.getPhone());
- queryUserDto.setDeleted(Boolean.FALSE);
- SystemUser user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
- if (user != null) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+systemUser.getUsername()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ 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 (StringUtils.isNotBlank(member.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) ) >0){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+member.getPhone()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ }
+ Company company = companyMapper.selectById(member.getCompanyId());
+ if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
+ }
+ if(StringUtils.isBlank(company.getHkId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭湭鍚屾瀹夐槻骞冲彴锛岃鍏堝墠寰�銆愮粍缁囩鐞嗐�戣彍鍗曡繘琛岀淮鎶わ紒");
+ }
+ member.setHkOrgId(company.getHkId());
+ member.setCompanyType(company.getType());
+ if(Constants.equalsInteger(company.getType(),Constants.ONE)){
+ SystemUser queryUserDto = new SystemUser();
+ queryUserDto.setUsername(member.getPhone());
+ queryUserDto.setDeleted(Boolean.FALSE);
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
+ if (user != null) {
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+queryUserDto.getUsername()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ }
+ // 楠岃瘉宸ュ彿
+ if (StringUtils.isNotBlank(member.getCode())) {
+ queryUserDto = new SystemUser();
+ queryUserDto.setDeleted(Boolean.FALSE);
+ queryUserDto.setEmpNo(member.getCode());
+ user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
+ if (user != null) {
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿銆�"+member.getCode()+"銆戝凡瀛樺湪");
+ }
+ }
+ }
+ }
+ private Member isMemberUpdateParamValid(Member member) {
+ Member model = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(Company::getType,Member::getCompanyType)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(Member::getId,member.getId())
+ );
+ 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()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ }
+ }
+ if (StringUtils.isNotBlank(member.getIdcardNoNew())){
+ String encrptNo = (DESUtil.encrypt(Constants.EDS_PWD, 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);
+ }
+ }
+ boolean isNeedUpdateUser = false;
+ if(StringUtils.isNotBlank(member.getPhone()) && StringUtils.equals(member.getPhone(),model.getPhone())){
+ // 濡傛灉鎵嬫満鍙峰彂鐢熶慨鏀癸紝鏍￠獙鍞竴鎬�
+ SystemUser queryUserDto = new SystemUser();
+ queryUserDto.setUsername(member.getPhone());
+ queryUserDto.setDeleted(Boolean.FALSE);
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
+ .ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
+ if (user != null) {
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��" + queryUserDto.getUsername() + "銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ }
+ isNeedUpdateUser = true;
+ }
+ if(StringUtils.isNotBlank(member.getCode()) && StringUtils.equals(member.getPhone(),model.getCode())){
+ // 楠岃瘉宸ュ彿
+ SystemUser queryUserDto = new SystemUser();
queryUserDto = new SystemUser();
queryUserDto.setDeleted(Boolean.FALSE);
queryUserDto.setEmpNo(member.getCode());
- user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
+ .ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
if (user != null) {
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿銆�"+member.getCode()+"銆戝凡瀛樺湪");
}
+ isNeedUpdateUser = true;
}
+ if(member.getCompanyId()!=null && !Constants.equalsInteger(member.getCompanyId(),model.getCompanyId())){
+ //濡傛灉缁勭粐鍙戠敓鍙樺寲
+ Company company = companyMapper.selectById(member.getCompanyId());
+ if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
+ }
+ if(StringUtils.isBlank(company.getHkId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭湭鍚屾瀹夐槻骞冲彴锛岃鍏堝墠寰�銆愮粍缁囩鐞嗐�戣彍鍗曡繘琛岀淮鎶わ紒");
+ }
+ model.setCompanyType(company.getType());
+ 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(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)
+ && member.getTrainEndTime()!=null
+ && member.getTrainStartTime()!=null){
+ TrainTime trainTime = new TrainTime();
+ trainTime.setIsdeleted(Constants.ZERO);
+ trainTime.setCreator(member.getLoginUserInfo().getId());
+ trainTime.setCreateDate(new Date());
+ trainTime.setEdirot(trainTime.getCreator());
+ trainTime.setEditDate(trainTime.getCreateDate());
+ trainTime.setStartTime(member.getTrainStartTime());
+ trainTime.setEndTime(member.getTrainEndTime());
+
+ trainTime.setMemberId(member.getId());
+ //瀵煎叆鍩硅鏈夋晥鏈�
+ trainTimeMapper.insert(trainTime);
+ }
+ member.setHkId(model.getHkId());
+ member.setFaceId(model.getFaceId());//浜鸿劯缂栫爜
+ if(StringUtils.equals(model.getFaceImg(),member.getFaceImg())){
+ //濡傛灉浜鸿劯娌″彉鍖�
+ member.setFaceImg(null);
+ }
+ return model;
}
@Transactional
@@ -282,19 +506,8 @@
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);
+//
//杞崲鏃ユ湡
- DateTime yyyyMMdd = DateUtil.parse(birthByIdCard, "yyyyMMdd");
-
Member insert = new Member();
insert.setCreator(loginUserInfo.getId());
insert.setCreateDate(new Date());
@@ -306,11 +519,23 @@
insert.setImgurl(member.getImgurl());
insert.setType(Constants.ZERO);
insert.setName(member.getName());
- insert.setBirthday(yyyyMMdd);
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);
@@ -331,20 +556,33 @@
}
@Override
- public void deleteById(Integer id) {
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
+ @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));
}
@Override
- public void roleAuthById(Integer id) {
+ public void roleAuthById(Integer id,LoginUserInfo user) {
Member member = memberMapper.selectById(id);
if(member==null || member.getIsdeleted().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鍛樺伐淇℃伅宸插垹闄�");
@@ -352,6 +590,176 @@
// List<MemberCard> cards = HkSyncOrgUserToHKServiceImpl.getNormalCardList(member,memberCardMapper);
HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,member,deviceRoleMapper,empowerMapper,deviceMapper);
}
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void batchRoleAuth(Member memberRole) {
+ if(memberRole.getIds() ==null
+ || memberRole.getIds().size() ==0 ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(memberRole.getRoleIds() ==null || memberRole.getRoleIds().length ==0){
+ //濡傛灉鏄竻绌烘潈闄�
+ }else{
+ if( ! (Constants.equalsInteger(memberRole.getTimeType(),Constants.ZERO)
+ ||Constants.equalsInteger(memberRole.getTimeType(),Constants.TWO)
+ || (Constants.equalsInteger(memberRole.getTimeType(),Constants.ONE)
+ && memberRole.getStartTime() !=null && memberRole.getEndTime() != null ))){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(Constants.equalsInteger(memberRole.getTimeType(),Constants.ONE) && memberRole.getEndTime().getTime() < System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈夋晥鏈熸埅姝㈡棩鏈熶笉鑳藉皬浜庡綋鍓嶆椂闂达紒");
+ }
+ if(Constants.equalsInteger(memberRole.getTimeType(),Constants.ONE) && memberRole.getEndTime().getTime() <= memberRole.getStartTime().getTime()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈夋晥鏈熸埅姝㈡棩鏈熶笉鑳藉皬浜庡紑濮嬫椂闂达紒");
+ }
+ }
+ if(Constants.equalsInteger(memberRole.getTimeType(),Constants.ZERO) ){
+ memberRole.setStartTime(null);
+ memberRole.setEndTime(null);
+ }
+ for (Integer id : memberRole.getIds()){
+ Member member = memberMapper.selectById(id);
+ if(member==null || member.getIsdeleted().equals(Constants.ONE)){
+ //濡傛灉鍛樺伐淇℃伅涓嶅悎娉曠洿鎺ヨ烦杩�
+ continue;
+ }
+ if(StringUtils.isBlank(member.getFaceId()) || !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+member.getName()+"銆戠殑浜鸿劯淇℃伅涓嶆弧瓒虫巿鏉冩潯浠讹紝璇疯繑鍥炲畬鍠勫悗鍐嶈繘琛岃鎿嶄綔锛�");
+ }
+ member.setStartTime(memberRole.getStartTime());
+ member.setEndTime(memberRole.getEndTime());
+ Integer ischange = getRoleIdByParam(memberRole.getRoleIds(),member,memberRoleMapper,deviceRoleMapper);
+ if(memberRole.getRoleIds()!=null && memberRole.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鏈夋晥闂ㄧ缁勬暟鎹�");
+ }
+ if(Constants.equalsInteger(memberRole.getTimeType(),Constants.TWO)){
+ //濡傛灉鎸夌収鍩硅鏃ユ湡涓嬪彂
+ TrainTime trainTime = trainTimeMapper.selectOne(new QueryWrapper<TrainTime>().lambda()
+ .eq(TrainTime::getMemberId,id )
+ .eq(TrainTime::getIsdeleted,Constants.ZERO )
+ .orderByDesc(TrainTime::getId)
+ .last("limit 1")
+ );
+ if(trainTime == null || trainTime.getStartTime()==null || trainTime.getEndTime() ==null || trainTime.getStartTime().getTime()>=trainTime.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+member.getName()+"銆戝煿璁湁鏁堟湡淇℃伅涓虹┖锛岃杩斿洖瀹屽杽鍚庡啀杩涜璇ユ搷浣滐紒");
+ }
+ if(trainTime.getEndTime() .getTime()< System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+member.getName()+"銆戝煿璁湁鏁堟湡宸茶繃鏈燂紝璇烽噸鏂颁笂浼犲叾鍩硅鏈夋晥鏈燂紒");
+ }
+ memberRole.setStartTime(trainTime.getStartTime());
+ memberRole.setEndTime(trainTime.getEndTime());
+ }
+
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ .eq(Member::getId,member.getId())
+ .set(Member::getRoleId,member.getRoleId())
+ .set(Member::getAuthStatus,Constants.ONE)
+ .set(Member::getStartTime,memberRole.getStartTime())
+ .set(Member::getEndTime,memberRole.getEndTime())
+ .set(Member::getEditor,memberRole.getLoginUserInfo().getId())
+ .set(Member::getEditDate,new Date()) );
+ saveUserActionBiz(member,memberRole.getLoginUserInfo(), Constants.UserActionType.AUTH_ROLE,userActionJoinMapper,null);
+ //閲嶆柊鎺堟潈
+ HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,member,deviceRoleMapper,empowerMapper,deviceMapper);
+ }
+ }
+
+ public static Integer getRoleIdByParam(Integer[] param, Member member,MemberRoleMapper memberRoleMapper,DeviceRoleMapper deviceRoleMapper) {
+ //娣诲姞浜哄憳瑙掕壊鍏宠仈鏁版嵁
+ member.setRoleId(null);
+ List<MemberRole> roleList = memberRoleMapper.selectList( new QueryWrapper<MemberRole>().lambda()
+ .eq(MemberRole::getIsdeleted,Constants.ZERO)
+ .eq(MemberRole::getMemberId,member.getId()));
+
+ member.setRoleId("");
+ if((param == null || param.length==0 ) &&( roleList==null || roleList.size()==0)){
+ //妫�鏌ョ敤鎴锋儏鍐垫潈闄愬師鏈氨鏄┖鐨勶紝 鍒欐棤闇�澶勭悊
+ return 0;
+ }
+ if((param == null || param.length==0 ) &&( roleList!=null && roleList.size()>0) ){
+ //濡傛灉娓呯┖鍘熸潵鏈夋潈闄愶紝鎺ュ彛杩涜鏉冮檺鍒犻櫎鍘熸湁鏉冮檺鍗冲彲
+ memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
+ return 1;
+ }
+ if(!Objects.isNull(param)&¶m.length>Constants.ZERO){
+ /* if(roleList!=null && roleList.size()>0) {
+ //鍜屽師鏈夋潈闄愯繘琛屽姣旓紝鐪嬫槸鍚︽潈闄愬彂鐢熷彉鍖�
+ boolean ischange1=false;
+ for (MemberRole role : roleList) {
+ ischange1=false;
+ for (int j = 0; j < param.length; j++) {
+ if(Constants.equalsInteger(role.getRoleId(),param[j])){
+ ischange1=true;
+ break;
+ }
+ }
+ if(!ischange1){
+ break;
+ }
+ }
+
+ boolean ischange2 =false;
+ for (int j = 0; j < param.length; j++) {
+ ischange2=false;
+ for (MemberRole role : roleList) {
+ if(Constants.equalsInteger(role.getRoleId(),param[j])){
+ ischange2=true;
+ break;
+ }
+ }
+ if(!ischange2){
+ break;
+ }
+ }
+ if(ischange2 && ischange1){
+ return 0;//鏉冮檺鏈彂鐢熸敼鍙�
+ }
+ }*/
+ //濡傛灉鍘熸潵鏈夋潈闄愶紝鎺ュ彛杩涜鏉冮檺鍒犻櫎
+ memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
+ //鏌ヨ鏁版嵁搴撳瓨鍦ㄧ殑鏉冮檺
+ List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
+ .eq(DeviceRole::getType,Constants.TWO)
+ .in(DeviceRole::getId,param));
+
+ String ids = "";
+ if(CollectionUtils.isNotEmpty(deviceRoleList)){
+ List<MemberRole> memberRoleList = new ArrayList<>();
+ List<Integer> r = new ArrayList<>();
+ for (int i = 0; i < deviceRoleList.size(); i++) {
+ DeviceRole deviceRole =deviceRoleList.get(i);
+ if(i>0){
+ ids += ",";
+ }
+ Integer id =deviceRole.getId();
+ ids += "["+id+"]";
+ String doorids =deviceRole.getDoorIds();
+ if(StringUtils.isNotBlank(doorids)){
+ String[] ss = doorids.split(",");
+ try {
+ for(String s :ss){
+ r.add(Integer.parseInt(s));
+ }
+ }catch (Exception e){
+ //鑴忔暟鎹笉澶勭悊
+ }
+ }
+ MemberRole memberRole = new MemberRole();
+ memberRole.setCreateDate(new Date());
+ memberRole.setMemberId(member.getId());
+ memberRole.setIsdeleted(Constants.ZERO);
+ memberRole.setRoleId(deviceRole.getId());
+ memberRoleList.add(memberRole);
+ }
+ memberRoleMapper.insert(memberRoleList);
+ }
+ member.setRoleId(ids);
+ return 1;
+ }
+
+ return 0;
+ }
+
@Override
public void empowerByList(Member member) {
if(member.getIdList()!=null && member.getIdList().size() >0){
@@ -374,81 +782,183 @@
}
@Override
- public void deleteByIdInBatch(List<Integer> ids) {
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo loginUserInfo) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- 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);
+ member.setHkStatus(Constants.ZERO);
+ member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺");
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
memberMapper.updateById(member);
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
+ });*/
- UserAction userAction=new UserAction();
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setCreator(loginUserInfo.getId());
- userAction.setType(9);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬垹闄ゃ��");
- userAction.setMemberId(s+"");
- userActionJoinMapper.insert(userAction);
-
- });
-
-
-
-
-
- /* memberMapper.deleteBatchIds(ids);*/
}
+ /**
+ * 鎷夐粦鎴栬�呭喕缁撳憳宸ヤ俊鎭�
+ * @param ids
+ * @param type
+ * @param loginUserInfo
+ */
@Override
- public void batchBlock(List<Integer> ids,Integer type) {
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void batchBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Member member=new Member();
for (Integer id:ids) {
- member = memberMapper.selectById(id);
- if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
- UserAction userAction=new UserAction();
-// userAction.setBeforeStatus(member.getStatus());
- member.setStatus(Constants.TWO);
+ Member member = memberMapper.selectById(id);
+ if(!Objects.isNull(member)&&member.getStatus()!=Constants.TWO){
+ member.setStatus(Constants.TWO);//鎭㈠姝ｅ父鐘舵��
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
+ member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
memberMapper.updateById(member);
-
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setCreator(loginUserInfo.getId());
+ Date date = new Date();
+ member.setEditDate(date);
+ member.setEditor(loginUserInfo.getId());
+ //鍒犻櫎鍛樺伐闂ㄧ鏉冮檺
+ cancelAllMemberEmpower(member,memberRoleMapper,empowerMapper);
if(Constants.equalsInteger(type,Constants.ONE)){
- userAction.setType(Constants.ONE);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.FREEZE,userActionJoinMapper,JSONObject.toJSONString(member));
}
if(Constants.equalsInteger(type,Constants.TWO)){
- userAction.setType(Constants.TWO);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愭媺榛戙��");
-
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.BLACKLIST,userActionJoinMapper,JSONObject.toJSONString(member));
}
- userAction.setMemberId(id+"");
-
- userActionJoinMapper.insert(userAction);
}
}
- /* memberMapper.deleteBatchIds(ids);*/
+ }
+ /**
+ * 鎷夐粦鎴栬�呭喕缁撳憳宸ヤ俊鎭�
+ * @param ids
+ * @param type
+ * @param loginUserInfo
+ */
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void batchRemoveBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ for (Integer id:ids) {
+ Member member = memberMapper.selectById(id);
+ if(!Objects.isNull(member)&&member.getStatus()==Constants.TWO){
+ member.setStatus(Constants.ZERO);//鎭㈠姝ｅ父鐘舵��
+ member.setEditor(loginUserInfo.getId());
+ member.setEditDate(new Date());
+ member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
+ memberMapper.updateById(member);
+ Date date = new Date();
+ member.setEditDate(date);
+ member.setEditor(loginUserInfo.getId());
+ if(Constants.equalsInteger(type,Constants.ONE)){
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_FREEZE,userActionJoinMapper,JSONObject.toJSONString(member));
+ }
+ if(Constants.equalsInteger(type,Constants.TWO)){
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_BLACKLIST,userActionJoinMapper,JSONObject.toJSONString(member));
+ }
+ }
+ }
}
@Override
- public void updateById(Member member) {
- memberMapper.updateById(member);
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void updateById(Member updateMember) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo == null){
+ loginUserInfo = updateMember.getLoginUserInfo();
+ }
+ //鏍￠獙鍙傛暟 骞朵笖鏇存柊systemuser 鎵嬫満鍙峰拰宸ュ彿淇℃伅锛堝鏋滈渶瑕佷慨鏀圭殑璇濓級
+ Member model = isMemberUpdateParamValid(updateMember);
+ updateMember.setEditor(loginUserInfo.getId());
+ updateMember.setEditDate(new Date());
+ //娴峰悍浜哄憳鏂板涓氬姟
+ if(dealHkUserForUpdateBiz(updateMember)){
+ updateMember.setHkId(null);
+ updateMember.setAuthStatus(Constants.ZERO);
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ .set(Member::getStartTime,null)
+ .set(Member::getEndTime,null)
+ .set(Member::getRoleId,null)
+ .set(StringUtils.isNotBlank(updateMember.getPhone()),Member::getPhone,updateMember.getPhone())
+ .set(StringUtils.isNotBlank(updateMember.getName()),Member::getName,updateMember.getName())
+ .set(Member::getEditDate,updateMember.getEditDate())
+ .set(Member::getEditor,updateMember.getEditor())
+ .set(StringUtils.isNotBlank(updateMember.getIdcardNo()),Member::getIdcardNo,updateMember.getIdcardNo())
+ .set(StringUtils.isNotBlank(updateMember.getIdcardDecode()),Member::getIdcardDecode,updateMember.getIdcardDecode())
+ .set( Member::getAuthStatus,Constants.ZERO)
+ .set(updateMember.getHkStatus()!=null,Member::getHkStatus,updateMember.getHkStatus())
+ .set(updateMember.getSex()!=null,Member::getSex,updateMember.getSex())
+ .set(updateMember.getFaceStatus()!=null,Member::getFaceStatus,updateMember.getFaceStatus())
+ .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate())
+ .set(StringUtils.isNotBlank(updateMember.getRemark()),Member::getRemark,updateMember.getRemark())
+ .set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
+ .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);
+ //璁板綍鎿嶄綔鏃ュ織
+ saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper,null);
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+ }
}
+
+ private void dealTrainTIme(Member updateMember, int i,LoginUserInfo loginUserInfo) {
+ if( updateMember.getTrainEndTime()!=null
+ && updateMember.getTrainStartTime()!=null){
+ if(updateMember.getTrainEndTime().getTime() <System.currentTimeMillis() || updateMember.getTrainEndTime().getTime()<updateMember.getTrainStartTime().getTime()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇峰～鍐欐纭湁鏁堢殑鍩硅鏈夋晥鏈熶俊鎭紒");
+ }
+ TrainTime trainTime = new TrainTime();
+ trainTime.setIsdeleted(Constants.ZERO);
+ trainTime.setCreator(loginUserInfo.getId());
+ trainTime.setCreateDate(new Date());
+ trainTime.setEdirot(trainTime.getCreator());
+ trainTime.setEditDate(trainTime.getCreateDate());
+ trainTime.setStartTime(updateMember.getTrainStartTime());
+ trainTime.setEndTime(updateMember.getTrainEndTime());
+ trainTime.setMemberId(updateMember.getId());
+ trainTime.setImportInfo("鐢便��"+loginUserInfo.getRealname()+"銆戜簬"+DateUtil.getPlusTime2(trainTime.getCreateDate())+(i==0?"鍒涘缓":"鏇存柊")+"褰曞叆");
+ //瀵煎叆鍩硅鏈夋晥鏈�
+ trainTimeMapper.insert(trainTime);
+ }
+ }
+
+ 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());
+ userAction.setCreator(updateMember.getEditor());
+ userAction.setBeforeStatus(updateMember.getStatus());
+ 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()!=null?updateMember.getEditDate():new Date())));
+ userAction.setMemberId(updateMember.getId()+"");
+ userActionMapper.insert(userAction);
+ }
+
@Override
public boolean updateFace(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
@@ -478,10 +988,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())){
@@ -489,95 +999,99 @@
}
HkSyncEmpowerServiceImpl.doHkDeleteUser(model.getId(),model.getHkId(),new Date(),memberMapper,memberCardMapper);
}
+ @Override
+ public void updateHead(Member member) {
+ Member model =memberMapper.selectById(member.getId());
+ if(model ==null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+ }
+ if(model.getCompanyId()!=null) {
+ if(Constants.equalsInteger(member.getHeadStatus(),Constants.ONE)){
+ //濡傛灉鏄彇娑堜富绠�
+ companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+ .eq(Company::getId,model.getCompanyId())
+ .set(Company::getHeadId,member.getId()));
+ //璁板綍鎿嶄綔鏃ュ織
+ saveUserActionBiz(member,member.getLoginUserInfo(), Constants.UserActionType.BE_HEAD,userActionJoinMapper,null);
+ }else{
+ //濡傛灉鏄涓轰富绠�
+ companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+ .eq(Company::getId,model.getCompanyId())
+ .set(Company::getHeadId,null)
+ );
+ saveUserActionBiz(member,member.getLoginUserInfo(),Constants.UserActionType.NOT_HEAD,userActionJoinMapper,null);
+ }
+ }
+ }
@Override
public void updateStatusById(Member member) {
+ Member model =memberMapper.selectById(member.getId());
+ if(model ==null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+ }
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo == null){
+ loginUserInfo = member.getLoginUserInfo();
+ }
Member update = new Member();
update.setEditDate(new Date());
update.setEditor(loginUserInfo.getId());
update.setStatus(member.getStatus());
memberMapper.updateById(update);
}
-
-
@Override
- public void updateVisitsStatusById(Member member) {
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void updateWorkStatus(Member member) {
+ Member model =memberMapper.selectById(member.getId());
+ if(model ==null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+ }
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Member result=memberMapper.selectById(member.getId());
- Integer status=result.getStatus();
+ if(loginUserInfo == null){
+ loginUserInfo = member.getLoginUserInfo();
+ }
Member update = new Member();
+ update.setId(member.getId());
update.setEditDate(new Date());
update.setEditor(loginUserInfo.getId());
- update.setStatus(Constants.Status.FREEZE.getValue());
- update.setId(member.getId());
+ update.setWorkStatus(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO);
+ if(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)){
+ //濡傛灉鏄鑱�
+ cancelAllMemberEmpower(update,memberRoleMapper,empowerMapper);
+ }
+ update.setAuthStatus(Constants.ZERO);
memberMapper.updateById(update);
-
- UserAction userAction=new UserAction();
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setCreator(loginUserInfo.getId());
- if(Constants.equalsInteger(result.getType(),Constants.TWO)){
- userAction.setType(Constants.ONE);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
- }
- if(Constants.equalsInteger(result.getType(),Constants.ZERO)){
- userAction.setType(Constants.TWO);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愭媺榛戙��");
-
- }
- userAction.setMemberId(result.getId()+"");
- userAction.setBeforeStatus(status);
- userActionJoinMapper.insert(userAction);
- }
-
-
- @Override
- public void updateRemoveStatusById(List<Member> members) {
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
- Date date=new Date();
- members.stream().forEach(s ->{
- Member result=memberMapper.selectById(s.getId());
- Integer status=result.getStatus();
- Member update = new Member();
- update.setEditDate(date);
- update.setEditor(loginUserInfo.getId());
- update.setStatus(Constants.Status.ENABLE.getValue());
- update.setId(s.getId());
- memberMapper.updateById(update);
-
- //瑙ｅ喕涓氬姟 澶勭悊鐢ㄦ埛鎺堟潈瀵煎叆璁板綍
- this.thawMember(result);
-
- UserAction userAction=new UserAction();
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setCreator(loginUserInfo.getId());
- if(Constants.equalsInteger(result.getType(),Constants.TWO)){
- userAction.setType(Constants.ZERO);
- userAction.setBeforeStatus(Constants.ONE);
- }
- if(Constants.equalsInteger(result.getType(),Constants.ONE)){
- userAction.setBeforeStatus(status);
- userAction.setType(Constants.TWO);
- }
- userAction.setMemberId(result.getId()+"");
- userActionJoinMapper.insert(userAction);
- });
+ //璁板綍鎿嶄綔鏃ュ織
+ saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.UserActionType.WORK_OFF:Constants.UserActionType.WORK_ON,userActionJoinMapper,null);
}
-
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void updateCanVisitById(Member member) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo == null){
+ loginUserInfo = member.getLoginUserInfo();
+ }
+ Member model =memberMapper.selectById(member.getId());
+ if(model ==null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+ }
+ if(Constants.equalsInteger(member.getCanVisit(),model.getCanVisit())){
+ //濡傛灉娌℃湁鍙戠敓鍙樺寲锛岀洿鎺ヨ繑鍥�
+ return;
+ }
Member update = new Member();
update.setEditDate(new Date());
+ update.setId(member.getId());
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);
}
@Override
@@ -606,9 +1120,42 @@
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(Member.class)
- .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
- .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName);
+ .selectAs(Company::getName,Member::getCompanyName) ;
+ queryWrapper.selectAs(Position::getName,Member::getPositionName);
+ queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
+ if(StringUtils.isNotBlank(member.getName())){
+ queryWrapper.like(Member::getName,member.getName());
+ }
+ if(Objects.nonNull(member.getCompanyType())){
+ queryWrapper.eq(Company::getType,member.getCompanyType());
+ }
+ if(null != member.getType()) {
+ queryWrapper.eq(Member::getType,member.getType());
+ }
+ if(null != member.getCompanyId()) {
+ queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
+ }
+ 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());
}
@@ -639,7 +1186,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 ");
}
}
@@ -686,6 +1232,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()));
@@ -785,36 +1334,6 @@
}
@Override
- public PageData<MemberInfoDTO> findLaborMemberInfoPage(PageWrap<MemberInfoDTO> pageWrap) {
- IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
- MemberInfoDTO model = pageWrap.getModel();
- Utils.MP.blankToNull(model);
- Date end =pageWrap.getModel().getTrainTimeEndTime() !=null? Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime()):new Date();
- queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
- /* .leftJoin(TrainTime.class,TrainTime::getMemberId,Member::getId)
- .leftJoin(Empower.class,Empower::getMemberId,Member::getId);*/
-
- queryWrapper.selectAll(Member.class)
- .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
- .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName)
- /*.select(" (select Max(tt.END_TIME) from train_time tt where tt.ISDELETED=0 and tt.MEMBER_ID=t.id) as trainTimeEndTime")*/
- .select(" (select Max(e.END_TIME) from empower e where e.ISDELETED=0 and e.MEMBER_ID=t.id) as empowerEndTime");
-
- queryWrapper.eq(Member::getType,Constants.ZERO);
- queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
- .like(StringUtils.isNotBlank(model.getName()),Member::getName,model.getName())
- .like(StringUtils.isNotBlank(model.getPhone()),Member::getPhone,model.getPhone())
- .like(StringUtils.isNotBlank(model.getIdcardDecode()),Member::getIdcardDecode,model.getIdcardDecode())
- .having(pageWrap.getModel().getTrainTimeEndTime()!=null,"trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
- IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
- if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
- memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode()) ==1?Constants.TWO:Constants.ONE));
- }
- return PageData.from(memberIPage);
- }
-
- @Override
public long count(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<Member>(member);
wrapper.lambda().like(StringUtils.isNotBlank(member.getRoleIdParam()), Member::getRoleId, member.getRoleIdParam());
@@ -839,16 +1358,24 @@
}
@Override
- public PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
+ 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);
+ queryWrapper.selectAs(Company::getType,Member::getCompanyType);
+ queryWrapper.selectAs(Company::getHeadId,Member::getHeadId);
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.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());
+// 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())
.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyword()),ms->ms
@@ -860,20 +1387,33 @@
.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(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());
}else{
- queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
+// queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
}
- IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ if(pageWrap.getModel().getCompanyId()!=null){
+ if(pageWrap.getModel().getIncludeChild()!=null &&pageWrap.getModel().getIncludeChild() ){
+ //濡傛灉鍖呭惈涓嬬骇缁勭粐
+ Company company = companyMapper.selectById(pageWrap.getModel().getCompanyId());//鏌ヨ缁勭粐淇℃伅
+ queryWrapper.likeRight(Company::getCompanyPath,company.getCompanyPath());
+ }else{
+ //涓嶅寘鍚笅绾х粍缁�
+ queryWrapper.eq(Company::getId,pageWrap.getModel().getCompanyId());
+ }
+ }
+ IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
if(CollectionUtils.isNotEmpty(memberIPage.getRecords())){
//FTP鏂囦欢璁块棶鍓嶇紑
@@ -883,8 +1423,11 @@
List<DeviceRole> deviceRoleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
.select(DeviceRole::getId,DeviceRole::getName)
.eq(DeviceRole::getIsdeleted,Constants.ZERO));
- for (MemberInfoDTO memberInfoDTO:memberIPage.getRecords()) {
+ for (Member memberInfoDTO:memberIPage.getRecords()) {
//鑾峰緱闂ㄧ缁勫悕绉版暟缁�
+ memberInfoDTO.setCanVisit(Constants.formatIntegerNum(memberInfoDTO.getCanVisit()));
+ memberInfoDTO.setWorkStatus(Constants.formatIntegerNum(memberInfoDTO.getWorkStatus()));
+ memberInfoDTO.setHeadStatus(Constants.equalsInteger(memberInfoDTO.getHeadId(),memberInfoDTO.getId())?Constants.ONE:Constants.ZERO);
memberInfoDTO.setRoleNames(this.dealRoleDatas(memberInfoDTO.getRoleId(),deviceRoleList));
//鎷兼帴鍓嶇紑
if(StringUtils.isNotBlank(memberInfoDTO.getFaceImg())){
@@ -925,14 +1468,16 @@
}
@Override
- public PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap) {
+ public PageData<Member> findVisitPage(PageWrap<MemberQuery> pageWrap) {
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(Member.class)
- .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
- .selectAs(Member::getLastVisitDate,MemberInfoDTO::getVisitsLastDate)
- .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");
+ .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 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())
@@ -948,24 +1493,23 @@
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
}else{
- queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
+ queryWrapper.eq((pageWrap.getModel().getCompanyId())!=null,Member::getCompanyId,pageWrap.getModel().getCompanyId());
}
- IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
return PageData.from(memberIPage);
}
@Override
- public PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
+ 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,MemberInfoDTO::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());
@@ -977,12 +1521,14 @@
.or().like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName()))
.like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
.eq(Member::getStatus,Constants.Status.FREEZE.getValue())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId())
+ .eq((pageWrap.getModel().getCompanyId())!=null,Company::getId,pageWrap.getModel().getCompanyId())
.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<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
return PageData.from(memberIPage);
}
@@ -1043,7 +1589,7 @@
list.add(model);
}
//瀵煎叆鏂板鐨勬巿鏉冧俊鎭�
- empowerMapper.insertBatchSomeColumn(list);
+ empowerMapper.insert(list);
}
}
}
@@ -1055,6 +1601,7 @@
* 瀹氭椂鍐荤粨鍐呴儴浜哄憳
*/
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void memberFreeze(){
SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_FREEZE);
if(Objects.isNull(systemDictData)||
@@ -1062,43 +1609,38 @@
){
return;
}
+ int days = 30;
+ try {
+ days = Integer.parseInt(systemDictData.getCode());
+ }catch (Exception e){
+
+ }
List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>()
.lambda().eq(Member::getIsdeleted,Constants.ZERO)
.eq(Member::getType,Constants.memberType.internal)
.eq(Member::getStatus,Constants.ZERO)
.isNotNull(Member::getHkId)
- .exists(" SELECT 1 FROM device_event b WHERE b.ext_event_person_no = HK_ID AND TO_DAYS( NOW()) - TO_DAYS( b.CREATE_DATE ) > "+systemDictData.getCode()+" ")
- );
+ .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" ));
if(CollectionUtils.isEmpty(memberList)){
return;
}
List<Integer> memberIds = memberList.stream().map(m->m.getId()).collect(Collectors.toList());
-
- for (Integer id:memberIds) {
- UserAction userAction=new UserAction();
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setType(1);
- userAction.setRemark("鐢卞畾鏃朵换鍔′簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
- userAction.setMemberId(id+"");
- userActionJoinMapper.insert(userAction);
- }
-
-
//鍐荤粨鐘舵��
memberMapper.update(null,new UpdateWrapper<Member>()
.lambda().set(Member::getStatus,Constants.TWO)
.set(Member::getEditDate,new Date())
.in(Member::getId,memberIds)
);
- //澶勭悊涓嬪彂鏁版嵁
- empowerMapper.update(null,new UpdateWrapper<Empower>()
- .lambda()
- .set(Empower::getIsdeleted,Constants.ONE)
- .set(Empower::getSendStatus,Constants.ZERO)
- .set(Empower::getEditDate,new Date())
- .in(Empower::getMemberId,memberIds)
- );
+ Date date = new Date();
+ for (Integer id:memberIds) {
+ Member updateMember = new Member();
+ updateMember.setId(id);
+ updateMember.setEditDate(date);
+ cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
+ saveUserActionBiz(updateMember,null,Constants.UserActionType.FREEZE,userActionJoinMapper,JSONObject.toJSONString(updateMember));
+ }
+
+
}
@@ -1117,16 +1659,20 @@
* @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"))){
- openId = tokenJson.getString("openid");
- }
+// JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
+ String openId = code;
+// if(!Objects.isNull(tokenJson.get("access_token"))){
+// openId = tokenJson.getString("openid");
+// }
+// String openId = "12345";
WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
wxAuthorizeVO.setOpenid(openId);
//鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
@@ -1135,6 +1681,7 @@
.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 ")
@@ -1153,12 +1700,16 @@
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);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵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);
+ }
+ }
}
return wxAuthorizeVO;
}
@@ -1167,30 +1718,29 @@
@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::getCanVisit,Constants.ONE)
- .eq(Member::getType,Constants.memberType.internal)
- .last(" limit 1 ")
+ .eq(Member::getType,Constants.memberType.internal)
);
- 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;
}
@@ -1232,50 +1782,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
@@ -1284,7 +1790,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());
}
//鍦ㄥ満杞﹁締
@@ -1308,7 +1814,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>()
@@ -1321,6 +1827,222 @@
return stagingHeadVO;
}
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public String importBatch(MultipartFile file,Integer companyType, LoginUserInfo loginUserInfo){
+ Boolean importing = (Boolean) redisTemplate.opsForValue().get(Constants.RedisKeys.IMPORTING_MEMBER);
+ if(importing!=null && importing){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸插瓨鍦ㄥ憳宸ュ鍏ヤ换鍔℃鍦ㄦ墽琛屼腑锛岃绋嶅悗鍐嶈瘯锛�");
+ }
+ redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_MEMBER,true);
+ try {
+ ExcelImporter ie = null;
+ List<MemberImport> dataList =null;
+ try {
+ ie = new ExcelImporter(file,1,0);
+ dataList = ie.getDataList(MemberImport.class,null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ if(dataList == null || dataList.size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁涓虹┖锛�");
+ }
+ List<Member> list = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ );
+ List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
+ .eq(Company::getIsdeleted,Constants.ZERO));
+ List<Member> newList = new ArrayList<>();
+ for(int i=0;i<dataList.size();i++){
+ MemberImport model = dataList.get(i);
+ if(StringUtils.isBlank(model.getName())
+ &&StringUtils.isBlank(model.getIdcardNo())
+ &&StringUtils.isBlank(model.getPhone())
+ &&StringUtils.isBlank(model.getCompanyName())){
+ continue;
+ }
+ Member member = checkModelParam(model,newList,i,loginUserInfo,list,companyList,companyType);
+ newList.add(member);
+ }
+ if(newList == null || newList.size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏈夋晥鏁版嵁涓虹┖锛�");
+ }
+ dealHkUserBizBatch(newList);
+ return "瀵煎叆鎴愬姛";
+ }catch (BusinessException e){
+ throw e;
+ }catch (Exception e){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"鍛樺伐淇℃伅瀵煎叆澶辫触锛岃绋嶅悗閲嶈瘯");
+ }finally {
+ redisTemplate.delete(Constants.RedisKeys.IMPORTING_MEMBER);
+ }
+ }
+
+ private void dealHkUserBizBatch(List<Member> newList) {
+ List<String> hkIds = new ArrayList<>();
+ try {
+ for(Member insert: newList){
+ if(dealHkUserBiz(insert)){
+ //鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅銆�"+insert.getName()+"銆戝悓姝ュ畨闃插钩鍙板け璐ワ紝璇风◢鍚庨噸璇曪紒");
+ }
+ }
+ memberMapper.insert(newList);
+ List<SystemUser> userList = new ArrayList<>();
+ for(Member insert: newList){
+ //鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
+// if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){
+ //濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿
+ userList.add(createSystemUser(insert,systemDictDataBiz));
+// }
+ }
+ if(userList.size()>0){
+ systemUserMapper.insert(userList);
+ }
+ }catch (Exception e){
+ //濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
+ deleteHkUserBiz(hkIds.toArray(new String[0]));
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅瀵煎叆澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+ }
+ }
+ private Member checkModelParam(MemberImport model, List<Member> newList
+ ,int index
+ ,LoginUserInfo loginUserInfo
+ ,List<Member> memberList
+ ,List<Company> companyList
+ ,Integer companyType) {
+ if(StringUtils.isBlank(model.getName())
+ ||StringUtils.isBlank(model.getIdcardNo())
+ ||StringUtils.isBlank(model.getPhone())
+ ||StringUtils.isBlank(model.getCompanyName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屼汉鍛樹俊鎭笉瀹屾暣锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ 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()+"銆戞牸寮忎笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ for(Member member: newList){
+ 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()+"銆戦噸澶嶅嚭鐜帮紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ }
+ Company company = findCompanyFromList(model.getCompanyName(),companyList);
+ if(company == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岀粍缁囧悕绉般��"+model.getCompanyName()+"銆戜笉瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ 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(findMemberFromListByPhone(model.getPhone(),memberList ) !=null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屾墜鏈哄彿銆�"+model.getPhone()+"銆戝凡瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ Member member = new Member();
+ member.setPhone(model.getPhone());
+ member.setName(model.getName());
+ member.setIdcardNo(model.getIdcardNo());
+ member.setCompanyId(company.getId());
+ Member insert = initAddMemberModel(member,loginUserInfo);
+ insert.setCompanyType(company.getType());
+ insert.setHkOrgId(company.getHkId());
+ return insert;
+ }
+
+ private Company findCompanyFromList(String companyName, List<Company> companyList) {
+ if(companyList !=null){
+ for(Company company : companyList){
+ if(StringUtils.equals(companyName,company.getName())){
+ return company;
+ }
+ }
+ }
+ return null;
+ }
+ public static Member findMemberFromListByIdcard(String param, List<Member> list) {
+ if(list !=null){
+ for(Member member : list){
+ if(StringUtils.equals(param,member.getIdcardNo())){
+ return member;
+ }
+ }
+ }
+ return null;
+ }
+ private Member findMemberFromListByPhone(String phone, List<Member> list) {
+ if(list !=null){
+ for(Member member : list){
+ if(StringUtils.equals(phone,member.getPhone())){
+ return member;
+ }
+ }
+ }
+ return null;
+ }
+
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void registerDriver(RegisterDriverDTO registerDriverDTO){
+ if(Objects.isNull(registerDriverDTO)
+ || StringUtils.isBlank(registerDriverDTO.getName())
+ || StringUtils.isBlank(registerDriverDTO.getPassword())
+ || StringUtils.isBlank(registerDriverDTO.getValidCode())
+ || StringUtils.isBlank(registerDriverDTO.getPhone())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .eq(Member::getPhone,registerDriverDTO.getPhone())
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵嬫満鍙峰凡娉ㄥ唽!");
+ };
+ if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted,Constants.ZERO)
+ .and(i->i.eq(SystemUser::getMobile,registerDriverDTO.getPhone()).or().eq(SystemUser::getUsername,registerDriverDTO.getPhone()))
+ )>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.THREE);
+ member.setName(registerDriverDTO.getName());
+ member.setPhone(registerDriverDTO.getPhone());
+ member.setStatus(Constants.ZERO);
+ member.setPassward(Utils.Secure.encryptPassword(registerDriverDTO.getPassword(), salt));
+ memberMapper.insert(member);
+
+
+ SystemUser systemUser = new SystemUser();
+ systemUser.setCreateTime(new Date());
+ systemUser.setDeleted(Boolean.FALSE);
+ 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.setSource(Constants.TWO);
+ systemUserMapper.insert(systemUser);
+
+ }
+
}
--
Gitblit v1.9.3