From f42817fecb4aee5bdbab8d774abeef90a6af3d76 Mon Sep 17 00:00:00 2001
From: 张磊磊 <201175954@qq.com>
Date: 星期一, 23 十月 2023 10:44:11 +0800
Subject: [PATCH] 修改上传轨迹时间
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/scheduled/PictureScheduled.java | 4 ++--
hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/scheduled/PictureScheduled.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/scheduled/PictureScheduled.java
index 8b8a438..6b126c9 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/scheduled/PictureScheduled.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/scheduled/PictureScheduled.java
@@ -173,7 +173,7 @@
HttpHeaders headers1 = new HttpHeaders();
headers1.setContentType(MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED_VALUE));
HttpEntity<Map<String, Object>> mapHttpEntity1 = new HttpEntity<>(null, headers1);
- String s1 = restTemplate1.postForObject("https://caps.runde.pro/api/index.php?ctl=location&act=get_user_path_web&admin_id=8630&user_id="+helmetDevice.getUserId()+"&stime="+strTime+"&etime="+endTime+"&token="+token, mapHttpEntity1, String.class);
+ String s1 = restTemplate1.postForObject("https://caps.runde.pro/api/index.php?ctl=location&act=get_user_path_web&admin_id=8630&user_id="+helmetDevice.getUserId()+"&start="+strTime+"&end="+endTime+"&token="+token, mapHttpEntity1, String.class);
JSONObject jsonObject11 = JSONObject.parseObject(s1);
System.out.println("--------------------------轨迹 坐标点----------------------");
System.out.println("--------------------------轨迹 坐标点----------------------");
@@ -187,7 +187,7 @@
if(data.size()>0){
for (Map<String,Object> map :data){
String times = helmetService.helmetMotion(helmetDevice.getUserId());
- if(StringUtil.isEmpty(times) || (!StringUtil.isEmpty(times)&& Integer.valueOf(map.get(time).toString())>Integer.valueOf(times))){
+ if(StringUtil.isEmpty(times) || (!StringUtil.isEmpty(times)&& Integer.valueOf(map.get("time").toString())>Integer.valueOf(times))){
THelmetMotion tHelmetMotion = new THelmetMotion();
tHelmetMotion.setUserId(helmetDevice.getUserId());
tHelmetMotion.setXPoint(map.get("x_point").toString());
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
index 9690b58..94c0c00 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
@@ -547,6 +547,9 @@
sm_time as smTime
from t_helmet_report where
user_id=#{userId}
+ <if test="strTime!=null and strTime!='' and endTime!=null and endTime!='' ">
+ and sm_time between #{strTime} and #{endTime}
+ </if>
order by sm_time desc
</select>
--
Gitblit v1.9.3