From 1293d3dba10c4e291dfbce4c936f952875557edb Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 18:40:49 +0800
Subject: [PATCH] 配置信息对接调整提交
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 252 insertions(+), 30 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 dae492d..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,11 +26,11 @@
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;
@@ -42,14 +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瀹炵幇
@@ -68,6 +71,17 @@
@Autowired
private TrainTimeMapper trainTimeMapper;
+ @Autowired
+ private MemberRoleMapper memberRoleMapper;
+
+ @Autowired
+ private DeviceRoleMapper deviceRoleMapper;
+
+ @Autowired
+ private EmpowerMapper empowerMapper;
+
+ @Autowired
+ private DeviceMapper deviceMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -164,13 +178,35 @@
Member member=new Member();
ids.stream().forEach(s ->{
member.setId(s);
- member.setIsdeleted(Constants.ZERO);
+ 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) {
@@ -196,7 +232,7 @@
Member update = new Member();
update.setEditDate(new Date());
update.setEditor(loginUserInfo.getId());
- update.setStatus(member.getStatus());
+ update.setStatus(Constants.Status.FREEZE.getValue());
update.setId(member.getId());
memberMapper.updateById(update);
@@ -204,11 +240,55 @@
userAction.setIsdeleted(Constants.ZERO);
userAction.setCreateDate(new Date());
userAction.setCreator(loginUserInfo.getId());
- userAction.setType(Constants.TWO);
+ 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);
+ });
+ }
+
@@ -255,6 +335,24 @@
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());
}
@@ -422,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);
}
@@ -483,27 +582,32 @@
if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
}*/
- IPage<MemberInfoDTO> memberIPage = memberMapper.getPage(pageWrap.toPage(),new QueryWrapper<MemberInfoDTO>()
- .in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,"m.COMPANY_ID",pageWrap.getModel().getCompanyIds())
- .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),ms->ms.like("m.ohone",pageWrap.getModel().getKeyWords())
- .or().like("m.name",pageWrap.getModel().getKeyWords())
- .or().like("m.code",pageWrap.getModel().getKeyWords()))
- .isNull(Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ZERO),"m.FACE_ID")
- .isNotNull(Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ONE),"m.FACE_ID")
- .eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),"m.CAN_VISIT",pageWrap.getModel().getCanVisit())
- .eq(Objects.nonNull(pageWrap.getModel().getStatus()),"m.CAN_VISIT",pageWrap.getModel().getStatus())
- .eq("m.ISDELETED",0)
- .orderByDesc("m.CREATE_DATE")
- );
+ 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);
@@ -516,7 +620,9 @@
.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.FREEZE)
+ .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
+ .eq(Member::getType,Constants.memberType.visitor)
+ .eq(Member::getIsdeleted,Constants.ZERO)
.orderByDesc(Member::getCreateDate);
@@ -528,22 +634,25 @@
@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 count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0) as visitsCount")
+ .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())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
+ .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.ENABLE)
+ .eq(Member::getStatus,Constants.Status.FREEZE.getValue())
+ .eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
.orderByDesc(Member::getCreateDate);
@@ -551,6 +660,115 @@
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)
+ );
+ }
+
+
+
+
+
+
+
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
@@ -594,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