From 9cdab7bf6394ca1ef3b26ba1d38c168d1a413468 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 01 Dec 2021 10:36:57 +0800
Subject: [PATCH] 1.押运
---
src/main/java/org/springblade/modules/equipage/controller/CarController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/controller/CarController.java b/src/main/java/org/springblade/modules/equipage/controller/CarController.java
index 36de10f..f0e178c 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/CarController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/CarController.java
@@ -136,7 +136,7 @@
params.put("beginTime", beginTime);
params.put("endTime", endTime);
params.put("rectify", rectify);
- params.put("callbackUrl", "http://s16s652780.51mypc.cn/api/car/SaveUrl");
+ params.put("callbackUrl", "http://2h3f861221.wicp.vip/car/SaveUrl");
params.put("callbackId", "1");
params.put("appId", "PO00000761");
params.put("timestamp", System.currentTimeMillis());
@@ -217,6 +217,7 @@
//解压数据
FileZip fileZip = new FileZip();
fileZip.ZipUncompress("E:\\nginx-1.18.0\\dist\\car\\" + substring + ".zip", "E:\\nginx-1.18.0\\dist\\car");
+ //fileZip.ZipUncompress("D:\\caiji\\" + substring + ".zip", "D:\\caiji\\car");
csvurl = substring + ".csv";
}
/**
@@ -229,6 +230,7 @@
String url = "http://223.82.109.183:2080/Escort/getgis.php";
Map<String, Object> params = new HashMap<>();
//设备imei号
+ params.put("number", "7730");
params.put("acc", "7731");
String res = null;
res = HttpReqUtil.getInstance().doPost(url, params, null);
@@ -241,14 +243,27 @@
* @throws Exception
*/
@GetMapping("/Peog")
- public String Peocar() throws Exception {
+ public String Peocar(String startTime,String endTime) throws Exception {
String url = "http://223.82.109.183:2080/Escort/getgistrack.php";
Map<String, Object> params = new HashMap<>();
//设备imei号
params.put("number", "7730");
params.put("acc", "7731");
+ params.put("startTime", startTime);
+ params.put("endTime", endTime);
String res = null;
res = HttpReqUtil.getInstance().doPost(url, params, null);
return res;
}
+
+
+ /**
+ * 查询押运车辆
+ * @return
+ */
+ @GetMapping("/selectCar")
+ public R selectCar() {
+ List<Map<Object, Object>> maps = carService.selectCar();
+ return R.data(maps);
+ }
}
--
Gitblit v1.9.3