From 90b01d2e4a92504b8cbedfaa5d7202991094cb5d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 06 十二月 2023 16:37:58 +0800
Subject: [PATCH] #门禁事件查询
---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java | 194 ++++++++++++++++++++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 1
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java | 35 +++++
server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java | 14 ++
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceEventJoinMapper.java | 12 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 61 ++++++++++
6 files changed, 314 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java
new file mode 100644
index 0000000..46d1ac2
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java
@@ -0,0 +1,35 @@
+package com.doumee.dao.admin.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("璁惧浜嬩欢鏌ヨ")
+public class DeviceEventQuery {
+
+ @ApiModelProperty(value = "鍏抽敭瀛�")
+ private String keyWords;
+
+ @ApiModelProperty(value = "鍏徃鍚嶇О")
+ private String companyName;
+
+ @ApiModelProperty(value = "浜哄憳绫诲瀷")
+ private String personType;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷")
+ private String eventType;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ private Date endTime;
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
new file mode 100644
index 0000000..262cccf
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
@@ -0,0 +1,194 @@
+package com.doumee.dao.admin.response;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃")
+public class DeviceEventDTO {
+
+
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
+ private Integer creator;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createDate;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
+ private Integer editor;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date editDate;
+
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
+ private Integer isdeleted;
+
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
+ private String eventId;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷")
+ private String eventType;
+
+ @ApiModelProperty(value = "浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
+ private String srcType;
+
+ @ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ private String happenTime;
+
+ @ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
+ private String srcIndex;
+
+ @ApiModelProperty(value = "闂ㄧ鍚嶇О")
+ @ExcelColumn(name="闂ㄧ鍚嶇О")
+ private String srcName;
+
+ @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
+ private Integer status;
+
+ @ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿锛屽崟浣嶏細绉掞紝鐬椂浜嬩欢姝ゅ瓧娈靛～0")
+ private Integer timeout;
+
+ @ApiModelProperty(value = "浜哄憳閫氶亾鍙�")
+ private Integer extAccessChannel;
+
+ @ApiModelProperty(value = "鎶ヨ杈撳叆/闃插尯閫氶亾")
+ private Integer extEventAlarmInID;
+
+ @ApiModelProperty(value = "鎶ヨ杈撳嚭閫氶亾")
+ private Integer extEventAlarmOutID;
+
+ @ApiModelProperty(value = "鍗″彿")
+ private String extEventCardNo;
+
+ @ApiModelProperty(value = "浜嬩欢杈撳叆閫氶亾")
+ private Integer extEventCaseID;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷浠ｇ爜")
+ private Integer extEventCode;
+
+ @ApiModelProperty(value = "闂ㄧ紪鍙�")
+ private Integer extEventDoorID;
+
+ @ApiModelProperty(value = "韬唤璇佸浘鐗嘦RL")
+ @ExcelColumn(name="韬唤璇佸浘鐗嘦RL")
+ private String extEventIDCardPictureURL;
+
+ @ApiModelProperty(value = "杩涘嚭鏂瑰悜 1-杩� 0-鍑� -1:鏈煡 瑕佹眰锛氳繘闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�1锛屽嚭闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�2")
+ private Integer extEventInOut;
+
+ @ApiModelProperty(value = "灏卞湴鎺у埗鍣╥d")
+ private Integer extEventLocalControllerID;
+
+ @ApiModelProperty(value = "涓昏澶囨嫧鐮�")
+ private Integer extEventMainDevID;
+
+ @ApiModelProperty(value = "浜哄憳缂栧彿")
+ private String extEventPersonNo;
+
+ @ApiModelProperty(value = "鍏徃/缁勭粐")
+ private String personCompanyName;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String personPhone;
+
+ @ApiModelProperty(value = "浜哄憳绫诲瀷")
+ private String personType;
+
+ @ApiModelProperty(value = "浜哄憳韬唤璇佸彿")
+ private String personIdcardDecode;
+
+ @ApiModelProperty(value = "浜哄憳鍚嶇О")
+ private String personName;
+
+ @ApiModelProperty(value = "璇诲崱鍣ㄧ被鍒�0-鏃犳晥1-IC璇诲崱鍣�2-韬唤璇佽鍗″櫒3-浜岀淮鐮佽鍗″櫒4-鎸囩汗澶�")
+ private Integer extEventReaderKind;
+
+ @ApiModelProperty(value = "璇诲崱鍣╥d")
+ private Integer extEventReaderID;
+
+ @ApiModelProperty(value = "鍥剧墖鐨剈rl")
+ private String extEventPictureURL;
+
+ @ApiModelProperty(value = "鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
+ private String svrIndexCode;
+
+ @ApiModelProperty(value = "鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶2-涓績缁�1涓婁紶3-涓績缁�2涓婁紶0-鏃犳晥")
+ private Integer extEventReportChannel;
+
+ @ApiModelProperty(value = "缇ょ粍缂栧彿")
+ private Integer extEventRoleID;
+
+ @ApiModelProperty(value = "鍒嗘帶鍒跺櫒纭欢ID")
+ private Integer extEventSubDevID;
+
+ @ApiModelProperty(value = "鍒峰崱娆℃暟")
+ private Integer extEventSwipNum;
+
+ @ApiModelProperty(value = "闂ㄧ浜嬩欢绫诲瀷")
+ private Integer extEventType;
+
+ @ApiModelProperty(value = "澶氶噸璁よ瘉搴忓彿")
+ private Long extEventVerifyID;
+
+ @ApiModelProperty(value = "鐧藉悕鍗曞崟鍙�")
+ private String extEventWhiteListNo;
+
+ @ApiModelProperty(value = "浜嬩欢涓婃姤椹卞姩鐨勬椂闂�")
+ private String extReceiveTime;
+
+ @ApiModelProperty(value = "浜嬩欢娴佹按鍙凤紝涓�0鏃犳晥")
+ private Integer seq;
+
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛屼汉鍛樼被鍨嬶細0 鏈煡锛�1 鏅�氾紝2 鏉ュ锛�3 榛戝悕鍗曪紝4 绠＄悊鍛�")
+ private Integer userType;
+
+ @ApiModelProperty(value = "韬唤璇佷綇鍧�")
+ private String address;
+
+ @ApiModelProperty(value = "韬唤璇佸嚭鐢熸棩鏈�")
+ private String birth;
+
+ @ApiModelProperty(value = "韬唤璇佹湁鏁堟棩鏈熺粨鏉熸椂闂�")
+ private String endDate;
+
+ @ApiModelProperty(value = "韬唤璇乮d")
+ private String idNum;
+
+ @ApiModelProperty(value = "韬唤璇佺鍙戞満鍏�")
+ private String issuingAuthority;
+
+ @ApiModelProperty(value = "韬唤璇佸鍚�")
+ private String name;
+
+ @ApiModelProperty(value = "韬唤璇佹�у埆 0-鏈煡1-鐢� 2-濂�")
+ private Integer sex;
+
+ @ApiModelProperty(value = "韬唤璇佹湁鏁堟棩鏈熷紑濮嬫椂闂�")
+ private String startDate;
+
+ @ApiModelProperty(value = "鏄惁闀挎湡鏈夋晥,0-鍚︼紙鏈夋晥鎴鏃ユ湡鏈夋晥锛�1-鏄紙鏈夋晥鎴鏃ユ湡鏃犳晥锛�")
+ private Integer termOfValidity;
+
+ @ApiModelProperty(value = "閫氶亾鍙�")
+ private Integer accessChannel;
+
+ @ApiModelProperty(value = "閫氶亾杩涗汉鏁�")
+ private Integer entryTimes;
+
+ @ApiModelProperty(value = "閫氶亾鍑轰汉鏁�")
+ private Integer exitTimes;
+
+ @ApiModelProperty(value = "閫氶亾鎬婚�氳浜烘暟")
+ private Integer totalTimes;
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceEventJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceEventJoinMapper.java
new file mode 100644
index 0000000..76b525e
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceEventJoinMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.DeviceEvent;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface DeviceEventJoinMapper extends MPJJoinMapper<DeviceEvent> {
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index 8ca8250..587fae6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
index f81d0be..931e469 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
@@ -2,6 +2,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.request.DeviceEventQuery;
+import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.business.model.DeviceEvent;
import java.util.List;
@@ -14,7 +16,7 @@
/**
* 鍒涘缓
- *
+ *
* @param deviceEvent 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -78,7 +80,7 @@
* @return List<DeviceEvent>
*/
List<DeviceEvent> findList(DeviceEvent deviceEvent);
-
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -94,4 +96,12 @@
* @return long
*/
long count(DeviceEvent deviceEvent);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<DeviceEvent>
+ */
+ PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEventQuery> pageWrap);
}
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