From 7e1423190ac72539d3f731b79f5c2ae4a18f58d5 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 06 Sep 2022 15:36:10 +0800
Subject: [PATCH] 按时间段查询走航车轨迹
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 2 +-
screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index ac6fdb9..cda4705 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -73,7 +73,7 @@
})
public ResultMessage carTrajectory(HttpServletRequest request) {
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
- if (!params.containsKey("mac") || !params.containsKey("time")) {
+ if (!params.containsKey("mac") || !params.containsKey("time1")|| !params.containsKey("time2")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
List<Map<String, Object>> response = specialDeviceService.carTrajectory(params);
diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 41b2d2f..54d7ade 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -26,7 +26,8 @@
`value`
FROM `history_second_cruiser`
WHERE mac = #{mac}
- AND `time` LIKE #{time}"%"
+ AND `time` <![CDATA[>=]]> #{time1}
+ AND `time` <![CDATA[<=]]> #{time2}
AND organization_id = #{orgId}
</select>
--
Gitblit v1.8.0