From e2f8fb1fbe26ba6d92f3e5dfcaeb0c69abe76b25 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十二月 2023 14:28:57 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 76 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 12 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 359e435..983da41 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
@@ -29,6 +29,9 @@
import com.doumee.dao.business.TrainTimeMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
+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;
@@ -39,6 +42,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -164,6 +168,17 @@
memberMapper.updateById(update);
}
+
+ @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);
+ }
+
@Override
public void updateByIdInBatch(List<Member> members) {
if (CollectionUtils.isEmpty(members)) {
@@ -193,6 +208,7 @@
@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());
@@ -337,7 +353,7 @@
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
MemberInfoDTO model = pageWrap.getModel();
Utils.MP.blankToNull(model);
- Date end = Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime());
+ 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);
@@ -352,7 +368,7 @@
.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())));
@@ -386,31 +402,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,7 +438,20 @@
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<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")
+ );
+
return PageData.from(memberIPage);
}
@@ -448,6 +481,25 @@
}
+ @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())
+ .eq(Member::getIsdeleted,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();
+ BeanUtils.copyProperties(member,memberVO);
+ return memberVO;
+ }
--
Gitblit v1.9.3