From a4e99a6a39284643fdf2b04dbe55212e5954973c Mon Sep 17 00:00:00 2001
From: leutu <leutu@qq.com>
Date: 星期一, 20 五月 2024 17:37:25 +0800
Subject: [PATCH] firsh
---
src/main/java/com/skyline/electricity/controller/RemoteController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/skyline/electricity/controller/RemoteController.java b/src/main/java/com/skyline/electricity/controller/RemoteController.java
index 4159ee0..d49b386 100644
--- a/src/main/java/com/skyline/electricity/controller/RemoteController.java
+++ b/src/main/java/com/skyline/electricity/controller/RemoteController.java
@@ -48,13 +48,13 @@
GeometryFactory geometryFactory;
WKTReader reader;
SimpleDateFormat sdf;
-
+
public RemoteController() {
this.geometryFactory = new GeometryFactory();
this.reader = new WKTReader(this.geometryFactory);
this.sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
}
-
+
@RequestMapping(value = { "/getMultiPersonlocations" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤澶氫釜浜哄憳瀹氫綅鎺ュ彛鑾峰彇瀹氫綅淇℃伅骞跺皢鍏惰瀺鍚�")
@ResponseBody
@@ -231,7 +231,7 @@
map.put("list", newList);
return map;
}
-
+
@RequestMapping(value = { "/getRTCMultiPersonlocations" }, method = { RequestMethod.POST })
@ApiOperation("浠庣紦瀛樿幏鍙栦汉鍛樹俊鎭�")
@ResponseBody
@@ -246,7 +246,7 @@
final Object object = this.getMultiPersonlocations(shopId, modId, modKey, pageNum, pageSize, value);
return object;
}
-
+
@RequestMapping(value = { "/getPersonlocation" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤鍗曚釜浜哄憳瀹氫綅鎺ュ彛鑾峰彇瀹氫綅淇℃伅骞跺皢鍏惰瀺鍚�")
@ResponseBody
@@ -585,7 +585,7 @@
final ResponseEntity<String> responseEntity1 = (ResponseEntity<String>)restTemplate.getForEntity(this.configInfo.getUWB_Historylocation() + "?apikey=" + this.configInfo.getApikey() + "&userId={userId}&shopId={shopId}&startTime={startTime}&endTime={endTime}", (Class)String.class, (Map)params1);
final String body1 = (String)responseEntity1.getBody();
final JSONObject jsonObjectResult1 = JSONObject.parseObject(body1);
- System.out.println(jsonObjectResult1.get((Object)"data"));
+ //System.out.println(jsonObjectResult1.get((Object)"data"));
if (jsonObjectResult1 != null) {
final JSONArray jsonArray1 = (JSONArray)jsonObjectResult1.get((Object)"data");
final List<UWBHistoryInfo> list1 = (List<UWBHistoryInfo>)jsonArray1.toJavaList((Class)UWBHistoryInfo.class);
@@ -717,7 +717,7 @@
final ResponseEntity<String> responseEntity2 = (ResponseEntity<String>)restTemplate.postForEntity(this.configInfo.getGPS_Historylocation()+ "?apikey=" + this.configInfo.getApikey(), (Object)httpEntity, (Class)String.class, new Object[0]);
final String body2 = (String)responseEntity2.getBody();
final JSONObject jsonObjectResult2 = JSONObject.parseObject(body2);
- System.out.println(jsonObjectResult2.get((Object)"data"));
+ //System.out.println(jsonObjectResult2.get((Object)"data"));
final JSONObject object = (JSONObject)jsonObjectResult2.get((Object)"data");
if (object != null) {
final JSONArray jsonArray2 = (JSONArray)object.get((Object)"statisticList");
@@ -865,7 +865,7 @@
}
});
}
-
+
@RequestMapping(value = { "/getMultiHistorylocationByName" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤澶氫釜浜哄憳鍘嗗彶杞ㄨ抗鎺ュ彛鑾峰彇鐩稿叧淇℃伅骞跺皢鍏惰瀺鍚�(杈撳叆濮撳悕)")
@ResponseBody
@@ -1153,7 +1153,7 @@
}
return hisInfo;
}
-
+
@RequestMapping(value = { "/oldgetHistorylocation" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤鍗曚釜浜哄憳鍘嗗彶杞ㄨ抗鎺ュ彛鑾峰彇鐩稿叧淇℃伅骞跺皢鍏惰瀺鍚�(鏈ˉ鐐�)")
@ResponseBody
@@ -1414,7 +1414,7 @@
hisInfo.add(historyRoute);
return hisInfo;
}
-
+
@RequestMapping(value = { "/getHistorylocation" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤鍗曚釜浜哄憳鍘嗗彶杞ㄨ抗鎺ュ彛鑾峰彇鐩稿叧淇℃伅骞跺皢鍏惰瀺鍚�(杈撳叆ID)")
@ResponseBody
@@ -1698,7 +1698,7 @@
hisInfo.add(historyRoute);
return hisInfo;
}
-
+
@RequestMapping(value = { "/getMultiHistorylocation" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤澶氫釜浜哄憳鍘嗗彶杞ㄨ抗鎺ュ彛鑾峰彇鐩稿叧淇℃伅骞跺皢鍏惰瀺鍚�(杈撳叆ID)")
@ResponseBody
@@ -1982,7 +1982,7 @@
}
return hisInfo;
}
-
+
@RequestMapping(value = { "/getConfigInfo" }, method = { RequestMethod.POST })
@ApiOperation("鑾峰彇閰嶇疆淇℃伅")
@ResponseBody
@@ -2009,7 +2009,7 @@
configinfo.put("dzzzUrl", this.configInfo.getDzzzUrl());
return configinfo;
}
-
+
@RequestMapping(value = { "/getAllHistorylocation" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤鎵�鏈変汉鍛樺巻鍙茶建杩规帴鍙ｈ幏鍙栫浉鍏充俊鎭苟灏嗗叾铻嶅悎")
@ResponseBody
@@ -2249,7 +2249,7 @@
}
return hisInfo;
}
-
+
@RequestMapping(value = { "/sendMessageToUWB" }, method = { RequestMethod.POST })
@ApiOperation("sendMessageToUWB")
@ResponseBody
@@ -2269,7 +2269,7 @@
final ResponseEntity<String> responseEntity = (ResponseEntity<String>)restTemplate.postForEntity(uwbUrl+ "?apikey=" + this.configInfo.getApikey(), (Object)httpEntity, (Class)String.class, new Object[0]);
return responseEntity.getBody();
}
-
+
@RequestMapping(value = { "/getMultiYQPersonlocations" }, method = { RequestMethod.POST })
@ApiOperation("杩滅▼璋冪敤澶氫釜浜哄憳瀹氫綅鎺ュ彛鑾峰彇瀹氫綅淇℃伅")
@ResponseBody
@@ -2429,7 +2429,7 @@
RemoteController.log.info("map" + map.toString());
return map;
}
-
+
private List<FencePositionYQ> getFencePositionYQ() {
final List<FencePositionYQ> yqList = new ArrayList<FencePositionYQ>();
final FencePositionYQ yq11 = new FencePositionYQ();
@@ -2476,7 +2476,7 @@
yqList.add(yq16);
return yqList;
}
-
+
static {
log = LoggerFactory.getLogger((Class)RemoteController.class);
}
--
Gitblit v1.9.3