From 7af2d33d8fda6af451b0873a8f642c3cf7686136 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期三, 29 十一月 2023 16:21:49 +0800
Subject: [PATCH] 20231129_qiuyh_解决钢筋笼生产查询问题、新加钢筋笼材料标示牌、调整区域打卡
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/scheduled/PictureScheduled.java | 4 ++--
1 files changed, 2 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());
--
Gitblit v1.9.3