From 8d590f68b15baac8eecd2625b548a3fefece4f71 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十二月 2023 11:54:06 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 7c6bcb5..d7f68dc 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
@@ -206,11 +206,11 @@
if (pageWrap.getModel().getExtEventRoleID() != null) {
queryWrapper.lambda().eq(DeviceEvent::getExtEventRoleID, pageWrap.getModel().getExtEventRoleID());
}
- if (pageWrap.getModel().getExtEventSubDevID() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getExtEventSubDevID, pageWrap.getModel().getExtEventSubDevID());
+ if (pageWrap.getModel().getExtEventEubDevID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventEubDevID, pageWrap.getModel().getExtEventEubDevID());
}
- if (pageWrap.getModel().getExtEventSwipNum() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getExtEventSwipNum, pageWrap.getModel().getExtEventSwipNum());
+ if (pageWrap.getModel().getExtEventEwipNum() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventEwipNum, pageWrap.getModel().getExtEventEwipNum());
}
if (pageWrap.getModel().getExtEventType() != null) {
queryWrapper.lambda().eq(DeviceEvent::getExtEventType, pageWrap.getModel().getExtEventType());
@@ -319,10 +319,10 @@
pageWrap.getModel().getEventType())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
DeviceEvent::getCreateDate,
- Utils.Date.getStart(pageWrap.getModel().getStartTime()))
+ pageWrap.getModel().getStartTime() == null?null:pageWrap.getModel().getStartTime()+" 00:00:00")
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
DeviceEvent::getCreateDate,
- Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
+ pageWrap.getModel().getEndTime() == null?"":pageWrap.getModel().getEndTime()+" 23:59:59");
queryWrapper.orderByDesc(DeviceEvent::getHappenTime);
IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper);
return PageData.from(deviceEventDTOIPage);
--
Gitblit v1.9.3