From ae64126733bedc1a15a0177b105fec7f499ada81 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 05 八月 2024 11:01:01 +0800
Subject: [PATCH] 电磁锁加入使能修改及判断提交
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java | 297 ----------------------------------------------------------
1 files changed, 4 insertions(+), 293 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 6771295..379e38c 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
@@ -86,297 +86,8 @@
((ArdSyCarDayServiceImpl)SpringUtils.getBean("ardSyCarDayServiceImpl")).insertArdSyCarDay(carId);//鏂板杞﹁締涓婃姤鏃堕棿
Map<String,Object> result = ((ArdSyCarServiceImpl)SpringUtils.getBean("ardSyCarServiceImpl")).getArdSyCarAndDeptByCarId(carId);//鏌ヨ杞﹁締鍙婇儴闂�
if(result != null){
- //娓呮筏寮�濮�----------
- /*try{
- String lng = (String) gpsMap.get("lng").toString();//鑾峰彇缁忓害
- String lat = (String) gpsMap.get("lat").toString();//鑾峰彇绾害
- String carName = (String) gpsMap.get("carName");//鑾峰彇杞︾墝鍙�
- String time = (String) gpsMap.get("time");//瀹氫綅鏃堕棿
- //鏃堕棿鐘舵��
- Boolean timeType = true;
- if(time==null || time == ""){
- timeType = false;
- }
- String deptNum = (String) result.get("deptId").toString();//鑾峰彇閮ㄩ棬ID
- String deptName = (String) result.get("deptName");//鑾峰彇閮ㄩ棬鍚嶇О
- String carModel = (String) result.get("carModel");//鑾峰彇杞﹁締妯″瀷
- Integer drct = (Integer) gpsMap.get("drct");//鑾峰彇杞﹁締妯″瀷
- Integer speed = (Integer) gpsMap.get("speed");//杞﹂��
- String reserved = (String) result.get("reserved_1");//rtu鍏宠仈
- //rtu鏍囪瘑
- boolean rtuType = true;
- if(reserved==null || reserved==""){
- //鏃犻攣
- rtuType = false;
- }
- //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>();
- //娉ㄥ叆甯﹂攣杞﹁締Bean
- ArdAccessFenceService ardAccessFenceService = SpringUtils.getBean(ArdAccessFenceService.class);
- //娉ㄥ叆娌圭偣鍥存爮Bean
- ArdOilWallService ardOilWallService = SpringUtils.getBean(ArdOilWallService.class);
- //娉ㄥ叆鎶ヨ璁℃暟Bean
- ArdAccessNumService accessNumService = SpringUtils.getBean(ArdAccessNumService.class);
- //娉ㄥ叆鐢靛瓙閿丅ean
- ArdSyCarRtuService carRtuService = SpringUtils.getBean(ArdSyCarRtuService.class);
- //娉ㄥ叆閿丅ean
- ArdSyCarLockService lockService = SpringUtils.getBean(ArdSyCarLockService.class);
- //鏌ヨ瀹氫綅娌硅溅琛ㄤ腑鏄惁鏈夎杞﹁締
- ArdAccessFence ardAccessFence = ardAccessFenceService.queryAccess(carId);
- //鏌ヨ鎵�鏈夎娌圭偣鍥存爮
- List<ArdOilWall> ardOilWalls = ardOilWallService.accessAll();
- //鏃ユ湡鏍煎紡
- SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
- //濡傛灉娌℃湁璇存槑杞﹁締鏈繘鍏ヨ娌圭偣锛岄渶瑕佸尮閰嶆墍鏈夎娌圭偣鍥存爮
- if(ardAccessFence==null){
- //杞﹁締鏈繘鍏ヨ娌圭偣
- for (int i = 0; i < ardOilWalls.size(); i++) {
- pts.clear();
- ArdOilWall ardOilWall = ardOilWalls.get(i);
- String[] coord = ardOilWall.getCoord().split(",");
- for (int j = 0; j < coord.length; j = j + 3) {
- pts.add(new Point2D.Double(Double.parseDouble(coord[j]), Double.parseDouble(coord[j+1])));
- }
- if(GeoTools.IsPtInPoly(point, pts)){
- //杩涘叆瑁呮补鐐瑰叆搴�
- ArdAccessFence ardAccessFence1 = new ArdAccessFence();
- ardAccessFence1.setId(String.valueOf(UUID.randomUUID()));
- ardAccessFence1.setCarId(carId);
- ardAccessFence1.setCarName(carName);
- ardAccessFence1.setDeptId(deptNum);
- ardAccessFence1.setDeptName(deptName);
- ardAccessFence1.setIntoShipmentId(ardOilWall.getId());
- ardAccessFence1.setIntoShipmentTime(time);
- ardAccessFence1.setLng(lng);
- ardAccessFence1.setLat(lat);
- ardAccessFence1.setLastTime(time);
- ardAccessFence1.setNowWallName("杩涘叆瑁呮补鐐癸細"+ardOilWall.getName());
- ardAccessFence1.setCarModel(carModel);
- ardAccessFence1.setIsWarning(0);
- ardAccessFence1.setDrct(drct);
- ardAccessFence1.setIsAlarm(0);
- ardAccessFenceService.access(ardAccessFence1);
- if(rtuType){
- //mqtt鍙戦�佹棦瀹歊tu鐘舵��
- feng(carId,"瑁呮补鐐�",carRtuService,lockService);
- break;
- }
- }
- }
- }else {
- //杞﹂�熸爣璁�
- Boolean stop = true;
- //鍒ゆ柇杞﹂��
- if(rtuType){
- if(speed>5){
- //mqtt鍙戦�佹棦瀹歊tu鐘舵��
- feng(carId,"鏂藉皝",carRtuService,lockService);
- stop = false;
- }
- }
- //杞﹁締鏈夊�间紭鍏堝垽鏂槸鍚︿负鎵嬪姩娣诲姞杞﹁締
- if(ardAccessFence.getIsAlarm() == 0 || ardAccessFence.getIsAlarm() == null){
- //杞﹁締闈炴墜鍔ㄦ坊鍔犳暟鎹紝鍒ゆ柇鏄惁鏈夎繘鍏ュ洿鏍廔D
- if(ardAccessFence.getIntoShipmentId()==null){
- //娌℃湁杩涘叆瑁呮补鐐癸紝璧嬪�肩粡绾害
- ardAccessFence.setLng(lng);
- ardAccessFence.setLat(lat);
- //鍒ゆ柇鏄惁杩涘叆瑁呮补鐐瑰洿鏍�
- for (int i = 0; i < ardOilWalls.size(); i++) {
- pts.clear();
- ArdOilWall ardOilWall = ardOilWalls.get(i);
- String[] coord = ardOilWall.getCoord().split(",");
- for (int j = 0; j < coord.length; j = j + 3) {
- pts.add(new Point2D.Double(Double.parseDouble(coord[j]), Double.parseDouble(coord[j+1])));
- }
- if(GeoTools.IsPtInPoly(point, pts)){
- //杩涘叆瑁呮补鐐瑰叆搴�
- ardAccessFence.setIntoShipmentId(ardOilWall.getId());
- ardAccessFence.setIntoShipmentTime(time);
- ardAccessFence.setNowWallName("杩涘叆瑁呮补鐐癸細"+ardOilWall.getName());
- ardAccessFence.setLastTime(time);
- if(rtuType){
- if(stop){
- //mqtt鍙戦�佹棦瀹歊tu鐘舵��
- feng(carId,"瑁呮补鐐�",carRtuService,lockService);
- }
- }
- break;
- }
- }
- ardAccessFenceService.updAccess(ardAccessFence);
- }else {
- //濡傛灉鏈夎繘鍏ュ洿鏍廔D锛屽垽鏂槸鍚﹀紑鍑鸿娌圭偣
- String out = ardAccessFence.getOutShipmentId();
- //鍑鸿娌圭偣ID涓虹┖
- if(out == null){
- //杞﹁締鏈紑鍑鸿娌圭偣,鍒ゆ柇鏄惁寮�鍑鸿娌圭偣
- String into = ardAccessFence.getIntoShipmentId();
- ArdOilWall ardOilWall = ardOilWallService.one(into);
- pts.clear();
- String[] coord = ardOilWall.getCoord().split(",");
- for (int j = 0; j < coord.length; j = j + 3) {
- pts.add(new Point2D.Double(Double.parseDouble(coord[j]), Double.parseDouble(coord[j + 1])));
- }
- if (!GeoTools.IsPtInPoly(point, pts)) {
- //杞﹁締寮�鍑鸿娌圭偣
- ardAccessFence.setOutShipmentId(into);
- ardAccessFence.setOutShipmentTime(time);
- ardAccessFence.setNowWallName("寮�鍑鸿娌圭偣锛�"+ardOilWall.getName());
- ardAccessFence.setLastTime(time);
- ardAccessFence.setLng(lng);
- ardAccessFence.setLat(lat);
- ardAccessFenceService.updAccess(ardAccessFence);
- if(rtuType){
- //寮�鍑鸿娌圭偣鍥存爮锛屽彂閫佷笂閿佸強鏂藉皝鍛戒护
- feng(carId,"鏂藉皝",carRtuService,lockService);
- }
- }
- }else {
- //杞﹁締宸茬粡寮�鍑鸿娌圭偣锛屾煡鐪嬫槸鍚︽湁鍗告补鐐笽D
- String unload = ardAccessFence.getIntoUnloadId();
- //濡傛灉unload涓虹┖锛屽垽鏂槸鍚﹁繘鍏ュ嵏娌圭偣
- if (unload == null) {
- //杞﹁締鏈繘鍏ュ嵏娌圭偣
- List<ArdOilWall> ardOilWallUpload = ardOilWallService.uploadAll();
- //鏄惁鍦ㄨ矾涓�
- Boolean isRoad = true;
- //鍒ゆ柇鏄惁杩涘幓鍗告补鐐�
- for (int i = 0; i < ardOilWallUpload.size(); i++) {
- pts.clear();
- ArdOilWall ardOilWall = ardOilWallUpload.get(i);
- String[] coord = ardOilWall.getCoord().split(",");
- for (int j = 0; j < coord.length; j = j + 3) {
- pts.add(new Point2D.Double(Double.parseDouble(coord[j]), Double.parseDouble(coord[j + 1])));
- }
- if (GeoTools.IsPtInPoly(point, pts)) {
- //杩涘叆鍗告补鐐�,瀛樺叆鍗告补鐐瑰洿鏍廔D
- ardAccessFence.setIntoUnloadId(ardOilWall.getId());
- ardAccessFence.setIntoUnloadTime(time);
- ardAccessFence.setLng(lng);
- ardAccessFence.setLat(lat);
- ardAccessFence.setNowWallName("杩涘叆鍗告补鐐癸細"+ardOilWall.getName());
- ardAccessFence.setLastTime(time);
- ardAccessFenceService.updAccess(ardAccessFence);
- //宸茬粡杩涘叆鍗告补鐐癸紝涓嶅湪璺笂涓嶉渶瑕佸仠杞︽姤璀�
- isRoad = false;
- if(rtuType){
- if(stop){
- //mqtt鍙戦�佹棦瀹歊tu鐘舵��
- feng(carId,"鍗告补鐐�",carRtuService,lockService);
- }
- }
- break;
- }
- }
- //涓嶅湪鍗告补鐐瑰氨鏄湪璺笂
- if(isRoad){
- //鎵�鍦ㄥ洿鏍忓悕绉拌祴null
- ardAccessFence.setNowWallName("鍦ㄨ矾涓�");
- //濡傛灉鍦ㄨ矾涓婂垽鏂潗鏍囨槸鍚︿笌涓婃涓�鏍�
- if(ardAccessFence.getLng().equals(lng) && ardAccessFence.getLat().equals(lat)){
- if(ardAccessFence.getLastTime()!=null){
- if(timeType){
- //濡傛灉鍧愭爣涓�鏍风浉鍑�
- 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 {
- log.debug(carId+"鍙疯溅瀹氫綅鏃堕棿涓虹┖");
- }
- }else {
- ardAccessFence.setLastTime(time);
- ardAccessFenceService.updAccess(ardAccessFence);
- }
- }else {
- //濡傛灉涓嶄竴鏍锋洿鏂板潗鏍�
- ardAccessFence.setLat(lat);
- ardAccessFence.setLng(lng);
- ardAccessFence.setLastTime(time);
- ardAccessFenceService.updAccess(ardAccessFence);
- }
- }
- }else {
- //杞﹁締宸茬粡杩涘叆鍗告补鐐癸紝鍒ゆ柇鏄惁宸茬粡寮�鍑哄嵏娌圭偣
- ArdOilWall ardOilWall = ardOilWallService.one(unload);
- pts.clear();
- String[] coord = ardOilWall.getCoord().split(",");
- for (int j = 0; j < coord.length; j = j + 3) {
- pts.add(new Point2D.Double(Double.parseDouble(coord[j]), Double.parseDouble(coord[j + 1])));
- }
- if (!GeoTools.IsPtInPoly(point, pts)) {
- if(rtuType){
- //寮�鍑轰簡鍗告补鐐瑰洿鏍忥紝鍙戦�佷笂閿佸強鏂借В灏佹寚浠�
- feng(carId,"鏂藉皝",carRtuService,lockService);
- }
- //鍒犻櫎璇ユ潯杞﹁締鏁版嵁
- ardAccessFenceService.delAccess(carId);
- }else {
- //鏈紑鍑哄嵏娌圭偣锛屾洿鏂扮粡绾害淇濆瓨
- ardAccessFence.setLng(lng);
- ardAccessFence.setLat(lat);
- ardAccessFence.setLastTime(time);
- ardAccessFenceService.updAccess(ardAccessFence);
- }
- }
- }
- }
- }else
- if(ardAccessFence.getIsAlarm()==1){
- //1涓烘墜鍔ㄦ坊鍔犺溅杈嗘棤闇�鎶ヨ淇℃伅锛屾洿鏂颁綅缃嵆鍙�
- ardAccessFence.setLng(lng);
- ardAccessFence.setLat(lat);
- ardAccessFenceService.updAccess(ardAccessFence);
- }else if(ardAccessFence.getIsAlarm() == 2){
- //2涓烘墜鍔ㄦ坊鍔犳姤璀﹁溅杈嗘湁鎶ヨ锛屾墍鍦ㄥ洿鏍忓悕绉拌祴null,鎺掓煡鎶ヨ淇℃伅,鍙渶澶勭悊璺笂鎯呭喌
- ardAccessFence.setNowWallName(null);
- //濡傛灉鍦ㄨ矾涓婂垽鏂潗鏍囨槸鍚︿笌涓婃涓�鏍�
- if(ardAccessFence.getLng().equals(lng) && ardAccessFence.getLat().equals(lat)){
- if(timeType){
- 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){
- //鎶ヨ瀛楁涓�1鎻愮ず鎶ヨ
- ardAccessFence.setIsWarning(1);
- ardAccessFence.setAlarmLat(lat);
- ardAccessFence.setAlarmLng(lng);
- ardAccessFenceService.updAccess(ardAccessFence);
- }
- }
- }else {
- log.debug(carId+"鍙疯溅瀹氫綅鏃堕棿涓虹┖");
- }
- }else {
- //濡傛灉涓嶄竴鏍锋洿鏂板潗鏍�
- ardAccessFence.setLat(lat);
- ardAccessFence.setLng(lng);
- ardAccessFence.setLastTime(time);
- ardAccessFenceService.updAccess(ardAccessFence);
- }
- }
- }
- //娓呮筏缁撴潫------------
- }catch(Exception e){
- }*/
-
- if(PositionContainer.getTankCarParkingAlarmTHread().get(carId) == null){
+ if(PositionContainer.getTankCarParkingAlarmTHread().get(carId) == null){//寮傚父鍋滆溅绾跨▼
Thread tankCarParkingAlarmThread = new Thread(){//鍒涘缓绾跨▼鍒ゆ柇缃愯溅寮傚父鍋滆溅鎶ヨ
@Override
public void run() {
@@ -388,13 +99,13 @@
}
- /*Thread autoProcessThread = new Thread(){//鑷姩鎿嶆帶绾跨▼
+ Thread autoProcessThread = new Thread(){//鑷姩鎿嶆帶绾跨▼
@Override
public void run() {
- ((ArdTankLockProcessLogServiceImpl)SpringUtils.getBean("ardTankLockProcessLogServiceImpl")).autoProcessArdTankLockByLockId(ip, userId, password, gpsMap);
+ ((ArdTankLockProcessLogServiceImpl)SpringUtils.getBean("ardTankLockProcessLogServiceImpl")).autoProcessArdTankLockByLockId(gpsMap);
}
};
- autoProcessThread.start();*/
+ autoProcessThread.start();
gpsMap.putAll(result);
String ancestors = (String) gpsMap.get("ancestors");//鑾峰彇鐖剁骇閮ㄩ棬
--
Gitblit v1.9.3