From 70577a6d6cf2bded29e71dcad11a0c2605193d20 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 10:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 102 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 99 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
index 5121dd3..f5e4fb8 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -1,20 +1,36 @@
package com.doumee.service.business.impl;
+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.CarEventDTO;
+import com.doumee.dao.admin.response.DeviceEventDTO;
+import com.doumee.dao.admin.response.VisitEventDTO;
import com.doumee.dao.business.CarEventMapper;
-import com.doumee.dao.business.model.CarEvent;
+import com.doumee.dao.business.join.CarEventJoinMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.SystemDictDataMapper;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.CarEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃Service瀹炵幇
@@ -26,6 +42,12 @@
@Autowired
private CarEventMapper carEventMapper;
+
+ @Autowired
+ private CarEventJoinMapper carEventJoinMapper;
+
+ @Autowired
+ private SystemDictDataMapper systemDictDataMapper;
@Override
public Integer create(CarEvent carEvent) {
@@ -83,7 +105,7 @@
QueryWrapper<CarEvent> wrapper = new QueryWrapper<>(carEvent);
return carEventMapper.selectList(wrapper);
}
-
+
@Override
public PageData<CarEvent> findPage(PageWrap<CarEvent> pageWrap) {
IPage<CarEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -250,4 +272,78 @@
QueryWrapper<CarEvent> wrapper = new QueryWrapper<>(carEvent);
return carEventMapper.selectCount(wrapper);
}
+
+ @Override
+ public PageData<CarEventDTO> findVisitCarPage(PageWrap<CarEvent> 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<CarEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+
+ queryWrapper.leftJoin(Cars.class,Cars::getCode,CarEvent::getPlateNos)
+ .leftJoin(Member.class,Member::getId,Cars::getMemberId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.selectAll(CarEvent.class)
+ .selectAs(Member::getType,CarEventDTO::getPersonType)
+ .selectAs(Member::getPhone,CarEventDTO::getPersonPhone)
+ .selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
+ .selectAs(Member::getName,CarEventDTO::getPersonName)
+ .selectAs(Company::getName,CarEventDTO::getPersonCompanyName);
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),
+ CarEvent::getPlateNos,
+ pageWrap.getModel().getPlateNos())
+ .like(number,
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like((b || hasWord),
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ Company::getName,
+ pageWrap.getModel().getCompanyName())
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()),
+ Member::getType,
+ pageWrap.getModel().getMemberType())
+ .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
+ CarEvent::getEventType,
+ pageWrap.getModel().getEventType())
+ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ CarEvent::getCreateDate, pageWrap.getModel().getStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ CarEvent::getCreateDate, pageWrap.getModel().getEndTime());
+ IPage<CarEventDTO> carEventDTOIPage = carEventJoinMapper.selectJoinPage(page, CarEventDTO.class, queryWrapper);
+ if(null != carEventDTOIPage && carEventDTOIPage.getRecords().size() > 0) {
+ carEventDTOIPage.setRecords(newCarEventDTO(carEventDTOIPage.getRecords()));
+ }
+ return PageData.from(carEventDTOIPage);
+ }
+
+ private List<CarEventDTO> newCarEventDTO(List<CarEventDTO> newCarEventDTOList) {
+ List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.CAR_EVENT_IMG);
+ List<SystemDictData> list = systemDictDataMapper.list(codes);
+ Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
+ List<CarEventDTO> newDataList = new ArrayList<>();
+ newCarEventDTOList.stream().forEach(obj->{
+ obj.setVehiclePicUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.CAR_EVENT_IMG).getCode()
+ +obj.getVehiclePicUrl());
+ if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_IN.getKey()){
+ obj.setEventTypeName(HKConstants.EventTypes.PARK_LINE_IN.getName());
+ }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
+ obj.setEventTypeName(HKConstants.EventTypes.PARK_PASS_IN.getName());
+ }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_OUT.getKey()){
+ obj.setEventTypeName(HKConstants.EventTypes.PARK_LINE_OUT.getName());
+ }else{
+ obj.setEventTypeName(HKConstants.EventTypes.PARK_PASS_OUT.getName());
+ }
+ newDataList.add(obj);
+ });
+ return newDataList;
+ }
}
--
Gitblit v1.9.3