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 | 107 +++++++++++++++++++++++++++--------------------------
1 files changed, 55 insertions(+), 52 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 f0b1f31..f71eceb 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/fixed.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/fixed.java
@@ -1,26 +1,22 @@
package org.springblade.modules.equipage.controller;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import net.sf.json.JSONArray;
import net.sf.json.JSONException;
import net.sf.json.JSONObject;
import org.springblade.common.utils.HttpReqUtil;
import org.springblade.common.utils.Md5SignUtil;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.tool.api.R;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.equipage.service.CarService;
import org.springblade.modules.location.entity.LiveLocation;
import org.springblade.modules.location.entity.Locus;
import org.springblade.modules.location.service.LiveLocationService;
import org.springblade.modules.location.service.LocusService;
-import org.springblade.modules.system.entity.User;
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 springfox.documentation.spring.web.json.Json;
import java.io.IOException;
import java.text.DateFormat;
@@ -28,7 +24,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
-@Component
+@Component("fixed")
public class fixed {
private static final DateFormat JSON = null;
@Autowired
@@ -39,6 +35,8 @@
private LocusService locusService;
@Autowired
private CarService carService;
+ @Autowired
+ private MyAsyncService myAsyncService;
/**
* 押运人员
@@ -46,27 +44,24 @@
* @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();
- for (int i = 0; i < list.size(); i++) {
- //实时位置实体类
- LiveLocation liveLocation = new LiveLocation();
- liveLocation.setType(1);
- String id = list.get(i).get("id").toString();
- liveLocation.setWorkerId(id);
- Map<String, Object> params = new HashMap<>();
- String equipmentCode = list.get(i).get("code").toString();
- //设备imei号
- params.put("acc", equipmentCode);
- String res = null;
- res = HttpReqUtil.getInstance().doPost(url, params, null);
- System.out.println("res = " + res);
- Map<String,Object> map =(Map<String,Object>) com.alibaba.fastjson.JSON.parse("header");
- System.out.println("map = " + map.get("code"));
- if (!map.get("code").equals("3")) {
+ if (list.size() > 0) {
+ for (int i = 0; i < list.size(); i++) {
+ //实时位置实体类
+ LiveLocation liveLocation = new LiveLocation();
+ liveLocation.setType(1);
+ String id = list.get(i).get("id").toString();
+ liveLocation.setWorkerId(id);
+ Map<String, Object> params = new HashMap<>();
+ String equipmentCode = list.get(i).get("code").toString();
+ //设备imei号
+ params.put("acc", equipmentCode);
+ String res = null;
+ res = HttpReqUtil.getInstance().doPost(url, params, null);
JSONArray jsonArray = JSONArray.fromObject(res);
JSONArray sortedJsonArray = new JSONArray();
List<JSONObject> jsonValues = new ArrayList<JSONObject>();
@@ -120,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.dataSync(s1);
} else {
status = liveLocationService.updateById(liveLocationInfo);
//内网同步
@@ -131,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.dataSync(s1);
}
}
}
@@ -143,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";
@@ -171,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();
@@ -204,7 +200,8 @@
s1 += ";";
}
}
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
}
}
}
@@ -213,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;
@@ -236,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);
@@ -260,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.dataSync(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.dataSync(s1);
+ }
}
}
} catch (Exception e) {
@@ -306,7 +309,7 @@
/**
* 查询车辆轨迹
*/
- @Scheduled(cron = "0 0 * * * ?")
+// @Scheduled(cron = "0 0 * * * ?")
public void locationhistoryTrack() {
Calendar calendar = Calendar.getInstance();
/* HOUR_OF_DAY 指示一天中的小时 */
@@ -321,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