From d7e663d304a2ccb565a24362b116ddaa9da9941a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 09 一月 2024 13:56:43 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 126 +++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 38 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
index 3463258..a90c2bf 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -3,17 +3,20 @@
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
+import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.VisitEventQuery;
+import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.admin.response.VisitEventDTO;
import com.doumee.dao.business.VisitEventMapper;
import com.doumee.dao.business.join.VisitEventJoinMapper;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.DeviceEvent;
-import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.VisitEvent;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.SystemDictDataMapper;
+import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.system.vo.VisitEventVo;
import com.doumee.service.business.VisitEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -25,8 +28,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 璁垮浜嬩欢鎺ㄩ�佽褰曡〃Service瀹炵幇
@@ -41,6 +45,9 @@
@Autowired
private VisitEventJoinMapper visitEventJoinMapper;
+
+ @Autowired
+ private SystemDictDataMapper systemDictDataMapper;
@Override
public Integer create(VisitEvent visitEvent) {
@@ -228,8 +235,41 @@
}
@Override
- public PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEventQuery> pageWrap) {
+ public PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEvent> pageWrap) {
+ IPage<VisitEventDTO> visitEventDTOIPage = getDataInfo(pageWrap);
+ if(null != visitEventDTOIPage && visitEventDTOIPage.getRecords().size() > 0) {
+ visitEventDTOIPage.setRecords(newVisitEvent(visitEventDTOIPage.getRecords()));
+ }
+ return PageData.from(visitEventDTOIPage);
+ }
+
+ @Override
+ public List<VisitEventVo> findPageExcel(PageWrap<VisitEvent> pageWrap) {
+ IPage<VisitEventDTO> visitEventExcel = getDataInfo(pageWrap);
+ List<VisitEventVo> voList = new ArrayList<>();
+ if(null != visitEventExcel && visitEventExcel.getRecords().size() > 0) {
+ visitEventExcel.getRecords().stream().forEach(obj->{
+ VisitEventVo eventVo = new VisitEventVo();
+ eventVo.setPersonName(obj.getPersonName());
+ eventVo.setPersonPhone(obj.getPersonPhone());
+ eventVo.setIdNo(obj.getIdNo());
+ eventVo.setPersonCompanyName(obj.getPersonCompanyName());
+ eventVo.setCarNo(obj.getCarNo());
+ eventVo.setBeVisitedPersonName(obj.getBeVisitedPersonName()+"-"+obj.getBeVisitedPersonOrg());
+ if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_IN.getKey()){
+ eventVo.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_IN.getName());
+ }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()){
+ eventVo.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_OUT.getName());
+ }
+ eventVo.setHappenTime(obj.getHappenTime());
+ voList.add(eventVo);
+ });
+ }
+ return voList;
+ }
+
+ private IPage<VisitEventDTO> getDataInfo(PageWrap<VisitEvent> pageWrap) {
//鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
@@ -239,42 +279,52 @@
IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper.leftJoin(Member.class,Member::getId,VisitEvent::getVisitorId)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper .leftJoin(Visits.class,Visits::getHkId,VisitEvent::getVisitorId);
queryWrapper.selectAll(VisitEvent.class)
- .selectAs(Member::getPhone,VisitEventDTO::getPersonPhone)
- .selectAs(Member::getType,VisitEventDTO::getPersonType)
- .selectAs(Member::getIdcardDecode,VisitEventDTO::getPersonIdcardDecode)
- .selectAs(Company::getName,VisitEventDTO::getPersonCompanyName);
-
+ .selectAs(Visits::getCompanyName,VisitEventDTO::getPersonCompanyName);
queryWrapper.like(number,
- Member::getPhone,
- pageWrap.getModel().getKeyWords())
- .like((b ||hasWord),
- Member::getPhone,
- pageWrap.getModel().getKeyWords())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
- Member::getPhone,
- pageWrap.getModel().getKeyWords())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
- Company::getName,
- pageWrap.getModel().getCompanyName())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getSrcType()),
- VisitEvent::getSrcType,
- pageWrap.getModel().getSrcType())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getEventType()),
- VisitEvent::getEventType,
- pageWrap.getModel().getEventType())
- .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
- VisitEvent::getHappenTime,
- Utils.Date.getStart(pageWrap.getModel().getStartTime()))
- .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
- VisitEvent::getHappenTime,
- Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
+ VisitEvent::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like((b ||hasWord),
+ VisitEvent::getPersonName,
+ pageWrap.getModel().getKeyWords())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
+ VisitEvent::getCarNo,
+ pageWrap.getModel().getKeyWords())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ Company::getName,
+ pageWrap.getModel().getCompanyName())
+ .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
+ VisitEvent::getEventType,
+ pageWrap.getModel().getEventType())
+ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ VisitEvent::getHappenTime,
+ pageWrap.getModel().getStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ VisitEvent::getHappenTime,
+ pageWrap.getModel().getEndTime());
queryWrapper.orderByDesc(VisitEvent::getHappenTime);
IPage<VisitEventDTO> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEventDTO.class, queryWrapper);
- return PageData.from(visitEventDTOIPage);
+ return visitEventDTOIPage;
}
+ private List<VisitEventDTO> newVisitEvent(List<VisitEventDTO> VisitEventDTOList) {
+ List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.MEMBER_IMG);
+ List<SystemDictData> list = systemDictDataMapper.list(codes);
+ Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
+ List<VisitEventDTO> newDataList = new ArrayList<>();
+ VisitEventDTOList.stream().forEach(obj->{
+ obj.setCaptureUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.MEMBER_IMG).getCode()
+ +obj.getCaptureUrl());
+ if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_IN.getKey()){
+ obj.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_IN.getName());
+ }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()){
+ obj.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_OUT.getName());
+ }
+ newDataList.add(obj);
+ });
+ return newDataList;
+ }
}
--
Gitblit v1.9.3