From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改
---
src/main/java/org/springblade/modules/equipage/controller/fixed.java | 76 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 32 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 9e853b2..06d4ec9 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/fixed.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/fixed.java
@@ -13,16 +13,18 @@
import org.springblade.modules.location.service.LiveLocationService;
import org.springblade.modules.location.service.LocusService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+
import java.io.IOException;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
-@Component
+@Component("fixed")
public class fixed {
private static final DateFormat JSON = null;
@Autowired
@@ -33,6 +35,8 @@
private LocusService locusService;
@Autowired
private CarService carService;
+ @Autowired
+ private MyAsyncService myAsyncService;
/**
* 押运人员
@@ -40,12 +44,12 @@
* @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";
//查询有押运人员的数据
List<Map<String, Object>> list = userService.selectEquipent();
- if (list.size()>0) {
+ if (list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
//实时位置实体类
LiveLocation liveLocation = new LiveLocation();
@@ -111,7 +115,8 @@
"'" + liveLocation.getLongitude() + "'" + "," +
"'" + liveLocation.getLatitude() + "'" + "," +
"'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocation.getRecordTime()) + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
} else {
status = liveLocationService.updateById(liveLocationInfo);
//内网同步
@@ -122,7 +127,8 @@
",latitude = " + "'" + liveLocationInfo.getLatitude() + "'" +
",record_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocationInfo.getRecordTime()) + "'" +
" " + "where id = " + "'" + liveLocationInfo.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
}
}
@@ -134,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";
@@ -162,10 +168,9 @@
JSONArray jsonArray = JSONArray.fromObject(a);
String s1 = "";
String track = jsonArray.getJSONObject(0).get("track").toString();
- if (track.equals("[]")){
+ if (track.equals("[]")) {
System.out.println("数据为空");
- }
- else {
+ } else {
JSONArray jsonArray1 = JSONArray.fromObject(track);
for (int j = 0; j < jsonArray1.size(); j++) {
String gis_jd = jsonArray1.getJSONObject(j).get("gis_jd").toString();
@@ -195,7 +200,8 @@
s1 += ";";
}
}
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
}
}
@@ -204,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;
@@ -227,7 +233,7 @@
String a = "[" + res + "]";
JSONArray jsonArray = JSONArray.fromObject(a);
String code = jsonArray.getJSONObject(0).get("code").toString();
- if (Integer.parseInt(code)==200) {
+ if (Integer.parseInt(code) == 200) {
String data = jsonArray.getJSONObject(0).get("data").toString();
String b = "[" + data + "]";
JSONArray jsonArrayb = JSONArray.fromObject(b);
@@ -251,27 +257,33 @@
if (null == liveLocationInfo) {
//新增
status = liveLocationService.save(liveLocation);
- //数据推送
- String s1 =
- "insert into sys_live_location(id,type,worker_id,longitude,latitude,record_time) " +
- "values(" + "'" + liveLocation.getId() + "'" + "," +
- "'" + liveLocation.getType() + "'" + "," +
- "'" + liveLocation.getWorkerId() + "'" + "," +
- "'" + liveLocation.getLongitude() + "'" + "," +
- "'" + liveLocation.getLatitude() + "'" + "," +
- "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocation.getRecordTime()) + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
+ if (status) {
+ //数据推送
+ String s1 =
+ "insert into sys_live_location(id,type,worker_id,longitude,latitude,record_time) " +
+ "values(" + "'" + liveLocation.getId() + "'" + "," +
+ "'" + liveLocation.getType() + "'" + "," +
+ "'" + liveLocation.getWorkerId() + "'" + "," +
+ "'" + liveLocation.getLongitude() + "'" + "," +
+ "'" + liveLocation.getLatitude() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(liveLocation.getRecordTime()) + "'" + ")";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ }
} else {
status = liveLocationService.updateById(liveLocationInfo);
//内网同步
- String s1 =
- "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);
+ if (status) {
+ String s1 =
+ "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);
+ myAsyncService.FTP(s1);
+ }
}
}
} catch (Exception e) {
@@ -297,7 +309,7 @@
/**
* 查询车辆轨迹
*/
- @Scheduled(cron = "0 0 * * * ?")
+// @Scheduled(cron = "0 0 * * * ?")
public void locationhistoryTrack() {
Calendar calendar = Calendar.getInstance();
/* HOUR_OF_DAY 指示一天中的小时 */
@@ -312,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