From a0a32e1315605772dcd8d311bac92c016f4ab3ff Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 08 Dec 2021 10:39:05 +0800
Subject: [PATCH] 1.押运

---
 src/main/java/org/springblade/modules/equipage/controller/fixed.java |   62 +++++++++++++++---------------
 1 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/main/java/org/springblade/modules/equipage/controller/fixed.java b/src/main/java/org/springblade/modules/equipage/controller/fixed.java
index 3265431..74f46ea 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/fixed.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/fixed.java
@@ -44,9 +44,9 @@
 	 * @return
 	 * @throws Exception
 	 */
-	//@Scheduled(cron = "0 */1 * * * ?")
+	@Scheduled(cron = "0 */5 * * * ?")
 	public void Peo() throws Exception {
-		String url = "http://223.82.109.183:2080/Escort/getgis.php";
+		String url = "http://47.104.104.46/api/client/getgis.php";
 		//查询有押运人员的数据
 		List<Map<String, Object>> list = userService.selectEquipent();
 		for (int i = 0; i < list.size(); i++) {
@@ -113,8 +113,7 @@
 						"'" + liveLocation.getWorkerId() + "'" + "," +
 						"'" + liveLocation.getLongitude() + "'" + "," +
 						"'" + liveLocation.getLatitude() + "'" + "," +
-						"'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocation.getRecordTime()) + "'" + "," +
-						"'" + liveLocation.getLocation() + "'" + ")";
+						"'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocation.getRecordTime()) + "'" + ")";
 				FtpUtil.sqlFileUpload(s1);
 			} else {
 				status = liveLocationService.updateById(liveLocationInfo);
@@ -125,7 +124,6 @@
 						",longitude = " + "'" + liveLocationInfo.getLongitude() + "'" +
 						",latitude = " + "'" + liveLocationInfo.getLatitude() + "'" +
 						",record_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocationInfo.getRecordTime()) + "'" +
-						",location = " + "'" + liveLocationInfo.getLocation() + "'" +
 						" " + "where id = " + "'" + liveLocationInfo.getId() + "'";
 				FtpUtil.sqlFileUpload(s1);
 			}
@@ -138,12 +136,12 @@
 	 * @return
 	 * @throws Exception
 	 */
-	//@Scheduled(cron = "0 */1 * * * ?")
+	@Scheduled(cron = "0 0 * * * ?")
 	public void Peog() throws Exception {
 		String url = "http://47.104.104.46/api/client/getgistrack.php";
 		Calendar calendar = Calendar.getInstance();
 		calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - 1);
-		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
 		//查询有押运人员的数据
 		List<Map<String, Object>> list = userService.selectEquipent();
 		for (int i = 0; i < list.size(); i++) {
@@ -156,13 +154,14 @@
 			String equipmentCode = list.get(i).get("code").toString();
 			//设备imei号
 			params.put("number", 7730);
-			params.put("acc", 7731);
+			params.put("acc", equipmentCode);
 			params.put("startTime", df.format(calendar.getTime()));
 			params.put("endTime", df.format(new Date()));
 			String res = null;
 			res = HttpReqUtil.getInstance().doPost(url, params, null);
-			String a="["+res+"]";
+			String a = "[" + res + "]";
 			JSONArray jsonArray = JSONArray.fromObject(a);
+			String s1 = "";
 			String track = jsonArray.getJSONObject(0).get("track").toString();
 			JSONArray jsonArray1 = JSONArray.fromObject(track);
 			for (int j = 0; j < jsonArray1.size(); j++) {
@@ -181,16 +180,19 @@
 				locus.setLongitude(gis_jd);
 				locus.setLatitude(gis_wd);
 				locusService.save(locus);
-//				//数据推送
-//				String s1 = "insert into sys_locus(id,type,worker_id,longitude,latitude,record_time) " +
-//						"values(" + "'" + locus.getId() + "'" + "," +
-//						"'" + locus.getType() + "'" + "," +
-//						"'" + locus.getWorkerId() + "'" + "," +
-//						"'" + locus.getLongitude() + "'" + "," +
-//						"'" + locus.getLatitude() + "'" + "," +
-//					  "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(locus.getRecordTime()) + "'" + ")";
-//				FtpUtil.sqlFileUpload(s1);
+				//数据推送
+				s1 += "insert into sys_locus(id,type,worker_id,longitude,latitude,record_time) values" +
+					" (" + "'" + locus.getId() + "'" + "," +
+					"'" + locus.getType() + "'" + "," +
+					"'" + locus.getWorkerId() + "'" + "," +
+					"'" + locus.getLongitude() + "'" + "," +
+					"'" + locus.getLatitude() + "'" + "," +
+					"'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(locus.getRecordTime()) + "'" + ")";
+				if (j != jsonArray1.size() - 1) {
+					s1 += ";";
+				}
 			}
+			FtpUtil.sqlFileUpload(s1);
 		}
 	}
 
