From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口

---
 src/main/java/org/springblade/modules/equipage/controller/fixed.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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 2638189..f71eceb 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/fixed.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/fixed.java
@@ -24,7 +24,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-@Component
+@Component("fixed")
 public class fixed {
 	private static final DateFormat JSON = null;
 	@Autowired
@@ -44,7 +44,7 @@
 	 * @return
 	 * @throws Exception
 	 */
-	@Scheduled(cron = "0 */5 * * * ?")
+//	@Scheduled(cron = "0 */5 * * * ?")
 	public void Peo() throws Exception {
 		String url = "http://47.104.104.46/api/client/getgis.php";
 		//查询有押运人员的数据
@@ -116,7 +116,7 @@
 							"'" + liveLocation.getLatitude() + "'" + "," +
 							"'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocation.getRecordTime()) + "'" + ")";
 					//FtpUtil.sqlFileUpload(s1);
-					myAsyncService.FTP(s1);
+					myAsyncService.dataSync(s1);
 				} else {
 					status = liveLocationService.updateById(liveLocationInfo);
 					//内网同步
@@ -128,7 +128,7 @@
 							",record_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocationInfo.getRecordTime()) + "'" +
 							" " + "where id = " + "'" + liveLocationInfo.getId() + "'";
 					//FtpUtil.sqlFileUpload(s1);
-					myAsyncService.FTP(s1);
+					myAsyncService.dataSync(s1);
 				}
 			}
 		}
@@ -140,7 +140,7 @@
 	 * @return
 	 * @throws Exception
 	 */
-	@Scheduled(cron = "0 0 * * * ?")
+//	@Scheduled(cron = "0 0 * * * ?")
 	public void Peog() throws Exception {
 		System.out.println("押运人员");
 		String url = "http://47.104.104.46/api/client/getgistrack.php";
@@ -201,7 +201,7 @@
 					}
 				}
 				//FtpUtil.sqlFileUpload(s1);
-				myAsyncService.FTP(s1);
+				myAsyncService.dataSync(s1);
 			}
 		}
 	}
@@ -210,7 +210,7 @@
 	/**
 	 * 车辆实时位置
 	 */
-	@Scheduled(cron = "0 */5 * * * ?")
+//	@Scheduled(cron = "0 */5 * * * ?")
 	public void locationcar() {
 		String url = "http://dvopenapi.aimap.net.cn/openapi/device/location";
 		String res = null;
@@ -268,7 +268,7 @@
 									"'" + liveLocation.getLatitude() + "'" + "," +
 									"'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocation.getRecordTime()) + "'" + ")";
 							//FtpUtil.sqlFileUpload(s1);
-							myAsyncService.FTP(s1);
+							myAsyncService.dataSync(s1);
 						}
 					} else {
 						status = liveLocationService.updateById(liveLocationInfo);
@@ -282,7 +282,7 @@
 									",record_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocationInfo.getRecordTime()) + "'" +
 									" " + "where id = " + "'" + liveLocationInfo.getId() + "'";
 							//FtpUtil.sqlFileUpload(s1);
-							myAsyncService.FTP(s1);
+							myAsyncService.dataSync(s1);
 						}
 					}
 				}
@@ -309,7 +309,7 @@
 	/**
 	 * 查询车辆轨迹
 	 */
-	@Scheduled(cron = "0 0 * * * ?")
+//	@Scheduled(cron = "0 0 * * * ?")
 	public void locationhistoryTrack() {
 		Calendar calendar = Calendar.getInstance();
 		/* HOUR_OF_DAY 指示一天中的小时 */
@@ -324,7 +324,7 @@
 			params.put("beginTime", df.format(calendar.getTime()));
 			params.put("endTime", df.format(new Date()));
 			params.put("rectify", 0);
-			params.put("callbackUrl", "http://223.82.109.183:2080/api/locus/SaveUrl");
+			params.put("callbackUrl", "http://61.131.136.25:2080/api/locus/SaveUrl");
 			params.put("callbackId", maps.get(i).get("carnumber").toString());
 			params.put("appId", "PO00000761");
 			params.put("timestamp", System.currentTimeMillis());

--
Gitblit v1.9.3