From fc952b4f77402fab56af7861781803884ca0d16c Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期三, 27 十二月 2023 09:52:20 +0800
Subject: [PATCH] 导出对接字段展示调整提交
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 380 insertions(+), 28 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 9a28a50..8d0b612 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -14,6 +14,7 @@
import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -25,10 +26,14 @@
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
-import com.doumee.dao.business.MemberMapper;
-import com.doumee.dao.business.TrainTimeMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.join.MemberJoinMapper;
+import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.web.reqeust.CheckVisitedDTO;
+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;
@@ -38,13 +43,16 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 浜哄憳淇℃伅琛⊿ervice瀹炵幇
@@ -63,9 +71,22 @@
@Autowired
private TrainTimeMapper trainTimeMapper;
+ @Autowired
+ private MemberRoleMapper memberRoleMapper;
+
+ @Autowired
+ private DeviceRoleMapper deviceRoleMapper;
+
+ @Autowired
+ private EmpowerMapper empowerMapper;
+
+ @Autowired
+ private DeviceMapper deviceMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private UserActionJoinMapper userActionJoinMapper;
@Override
public Integer create(Member member) {
@@ -115,7 +136,7 @@
insert.setParentId(member.getParentId());
memberMapper.insert(insert);
- TrainTime trainTime = new TrainTime();
+ /* TrainTime trainTime = new TrainTime();
trainTime.setCreator(loginUserInfo.getId().toString());
trainTime.setCreateDate(new Date());
trainTime.setEdirot(loginUserInfo.getId().toString());
@@ -126,13 +147,20 @@
trainTime.setEndTime(Utils.Date.getDayEnd(member.getEndTime()));
// trainTime.setImportStatus();
// trainTime.setImportInfo();
- trainTimeMapper.insert(trainTime);
+ trainTimeMapper.insert(trainTime);*/
return insert.getId();
}
@Override
public void deleteById(Integer id) {
- memberMapper.deleteById(id);
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ Member member=new Member();
+ member.setId(id);
+ member.setIsdeleted(Constants.ZERO);
+ member.setEditor(loginUserInfo.getId());
+ member.setEditDate(new Date());
+ memberMapper.updateById(member);
}
@Override
@@ -146,8 +174,39 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- memberMapper.deleteBatchIds(ids);
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Member member=new Member();
+ ids.stream().forEach(s ->{
+ member.setId(s);
+ member.setIsdeleted(Constants.ONE);
+ member.setEditor(loginUserInfo.getId());
+ member.setEditDate(new Date());
+ memberMapper.updateById(member);
+ });
+ /* memberMapper.deleteBatchIds(ids);*/
}
+
+ @Override
+ public void batchBlock(List<Integer> ids) {
+ 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){
+ member.setStatus(Constants.TWO);
+ member.setEditor(loginUserInfo.getId());
+ member.setEditDate(new Date());
+ memberMapper.updateById(member);
+ }
+ }
+ /* memberMapper.deleteBatchIds(ids);*/
+ }
+
+
+
@Override
public void updateById(Member member) {
@@ -161,6 +220,85 @@
update.setEditDate(new Date());
update.setEditor(loginUserInfo.getId());
update.setStatus(member.getStatus());
+ memberMapper.updateById(update);
+ }
+
+
+ @Override
+ public void updateVisitsStatusById(Member member) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Member result=memberMapper.selectById(member.getId());
+ Integer status=result.getStatus();
+ Member update = new Member();
+ update.setEditDate(new Date());
+ update.setEditor(loginUserInfo.getId());
+ update.setStatus(Constants.Status.FREEZE.getValue());
+ update.setId(member.getId());
+ 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()+"銆戜簬銆愭搷浣滄椂闂�"+new Date()+"銆戯紝杩涜銆愬喕缁撱��");
+ }
+ if(Constants.equalsInteger(result.getType(),Constants.ZERO)){
+ userAction.setType(Constants.TWO);
+ userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+new Date()+"銆戯紝杩涜銆愭媺榛戙��");
+
+ }
+ 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);
+ }
+ if(Constants.equalsInteger(result.getType(),Constants.ZERO)){
+ userAction.setType(Constants.THREE);
+ }
+ userAction.setMemberId(result.getId()+"");
+ userAction.setBeforeStatus(status);
+ userActionJoinMapper.insert(userAction);
+ });
+ }
+
+
+
+
+ @Override
+ public void updateCanVisitById(Member member) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Member update = new Member();
+ update.setEditDate(new Date());
+ update.setEditor(loginUserInfo.getId());
+ update.setCanVisit(member.getCanVisit());
memberMapper.updateById(update);
}
@@ -193,9 +331,28 @@
@Override
public PageData<Member> findPage(PageWrap<Member> pageWrap) {
+
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getKeyword() != null) {
+ queryWrapper.lambda().and( ms->ms.like(Member::getName,pageWrap.getModel().getKeyword())
+ .or().like(Member::getPhone,pageWrap.getModel().getKeyword())
+ .or().like(Member::getCode,pageWrap.getModel().getKeyword()));
+ }
+ 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 ");
+ }
+ }
+
+ if (pageWrap.getModel().getIsFace() != null) {
+ queryWrapper.lambda().isNull(pageWrap.getModel().getIsFace()==Constants.ZERO,Member::getFaceImg);
+ queryWrapper.lambda().isNotNull(pageWrap.getModel().getIsFace()==Constants.ONE,Member::getFaceImg);
+ }
+
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(Member::getId, pageWrap.getModel().getId());
}
@@ -337,22 +494,23 @@
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
MemberInfoDTO model = pageWrap.getModel();
Utils.MP.blankToNull(model);
- Date end = Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime());
- queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .leftJoin(TrainTime.class,TrainTime::getMemberId,Member::getId)
- .leftJoin(Empower.class,Empower::getMemberId,Member::getId);
+ 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("Max(t1.endTime)","trainTimeEndTime")
- .select("Max(t2.endTime)","empowerEndTime");
+ /*.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("trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
+ .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())));
@@ -362,7 +520,8 @@
@Override
public long count(Member member) {
- QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
+ QueryWrapper<Member> wrapper = new QueryWrapper<Member>(member);
+ wrapper.lambda().like(StringUtils.isNotBlank(member.getRoleIdParam()), Member::getRoleId, member.getRoleIdParam());
return memberMapper.selectCount(wrapper);
}
@@ -386,31 +545,35 @@
@Override
public PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
-
- //鏄惁鏄暟瀛�
+ /* //鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈鑻辨枃
- boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());*/
- IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ /* IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
MemberQuery model = pageWrap.getModel();
Utils.MP.blankToNull(model);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .leftJoin(DeviceRole.class,DeviceRole::getId,Member::getRoleId)
- .leftJoin(MemberCard.class,MemberCard::getMemberId,Member::getId);
+ .leftJoin(DeviceRole.class,DeviceRole::getId,Member::getRoleId);
+ *//* .leftJoin(MemberCard.class,MemberCard::getMemberId,Member::getId);*//*
queryWrapper.selectAll(Member.class)
.selectAs(Company::getName,MemberInfoDTO::getCompanyName)
.selectAs(DeviceRole::getName,MemberInfoDTO::getRoleName)
- .select("count(t3.id) as memberCardCount ");
+ *//* .select("count(t3.id) as memberCardCount ");*//*
+ .select("");
queryWrapper.in(Objects.nonNull(model.getCompanyIds()),Member::getCompanyId,model.getCompanyIds())
- .like(number,Member::getPhone,model.getKeyWords())
- .like((b||hasWord),Member::getPhone,model.getKeyWords())
+ *//* .like(number,Member::getPhone,model.getKeyWords())
+ .like((b||hasWord),Member::getPhone,model.getKeyWords())*//*
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),ms->ms.like(Member::getPhone,model.getKeyWords())
+ .or().like(Member::getName,model.getKeyWords())
+ .or().like(Member::getCode,model.getKeyWords()))
+
.isNull(Constants.equalsInteger(model.getHasFace(),Constants.ZERO),Member::getFaceId)
.isNotNull(Constants.equalsInteger(model.getHasFace(),Constants.ONE),Member::getFaceId)
.eq(Objects.nonNull(model.getCanVisit()),Member::getCanVisit,model.getCanVisit())
@@ -418,9 +581,194 @@
IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
- }
+ }*/
+ IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+
+ queryWrapper.selectAll(Member.class);
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
+ Member::getCompanyId,pageWrap.getModel().getCompanyIds())
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),ms->ms.like(Member::getPhone,pageWrap.getModel().getKeyWords())
+ .or().like(Member::getName,pageWrap.getModel().getKeyWords())
+ .or().like(Member::getCode,pageWrap.getModel().getKeyWords()))
+ .isNull(Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ZERO),Member::getFaceId)
+ .isNotNull(Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ONE),Member::getFaceId)
+ .eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),Member::getCanVisit,pageWrap.getModel().getCanVisit())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getCanVisit,pageWrap.getModel().getStatus())
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
+ .eq(Member::getType,Constants.memberType.internal)
+ .orderByDesc(Member::getCreateDate);
+
+ IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
return PageData.from(memberIPage);
}
+
+
+ @Override
+ public PageData<MemberInfoDTO> 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)
+ .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0) as visitsCount")
+ .select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE limit 1) as visitsLastDate");
+
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
+ .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
+ .eq(Member::getType,Constants.memberType.visitor)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .orderByDesc(Member::getCreateDate);
+
+
+ IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ return PageData.from(memberIPage);
+
+ }
+
+
+ @Override
+ public PageData<MemberInfoDTO> findUnusualPage(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)
+ .select(" (select ua.CREATE_DATE from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0 and ua.type=1 order by ua.CREATE_DATE limit 1) as userActionType1")
+ .select(" (select uac.remark from user_action uac where uac.MEMBER_ID=t.id and uac.ISDELETED=0 and uac.type=1 order by uac.CREATE_DATE limit 1) as creatorName")
+ /* .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0) as visitsCount")*/
+ .select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE limit 1) as visitsLastDate");
+
+ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCreaterId()),Member::getEditor,pageWrap.getModel().getCreaterId());
+ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Member::getType,pageWrap.getModel().getType());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),ms->ms.like(Member::getPhone,pageWrap.getModel().getName())
+ .or().like(Member::getName,pageWrap.getModel().getName()))
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
+ .eq(Member::getStatus,Constants.Status.FREEZE.getValue())
+ .eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
+ .orderByDesc(Member::getCreateDate);
+
+
+ IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ return PageData.from(memberIPage);
+
+ }
+
+
+ /**
+ * 鐢ㄦ埛瑙ｅ喕 娣诲姞鎺堟潈瀵煎叆璁板綍
+ * @param member
+ */
+ public void thawMember(Member member){
+ //鐢ㄦ埛瑙掕壊缁�
+ List<MemberRole> memberRoleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
+ if(CollectionUtils.isNotEmpty(memberRoleList)){
+ List<Integer> roleIds = memberRoleList.stream().map(m->m.getId()).collect(Collectors.toList());
+ //瑙掕壊缁勮澶囨潈闄�
+ List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
+ .eq(DeviceRole::getType,Constants.TWO)
+ .in(DeviceRole::getId,roleIds));
+
+ if(CollectionUtils.isNotEmpty(deviceRoleList)){
+ String ids = "";
+ 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){
+ //鑴忔暟鎹笉澶勭悊
+ }
+ }
+ }
+
+ if(CollectionUtils.isNotEmpty(r)){
+ List<Empower> list = new ArrayList<>();
+ List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,r));
+ if(deviceList == null || deviceList.size() == 0){
+ return;
+ }
+ for (Device deviceRole:deviceList) {
+ Empower model = new Empower();
+ model.setCreateDate(new Date());
+ model.setMemberId(member.getId());
+ model.setIsdeleted(Constants.ZERO);
+ model.setDeviceId(deviceRole.getId());
+ model.setSendStatus(Constants.ZERO);
+ model.setSendType(Constants.ZERO);
+ list.add(model);
+ }
+ //瀵煎叆鏂板鐨勬巿鏉冧俊鎭�
+ empowerMapper.insertBatchSomeColumn(list);
+ }
+ }
+ }
+ }
+
+
+
+ /**
+ * 瀹氭椂鍐荤粨鍐呴儴浜哄憳
+ */
+ @Override
+ public void memberFreeze(){
+ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_FREEZE);
+ if(Objects.isNull(systemDictData)||
+ StringUtils.isBlank(systemDictData.getCode())
+ ){
+ return;
+ }
+ 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()+" ")
+ );
+ if(CollectionUtils.isEmpty(memberList)){
+ return;
+ }
+ List<Integer> memberIds = memberList.stream().map(m->m.getId()).collect(Collectors.toList());
+
+ //鍐荤粨鐘舵��
+ 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)
+ );
+ }
+
+
+
+
+
+
+
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
@@ -464,7 +812,11 @@
.last(" limit 1 ")
);
MemberVO memberVO = new MemberVO();
- BeanUtils.copyProperties(member,memberVO);
+ if(!Objects.isNull(member)){
+ BeanUtils.copyProperties(member,memberVO);
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
return memberVO;
}
--
Gitblit v1.9.3