From c503c5d336b7219c1bff1f59b4176e4e49f2c3f2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:50:21 +0800
Subject: [PATCH] 清淤
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java | 90 +++++++++++++++++++++++++--------------------
1 files changed, 50 insertions(+), 40 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 764b72d..4715c33 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
@@ -78,13 +78,13 @@
/*String carName = MapUtil.getStrVal(gpsMap, "carName","");//鑾峰彇杞︾墝鍙�
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
System.out.println(sdf.format(new Date()));*/
- log.info(String.format(" ---->鏀跺埌瀹氫綅鏁版嵁:%s",JSON.toJSONString(gpsMap)));
+// log.info(String.format(" ---->鏀跺埌瀹氫綅鏁版嵁:%s",JSON.toJSONString(gpsMap)));
String carId = (String)gpsMap.get("carId");
((ArdSyCarDayServiceImpl)SpringUtils.getBean("ardSyCarDayServiceImpl")).insertArdSyCarDay(carId);//鏂板杞﹁締涓婃姤鏃堕棿
Map<String,Object> result = ((ArdSyCarServiceImpl)SpringUtils.getBean("ardSyCarServiceImpl")).getArdSyCarAndDeptByCarId(carId);//鏌ヨ杞﹁締鍙婇儴闂�
if(result != null){
- if("30".equals(carId)){
+// if("30".equals(carId)){
//娓呮筏寮�濮�----------
String lng = (String) gpsMap.get("lng").toString();//鑾峰彇缁忓害
String lat = (String) gpsMap.get("lat").toString();//鑾峰彇绾害
@@ -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.info("瀹氫綅鏁版嵁锛歝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>();
@@ -113,6 +113,8 @@
ArdAccessFence ardAccessFence = ardAccessFenceService.queryAccess(carId);
//鏌ヨ鎵�鏈夎娌圭偣鍥存爮
List<ArdOilWall> ardOilWalls = ardOilWallService.accessAll();
+ //鏃ユ湡鏍煎紡
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//杞﹂�熸爣璁�
Boolean stop = true;
//鍒ゆ柇杞﹂��
@@ -144,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);
@@ -169,8 +171,6 @@
ardAccessFence.setNowWallName(null);
//濡傛灉鍦ㄨ矾涓婂垽鏂潗鏍囨槸鍚︿笌涓婃涓�鏍�
if(ardAccessFence.getLng().equals(lng) && ardAccessFence.getLat().equals(lat)){
- //濡傛灉鍧愭爣涓�鏍锋椂闂寸浉鍑�
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date nowTime = sdf.parse(time);
Date lastTime = sdf.parse(ardAccessFence.getLastTime());
Long diff = (nowTime.getTime() - lastTime.getTime())/1000;
@@ -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,23 +283,27 @@
//涓嶅湪鍗告补鐐瑰氨鏄湪璺笂
if(isRoad){
//鎵�鍦ㄥ洿鏍忓悕绉拌祴null
- ardAccessFence.setNowWallName(null);
+ ardAccessFence.setNowWallName("鍦ㄨ矾涓�");
//濡傛灉鍦ㄨ矾涓婂垽鏂潗鏍囨槸鍚︿笌涓婃涓�鏍�
if(ardAccessFence.getLng().equals(lng) && ardAccessFence.getLat().equals(lat)){
- //濡傛灉鍧愭爣涓�鏍锋椂闂寸浉鍑�
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Date nowTime = sdf.parse(time);
- Date lastTime = sdf.parse(ardAccessFence.getLastTime());
- Long diff = (nowTime.getTime() - lastTime.getTime())/1000;
- ArdAccessNum list = accessNumService.queryNum();
- if(list==null){
- int alarm = list.getAlarm();
- if(diff>=alarm){
- ardAccessFence.setIsWarning(1);
- ardAccessFence.setAlarmLat(lat);
- ardAccessFence.setAlarmLng(lng);
- ardAccessFenceService.updAccess(ardAccessFence);
+ if(ardAccessFence.getLastTime()!=null){
+ //濡傛灉鍧愭爣涓�鏍风浉鍑�
+ Date nowTime = sdf.parse(time);
+ Date lastTime = sdf.parse(ardAccessFence.getLastTime());
+ Long diff = (nowTime.getTime() - lastTime.getTime())/1000;
+ ArdAccessNum list = accessNumService.queryNum();
+ if(list==null){
+ int alarm = list.getAlarm();
+ if(diff>=alarm){
+ ardAccessFence.setIsWarning(1);
+ ardAccessFence.setAlarmLat(lat);
+ ardAccessFence.setAlarmLng(lng);
+ ardAccessFenceService.updAccess(ardAccessFence);
+ }
}
+ }else {
+ ardAccessFence.setLastTime(time);
+ ardAccessFenceService.updAccess(ardAccessFence);
}
}else {
//濡傛灉涓嶄竴鏍锋洿鏂板潗鏍�
@@ -333,7 +337,7 @@
}
}
}
- }
+// }
}
//娓呮筏缁撴潫------------
@@ -456,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)),"瑙ｅ皝");
}
}
@@ -490,10 +496,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);
@@ -509,15 +517,17 @@
}
}
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);
+// 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);
+ String mapString = "{\"A01\":100000,\"A02\":100000,\"res\":\""+String.valueOf(System.currentTimeMillis())+"\"}";
+ System.out.println("鑷姩鏂藉皝锛�"+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)),"鏂藉皝");
}
}
--
Gitblit v1.9.3