From ffa79b721ba96bd12b4ca394b8849a6b0c7bf01e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 01 Dec 2021 16:17:31 +0800
Subject: [PATCH] 枪支接口修改，部门树修改
---
src/main/java/org/springblade/modules/equipage/controller/CarController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 f0177a8..f0e178c 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/CarController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/CarController.java
@@ -209,14 +209,16 @@
csvurl = null;
List<String> allString = new ArrayList<>();
DowloadZipUtil dowloadZipUtil = new DowloadZipUtil();
- File file = dowloadZipUtil.downloadFile(fileUrl, "D:\\caiji");
+ File file = dowloadZipUtil.downloadFile(fileUrl, "E:\\nginx-1.18.0\\dist\\car");
//文件名
String name = file.getName();
String substring = name.substring(0, name.length() - 4);
+ System.out.println(substring);
//解压数据
FileZip fileZip = new FileZip();
- fileZip.ZipUncompress("D:\\caiji\\" + substring + ".zip", "D:\\caiji");
- csvurl = "D:\\caiji\\" + substring + ".csv";
+ 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";
}
/**
* 人员
@@ -228,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);
@@ -240,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