From be0e4466c64ab2def5d2f34fd9394927250153ab Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 18:18:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
index 04dd51b..a136eea 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -1,20 +1,32 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.PhoneUtil;
+import cn.hutool.core.util.ReUtil;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.request.DeviceEventQuery;
+import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.business.DeviceEventMapper;
+import com.doumee.dao.business.join.DeviceEventJoinMapper;
+import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.DeviceEvent;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.DeviceEventService;
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.Objects;
/**
* 闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃Service瀹炵幇
@@ -26,6 +38,10 @@
@Autowired
private DeviceEventMapper deviceEventMapper;
+
+
+ @Autowired
+ private DeviceEventJoinMapper deviceEventJoinMapper;
@Override
public Integer create(DeviceEvent deviceEvent) {
@@ -83,7 +99,7 @@
QueryWrapper<DeviceEvent> wrapper = new QueryWrapper<>(deviceEvent);
return deviceEventMapper.selectList(wrapper);
}
-
+
@Override
public PageData<DeviceEvent> findPage(PageWrap<DeviceEvent> pageWrap) {
IPage<DeviceEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -268,4 +284,47 @@
QueryWrapper<DeviceEvent> wrapper = new QueryWrapper<>(deviceEvent);
return deviceEventMapper.selectCount(wrapper);
}
+
+ @Override
+ public PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEventQuery> pageWrap) {
+
+ IPage<DeviceEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<DeviceEvent> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+
+ //鏄惁鏄暟瀛�
+ boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈涓枃
+ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈鑻辨枃
+ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+ queryWrapper.leftJoin(Member.class,Member::getId,DeviceEvent::getExtEventPersonNo)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .selectAll(DeviceEvent.class)
+ .selectAs(Member::getName,DeviceEventDTO::getPersonName)
+ .selectAs(Member::getPhone,DeviceEventDTO::getPersonPhone)
+ .selectAs(Member::getIdcardDecode,DeviceEventDTO::getPersonIdcardDecode)
+ .selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName);
+ queryWrapper.like(number,
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like((b||hasWord),
+ Member::getName,
+ pageWrap.getModel().getKeyWords())
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()),
+ Member::getType,
+ pageWrap.getModel().getPersonType())
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getEventType()),
+ DeviceEvent::getEventType,
+ pageWrap.getModel().getEventType())
+ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ DeviceEvent::getCreateDate,
+ Utils.Date.getStart(pageWrap.getModel().getStartTime()))
+ .le(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ DeviceEvent::getCreateDate,
+ Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
+
+ IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper);
+ return PageData.from(deviceEventDTOIPage);
+ }
}
--
Gitblit v1.9.3