From 2dc82639ec241aa69f75f7fa6dce5df4942a5665 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 15 十二月 2023 13:34:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java | 56 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java b/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
index 5f39186..f360ce8 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
@@ -95,7 +95,7 @@
String carModel = (String) result.get("carModel");//鑾峰彇杞﹁締妯″瀷
Integer drct = (Integer) gpsMap.get("drct");//鑾峰彇杞﹁締妯″瀷
Integer speed = (Integer) gpsMap.get("speed");
-// log.info("carId:"+carId+"lng:"+lng+"lat:"+lat);
+ log.debug("瀹氫綅鏁版嵁锛歝arId:"+carId+"lng:"+lng+"lat:"+lat);
//瀹氫箟2缁寸┖闂�
Point2D.Double point = new Point2D.Double(Double.parseDouble(lng), Double.parseDouble(lat));
List<Point2D.Double> pts = new ArrayList<Point2D.Double>();
@@ -146,7 +146,7 @@
ardAccessFence1.setLng(lng);
ardAccessFence1.setLat(lat);
ardAccessFence1.setLastTime(time);
- ardAccessFence1.setNowWallName(ardOilWall.getName());
+ ardAccessFence1.setNowWallName("杩涘叆瑁呮补鐐癸細"+ardOilWall.getName());
ardAccessFence1.setCarModel(carModel);
ardAccessFence1.setIsWarning(0);
ardAccessFence1.setDrct(drct);
@@ -210,7 +210,7 @@
//杩涘叆瑁呮补鐐瑰叆搴�
ardAccessFence.setIntoShipmentId(ardOilWall.getId());
ardAccessFence.setIntoShipmentTime(time);
- ardAccessFence.setNowWallName(ardOilWall.getName());
+ ardAccessFence.setNowWallName("杩涘叆瑁呮补鐐癸細"+ardOilWall.getName());
ardAccessFence.setLastTime(time);
if(stop){
//mqtt鍙戦�佹棦瀹歊tu鐘舵��
@@ -237,7 +237,7 @@
//杞﹁締寮�鍑鸿娌圭偣
ardAccessFence.setOutShipmentId(into);
ardAccessFence.setOutShipmentTime(time);
- ardAccessFence.setNowWallName(ardOilWall.getName());
+ ardAccessFence.setNowWallName("寮�鍑鸿娌圭偣锛�"+ardOilWall.getName());
ardAccessFence.setLastTime(time);
ardAccessFence.setLng(lng);
ardAccessFence.setLat(lat);
@@ -268,7 +268,7 @@
ardAccessFence.setIntoUnloadTime(time);
ardAccessFence.setLng(lng);
ardAccessFence.setLat(lat);
- ardAccessFence.setNowWallName(ardOilWall.getName());
+ ardAccessFence.setNowWallName("杩涘叆鍗告补鐐癸細"+ardOilWall.getName());
ardAccessFence.setLastTime(time);
ardAccessFenceService.updAccess(ardAccessFence);
//宸茬粡杩涘叆鍗告补鐐癸紝涓嶅湪璺笂涓嶉渶瑕佸仠杞︽姤璀�
@@ -283,7 +283,7 @@
//涓嶅湪鍗告补鐐瑰氨鏄湪璺笂
if(isRoad){
//鎵�鍦ㄥ洿鏍忓悕绉拌祴null
- ardAccessFence.setNowWallName(null);
+ ardAccessFence.setNowWallName("鍦ㄨ矾涓�");
//濡傛灉鍦ㄨ矾涓婂垽鏂潗鏍囨槸鍚︿笌涓婃涓�鏍�
if(ardAccessFence.getLng().equals(lng) && ardAccessFence.getLat().equals(lat)){
if(ardAccessFence.getLastTime()!=null){
@@ -460,15 +460,17 @@
//濡傛灉涓嶆槸瑙ｅ皝灏佺姸鎬侊紝鍒欏彂閫佹柦灏佸懡浠�
if(ardSyCarLocks.get(0).getRelayInfo()!=null){
if(ardSyCarLocks.get(0).getRelayInfo()==0){
- Map<String,Object> map = new HashMap<>();
- map.put("A01", 110000);//瀵奸�氱涓�璺户鐢靛櫒
- map.put("A02", 110000);//瀵奸�氱浜岃矾缁х數鍣�
- map.put("res", String.valueOf(System.currentTimeMillis()));
- String mapString = com.alibaba.fastjson.JSON.toJSONString(map);
+// Map<String,Object> map = new HashMap<>();
+// map.put("A01", 110000);//瀵奸�氱涓�璺户鐢靛櫒
+// map.put("A02", 110000);//瀵奸�氱浜岃矾缁х數鍣�
+// map.put("res", String.valueOf(System.currentTimeMillis()));
+// String mapString = com.alibaba.fastjson.JSON.toJSONString(map);
+ String mapString = "{\"A01\":110000,\"A02\":110000,\"res\":\""+String.valueOf(System.currentTimeMillis())+"\"}";
+ log.debug("鑷姩瑙ｅ皝锛�"+mapString);
EmqClient emqClient = new EmqClient(carId+"mqttPublish"+UUID.randomUUID());
emqClient.connect();
emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
- log.info("杞﹁締"+carId+"瑙ｅ皝鍛戒护鍙戦�佹垚鍔燂紒");
+ log.debug("杞﹁締"+carId+"瑙ｅ皝鍛戒护鍙戦�佹垚鍔燂紒");
// mqttOnce.publishCar(carId,ardSyCarRtu.getTopicPublish(),String.valueOf(new JSONObject(map)),"瑙ｅ皝");
}
}
@@ -477,6 +479,11 @@
if(fengType==0){
//閿佸紑鍏崇姸鎬�
int lockCloseNum = 0;
+ String mapString1 = "{\"A01\":100000,\"A02\":100000,\"res\":\""+String.valueOf(System.currentTimeMillis())+"\"}";
+ System.out.println("鑷姩鏂藉皝锛�"+mapString1);
+ EmqClient emqClient1 = new EmqClient(carId+"mqttPublish"+UUID.randomUUID());
+ emqClient1.connect();
+ emqClient1.publish(ardSyCarRtu.getTopicPublish(),mapString1, QosEnum.QoS2,false);
//濡傛灉涓嶆槸鏂藉皝鐘舵�侊紝鍒欏彂閫佹柦灏佸懡浠�
if(ardSyCarLocks.get(0).getRelayInfo()!=null){
if(ardSyCarLocks.get(0).getRelayInfo()==1){
@@ -494,10 +501,12 @@
}else if(currents.equals("C02")){
key = "D04";
}
- Map<String,Object> map = new HashMap();
- map.put(key, 0.01);
- map.put("res", String.valueOf(System.currentTimeMillis()));
- String mapString = com.alibaba.fastjson.JSON.toJSONString(map);
+// Map<String,Object> map = new HashMap();
+// map.put(key, 0.01);
+// map.put("res", String.valueOf(System.currentTimeMillis()));
+// String mapString = com.alibaba.fastjson.JSON.toJSONString(map);
+ String mapString = "{\""+key+"\":0.01,\"res\":\""+String.valueOf(System.currentTimeMillis())+"\"}";
+ log.debug("鑷姩鍏抽攣锛�"+mapString);
EmqClient emqClient = new EmqClient(carId+"mqttPublish"+UUID.randomUUID());
emqClient.connect();
emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
@@ -513,15 +522,12 @@
}
}
if(lockCloseNum == 2){
- Map<String,Object> map = new HashMap<>();
- map.put("A01", 100000);//鏂紑绗竴璺户鐢靛櫒
- map.put("A02", 100000);//鏂紑绗簩璺户鐢靛櫒
- map.put("res", String.valueOf(System.currentTimeMillis()));
- String mapString = com.alibaba.fastjson.JSON.toJSONString(map);
- EmqClient emqClient = new EmqClient(carId+"mqttPublish"+UUID.randomUUID());
- emqClient.connect();
- emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
- log.info("杞﹁締"+carId+"鏂藉皝鍛戒护鍙戦�佹垚鍔燂紒");
+// Map<String,Object> map = new HashMap<>();
+// map.put("A01", 100000);//鏂紑绗竴璺户鐢靛櫒
+// map.put("A02", 100000);//鏂紑绗簩璺户鐢靛櫒
+// map.put("res", String.valueOf(System.currentTimeMillis()));
+// String mapString = com.alibaba.fastjson.JSON.toJSONString(map);
+ log.debug("杞﹁締"+carId+"鏂藉皝鍛戒护鍙戦�佹垚鍔燂紒");
// mqttOnce.publishCar(carId,ardSyCarRtu.getTopicPublish(),String.valueOf(new JSONObject(map)),"鏂藉皝");
}
}
--
Gitblit v1.9.3