From ad6dfb8323ab40ca8fe4fed94722c755d89c3203 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 15:14:47 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 346 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 273 insertions(+), 73 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 8d0b612..7f39337 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
@@ -2,37 +2,39 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.PatternPool;
-import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
-import cn.hutool.core.util.ReUtil;
import com.alibaba.fastjson.JSONObject;
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;
-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;
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.wx.WXConstant;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
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.admin.response.StagingDataVO;
import com.doumee.dao.business.*;
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.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;
@@ -43,11 +45,10 @@
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.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -87,6 +88,21 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private UserActionJoinMapper userActionJoinMapper;
+
+ @Autowired
+ private CompanyMapper companyMapper;
+
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+ @Autowired
+ private DataSyncConfig dataSyncConfig;
+
+ @Autowired
+ private RetentionJoinMapper retentionJoinMapper;
+
+ @Autowired
+ private VisitsMapper visitsMapper;
+
@Override
public Integer create(Member member) {
@@ -187,7 +203,7 @@
}
@Override
- public void batchBlock(List<Integer> ids) {
+ public void batchBlock(List<Integer> ids,Integer type) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
@@ -196,10 +212,28 @@
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.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
memberMapper.updateById(member);
+
+ userAction.setIsdeleted(Constants.ZERO);
+ userAction.setCreateDate(new Date());
+ userAction.setCreator(loginUserInfo.getId());
+ if(Constants.equalsInteger(type,Constants.ONE)){
+ userAction.setType(Constants.ONE);
+ userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
+ }
+ if(Constants.equalsInteger(type,Constants.TWO)){
+ userAction.setType(Constants.TWO);
+ userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愭媺榛戙��");
+
+ }
+ userAction.setMemberId(id+"");
+
+ userActionJoinMapper.insert(userAction);
}
}
/* memberMapper.deleteBatchIds(ids);*/
@@ -242,11 +276,11 @@
userAction.setCreator(loginUserInfo.getId());
if(Constants.equalsInteger(result.getType(),Constants.TWO)){
userAction.setType(Constants.ONE);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+new Date()+"銆戯紝杩涜銆愬喕缁撱��");
+ 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()+"銆戜簬銆愭搷浣滄椂闂�"+new Date()+"銆戯紝杩涜銆愭媺榛戙��");
+ userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愭媺榛戙��");
}
userAction.setMemberId(result.getId()+"");
@@ -326,6 +360,10 @@
@Override
public List<Member> findList(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
+ if(null != member.getType()) {
+ wrapper.lambda().eq(Member::getType,member.getType());
+ }
+ wrapper.lambda().eq(Member::getIsdeleted,Constants.ZERO);
return memberMapper.selectList(wrapper);
}
@@ -539,72 +577,87 @@
} catch (Exception e) {
}
-//
}
@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());*/
-
- /* 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);*//*
-
- queryWrapper.selectAll(Member.class)
- .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
- .selectAs(DeviceRole::getName,MemberInfoDTO::getRoleName)
- *//* .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())*//*
- .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())
- .eq(Objects.nonNull(model.getStatus()),Member::getStatus,model.getStatus());
- 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.selectAs(Company::getName,Member::getCompanyName);
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)
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyword()),ms->ms
+ .like(Member::getPhone,pageWrap.getModel().getKeyword())
+ .or().like(Member::getName,pageWrap.getModel().getKeyword())
+ .or().like(Member::getCode,pageWrap.getModel().getKeyword()))
+ .isNull(!Objects.isNull(pageWrap.getModel().getHasFace())&&Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ZERO),Member::getFaceId)
+ .isNotNull(!Objects.isNull(pageWrap.getModel().getHasFace())&&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(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
.eq(Member::getIsdeleted,Constants.ZERO)
- .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
+// .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
.eq(Member::getType,Constants.memberType.internal)
.orderByDesc(Member::getCreateDate);
-
+ 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());
+ }
IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+
+ if(CollectionUtils.isNotEmpty(memberIPage.getRecords())){
+ //FTP鏂囦欢璁块棶鍓嶇紑
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ //闂ㄧ缁勪俊鎭�
+ List<DeviceRole> deviceRoleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
+ .select(DeviceRole::getId,DeviceRole::getName)
+ .eq(DeviceRole::getIsdeleted,Constants.ZERO));
+ for (MemberInfoDTO memberInfoDTO:memberIPage.getRecords()) {
+ //鑾峰緱闂ㄧ缁勫悕绉版暟缁�
+ memberInfoDTO.setRoleNames(this.dealRoleDatas(memberInfoDTO.getRoleId(),deviceRoleList));
+ //鎷兼帴鍓嶇紑
+ if(StringUtils.isNotBlank(memberInfoDTO.getFaceImg())){
+ memberInfoDTO.setFaceImg(prefixUrl + memberInfoDTO.getFaceImg());
+ }
+ if(StringUtils.isNotBlank(memberInfoDTO.getImgurl())){
+ memberInfoDTO.setImgurl(prefixUrl + memberInfoDTO.getImgurl());
+ }
+ }
+ }
return PageData.from(memberIPage);
}
+
+ public List<String> dealRoleDatas(String roleIds,List<DeviceRole> deviceRoleList){
+ List<String> stringList = new ArrayList<>();
+ if(StringUtils.isNotBlank(roleIds)){
+ roleIds = roleIds.replace("[","").replace("]","");
+ List<String> ids = Arrays.asList(roleIds.split(","));
+ ids.forEach(i->{
+// DeviceRole deviceRole = deviceRoleList.stream().filter(m->m.getId().toString().equals(i)).findFirst().get();
+ DeviceRole deviceRole = findRoleById(deviceRoleList,i);
+ if(!Objects.isNull(deviceRole)){
+ stringList.add(deviceRole.getName());
+ }
+ });
+ }
+ return stringList;
+ }
+
+ private DeviceRole findRoleById(List<DeviceRole> deviceRoleList, String id) {
+ for(DeviceRole role : deviceRoleList){
+ if(StringUtils.equals(role.getId().toString(),id)){
+ return role;
+ }
+ }
+ return null;
+ }
@Override
public PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap) {
@@ -613,19 +666,23 @@
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");
-
+ .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");
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())
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ms->ms.like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName())
+ .or().like(Company::getName,pageWrap.getModel().getCompanyName()))
.like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
- .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
+ .eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
.eq(Member::getType,Constants.memberType.visitor)
.eq(Member::getIsdeleted,Constants.ZERO)
.orderByDesc(Member::getCreateDate);
-
-
+ 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());
+ }
IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
return PageData.from(memberIPage);
@@ -639,19 +696,21 @@
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");
+ .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");
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())
+ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Member::getType,pageWrap.getModel().getType());
+ queryWrapper
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getName()),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())
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ ms->ms.like(Company::getName,pageWrap.getModel().getCompanyName())
+ .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(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
.orderByDesc(Member::getCreateDate);
@@ -773,7 +832,6 @@
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
-
/**
* 寰俊鎺堟潈鎺ュ彛
* @param code
@@ -792,8 +850,30 @@
}
WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
wxAuthorizeVO.setOpenid(openId);
+ //鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+ .eq(Member::getOpenid,openId)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .ne(Member::getType,Constants.memberType.visitor)
+ );
+ //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+ if(!Objects.isNull(member)&&!member.getType().equals(Constants.memberType.visitor)){
+ if(member.getIsdeleted() == Constants.ONE){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(member.getStatus() != Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ }
+ 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
@@ -806,13 +886,16 @@
.eq(Member::getPhone,checkVisitedDTO.getMobile())
.eq(validType.equals(Constants.ONE),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 ")
);
MemberVO memberVO = new MemberVO();
if(!Objects.isNull(member)){
+ if(!member.getStatus().equals(Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"琚浜鸿处鍙峰紓甯革紝璇风‘璁ゅ悗鍐嶈瘯");
+ }
BeanUtils.copyProperties(member,memberVO);
}else{
throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -823,10 +906,127 @@
+ @Override
+ public PageData<MemberVO> getVisitedMemberList(PageWrap<VisitMemberDTO> param) {
+ VisitMemberDTO visitMemberDTO = param.getModel();
+ IPage<Member> page = new Page<>(param.getPage(), param.getCapacity());
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(visitMemberDTO);
+
+ queryWrapper.selectAs(Member::getId,MemberVO::getId);
+ queryWrapper.selectAs(Member::getName,MemberVO::getName);
+ queryWrapper.selectAs(Member::getPhone,MemberVO::getPhone);
+ queryWrapper.selectAs(Member::getCompanyId,MemberVO::getCompanyId);
+ queryWrapper.selectAs(Member::getFaceImg,MemberVO::getFaceImg);
+
+ queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
+ queryWrapper.eq(Member::getStatus,Constants.ZERO);
+ queryWrapper.eq(Member::getCanVisit,Constants.ONE);
+ queryWrapper.eq(Member::getType,Constants.memberType.internal);
+ if(!Objects.isNull(visitMemberDTO)){
+ queryWrapper.and(StringUtils.isNotBlank(visitMemberDTO.getName()), ms->ms.like(Member::getPhone,visitMemberDTO.getName())
+ .or().like(Member::getPhone,visitMemberDTO.getName()));
+ }
+ queryWrapper.orderByDesc(Visits::getCreateDate);
+ IPage<MemberVO> result = memberJoinMapper.selectJoinPage(page, MemberVO.class,queryWrapper);
+
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ result.getRecords().forEach(i->{
+ i.setPrefixUrl(prefixUrl);
+ });
+
+ return PageData.from(result);
+ }
+ @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
+ public StagingDataVO stagingHead(StagingDataVO stagingHeadVO){
+ //浜哄憳淇℃伅
+ 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.setVisitorCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.visitor)).count());
+ }
+ //鍦ㄥ満杞﹁締
+ stagingHeadVO.setPresenceCarCount(retentionJoinMapper.selectCount(new QueryWrapper<Retention>().lambda().eq(Retention::getType,3)));
+ //闀挎湡杞﹁締
+ stagingHeadVO.setLongCarCount(retentionJoinMapper.selectCount(new QueryWrapper<Retention>().lambda().eq(Retention::getType,3)
+ .exists(" select 1 from park_book p where p.origin = 0 and p.car_code = retention.car_no and p.ISDELETED = 0 ")
+ ));
+ stagingHeadVO.setVisitorCarCount(stagingHeadVO.getPresenceCarCount() - stagingHeadVO.getLongCarCount());
+ stagingHeadVO.setSupplierCount(companyMapper.selectCount(new QueryWrapper<Company>().lambda().eq(Company::getIsdeleted,Constants.ZERO)));
+ return stagingHeadVO;
+ }
+
+
+ @Override
+ public StagingDataVO stagingBody(StagingDataVO stagingHeadVO){
+ List<Map<String,Object>> companyMaps = memberJoinMapper.selectJoinMaps(
+ 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)
+ .groupBy(Company::getId,Company::getName)
+ );
+ List<Map<String,Object>> retentionMaps = retentionJoinMapper.selectMaps(new MPJLambdaWrapper<Retention>()
+ .select(" count(1) as memberCount, type as memberType ")
+ .ne(Retention::getType,3)
+ .groupBy(Retention::getType)
+ );
+ stagingHeadVO.setCompanyUsers(companyMaps);
+ stagingHeadVO.setRetentionUsers(retentionMaps);
+ return stagingHeadVO;
+ }
--
Gitblit v1.9.3