From 6c40e04eb7c2060feb2533735cd3089d438965e5 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 19 三月 2024 17:19:36 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 114 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 74 insertions(+), 40 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..a004435 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,22 @@
}
@Override
- public PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEventQuery> pageWrap) {
+ public PageData<VisitEvent> findVisitPage(PageWrap<VisitEvent> pageWrap) {
+ IPage<VisitEvent> visitEventDTOIPage = getDataInfo(pageWrap);
+ if(null != visitEventDTOIPage && visitEventDTOIPage.getRecords().size() > 0) {
+ visitEventDTOIPage.setRecords(newVisitEvent(visitEventDTOIPage.getRecords()));
+ }
+ return PageData.from(visitEventDTOIPage);
+ }
+
+ @Override
+ public List<VisitEvent> findPageExcel(PageWrap<VisitEvent> pageWrap) {
+ IPage<VisitEvent> visitEventExcel = getDataInfo(pageWrap);
+ return newVisitEvent(visitEventExcel.getRecords());
+ }
+
+ private IPage<VisitEvent> getDataInfo(PageWrap<VisitEvent> pageWrap) {
//鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
@@ -239,42 +260,55 @@
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.selectAll(VisitEvent.class)
- .selectAs(Member::getPhone,VisitEventDTO::getPersonPhone)
- .selectAs(Member::getType,VisitEventDTO::getPersonType)
- .selectAs(Member::getIdcardDecode,VisitEventDTO::getPersonIdcardDecode)
- .selectAs(Company::getName,VisitEventDTO::getPersonCompanyName);
-
+ queryWrapper.selectAll(VisitEvent.class);
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().getCarNo())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getVisitorWorkUint()),
+ VisitEvent::getVisitorWorkUint,
+ pageWrap.getModel().getVisitorWorkUint())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ Company::getName,
+ pageWrap.getModel().getCompanyName())
+ .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
+ VisitEvent::getEventType,
+ pageWrap.getModel().getEventType())
+ .ge(StringUtils.isNotBlank(pageWrap.getModel().getStartTime()),
+ VisitEvent::getCreateDate,
+ pageWrap.getModel().getStartTime())
+ .le(StringUtils.isNotBlank(pageWrap.getModel().getEndTime()),
+ VisitEvent::getCreateDate,
+ pageWrap.getModel().getEndTime())
+ .eq(VisitEvent::getIsdeleted,Constants.ZERO);
queryWrapper.orderByDesc(VisitEvent::getHappenTime);
- IPage<VisitEventDTO> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEventDTO.class, queryWrapper);
- return PageData.from(visitEventDTOIPage);
+ IPage<VisitEvent> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEvent.class, queryWrapper);
+ return visitEventDTOIPage;
}
+ private List<VisitEvent> newVisitEvent(List<VisitEvent> 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()));
+ VisitEventDTOList.stream().forEach(obj->{
+
+ if(StringUtils.isNotBlank( obj.getCaptureUrl())
+ && !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX)
+ && !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX_ERROR)) {
+ if(null != list && list.size() > 0) {
+ obj.setCaptureUrlFull(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.VISIT_EVENT_IMG).getCode()
+ +obj.getCaptureUrl());
+ }
+ }
+ obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())); ;
+ });
+ return VisitEventDTOList;
+ }
}
--
Gitblit v1.9.3