@@ -198,7 +200,7 @@
 	/**
 	 * 车辆实时位置
 	 */
-	//@Scheduled(cron = "0 */1 * * * ?")
+	@Scheduled(cron = "0 */5 * * * ?")
 	public void locationcar() {
 		String url = "http://dvopenapi.aimap.net.cn/openapi/device/location";
 		String res = null;
@@ -251,20 +253,18 @@
 							"'" + liveLocation.getWorkerId() + "'" + "," +
 							"'" + liveLocation.getLongitude() + "'" + "," +
 							"'" + liveLocation.getLatitude() + "'" + "," +
-							"'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocation.getRecordTime()) + "'" + "," +
-							"'" + liveLocation.getLocation() + "'" + ")";
+							"'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocation.getRecordTime()) + "'"  + ")";
 					FtpUtil.sqlFileUpload(s1);
 				} else {
 					status = liveLocationService.updateById(liveLocationInfo);
 					//内网同步
 					String s1 =
-						"update sys_live_location set type = " + "'" + liveLocation.getType() + "'" +
-							",worker_id = " + "'" + liveLocation.getWorkerId() + "'" +
-							",longitude = " + "'" + liveLocation.getLongitude() + "'" +
-							",latitude = " + "'" + liveLocation.getLatitude() + "'" +
-							",record_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocation.getRecordTime()) + "'" +
-							",location = " + "'" + liveLocation.getLocation() + "'" +
-							" " + "where id = " + "'" + liveLocation.getId() + "'";
+						"update sys_live_location set type = " + "'" + liveLocationInfo.getType() + "'" +
+							",worker_id = " + "'" + liveLocationInfo.getWorkerId() + "'" +
+							",longitude = " + "'" + liveLocationInfo.getLongitude() + "'" +
+							",latitude = " + "'" + liveLocationInfo.getLatitude() + "'" +
+							",record_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocationInfo.getRecordTime()) + "'" +
+							" " + "where id = " + "'" + liveLocationInfo.getId() + "'";
 					FtpUtil.sqlFileUpload(s1);
 				}
 			} catch (Exception e) {
@@ -290,8 +290,9 @@
 	/**
 	 * 查询车辆轨迹
 	 */
-	//@Scheduled(cron = "0 */1 * * * ?")
+	@Scheduled(cron = "0 0 * * * ?")
 	public void locationhistoryTrack() {
+		System.out.println("车辆轨迹");
 		Calendar calendar = Calendar.getInstance();
 		/* HOUR_OF_DAY 指示一天中的小时 */
 		calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - 1);
@@ -305,7 +306,7 @@
 			params.put("beginTime", df.format(calendar.getTime()));
 			params.put("endTime", df.format(new Date()));
 			params.put("rectify", 0);
-			params.put("callbackUrl", "http://2h3f861221.wicp.vip/locus/SaveUrl");
+			params.put("callbackUrl", "http://223.82.109.183:2080/api/locus/SaveUrl");
 			params.put("callbackId", maps.get(i).get("carnumber").toString());
 			params.put("appId", "PO00000761");
 			params.put("timestamp", System.currentTimeMillis());
@@ -325,6 +326,5 @@
 		}
 
 	}
-
 
 }

--
Gitblit v1.9.3