From 9790a81eba8f0ffb88324c2dd92ad886d12fc910 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: Fri, 10 Nov 2023 15:26:57 +0800
Subject: [PATCH] 清淤逻辑优化
---
ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarRtuService.java | 2
ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttOnce.java | 27 ++++++--
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | 3 +
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java | 103 ++++++++++++++++++---------------
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java | 9 --
5 files changed, 81 insertions(+), 63 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
index bd1d29e..86c0509 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.sy.domain.ArdAccessFence;
import com.ruoyi.sy.domain.ArdSyCarLock;
import com.ruoyi.sy.domain.ArdSyCarRtu;
@@ -10,10 +11,12 @@
import com.ruoyi.sy.mapper.ArdAccessFenceMapper;
import com.ruoyi.sy.param.AddCarParam;
import com.ruoyi.sy.service.*;
+import com.ruoyi.sy.service.impl.ArdSyCarRtuServiceImpl;
import com.ruoyi.sy.vo.CarLockVo;
import com.ruoyi.sy.vo.CarVo;
import com.ruoyi.sy.vo.RtuVo;
import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.utils.mqtt.MqttConsumer;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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 1dc9796..e726cf5 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
@@ -16,7 +16,9 @@
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.sy.domain.*;
import com.ruoyi.sy.service.ArdAccessFenceService;
+import com.ruoyi.sy.service.ArdAccessNumService;
import com.ruoyi.sy.service.ArdOilWallService;
+import com.ruoyi.sy.service.ArdSyCarRtuService;
import com.ruoyi.sy.service.impl.*;
import com.ruoyi.utils.gps.GeoTools;
import com.ruoyi.utils.mqtt.MqttConsumer;
@@ -94,10 +96,18 @@
//定义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);
+ //注入电子锁Bean
+ ArdSyCarRtuService carRtuService = SpringUtils.getBean(ArdSyCarRtuService.class);
//查询定位油车表中是否有该车辆
- ArdAccessFence ardAccessFence = SpringUtils.getBean(ArdAccessFenceService.class).queryAccess(carId);
+ ArdAccessFence ardAccessFence = ardAccessFenceService.queryAccess(carId);
//查询所有装油点围栏
- List<ArdOilWall> ardOilWalls = SpringUtils.getBean(ArdOilWallService.class).accessAll();
+ List<ArdOilWall> ardOilWalls = ardOilWallService.accessAll();
//如果没有说明车辆未进入装油点，需要匹配所有装油点围栏
if(ardAccessFence==null){
//车辆未进入装油点
@@ -125,17 +135,20 @@
ardAccessFence1.setCarModel(carModel);
ardAccessFence1.setIsWarning(0);
ardAccessFence1.setDrct(drct);
- ((ArdAccessFenceServiceImpl)SpringUtils.getBean("ArdAccessFenceServiceImpl")).access(ardAccessFence1);
+ ardAccessFence1.setIsAlarm(0);
+ ardAccessFenceService.access(ardAccessFence1);
break;
}
}
}else {
- //判断是否为手动添加车辆
- if(ardAccessFence.getIsAlarm()==0){
+ //带锁车辆有值优先判断是否为手动添加车辆
+ if(ardAccessFence.getIsAlarm()==1){
+ //1为手动添加车辆无需报警信息，更新位置即可
ardAccessFence.setLng(lng);
ardAccessFence.setLat(lat);
- ((ArdAccessFenceServiceImpl)SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
- }else if(ardAccessFence.getIsAlarm() == 1){
+ ardAccessFenceService.updAccess(ardAccessFence);
+ }else if(ardAccessFence.getIsAlarm() == 2){
+ //2为手动添加报警车辆有报警，所在围栏名称赋null,排查报警信息,只需处理路上情况
ardAccessFence.setNowWallName(null);
//如果在路上判断坐标是否与上次一样
if(ardAccessFence.getLng().equals(lng) && ardAccessFence.getLat().equals(lat)){
@@ -144,14 +157,15 @@
Date nowTime = sdf.parse(time);
Date lastTime = sdf.parse(ardAccessFence.getLastTime());
Long diff = (nowTime.getTime() - lastTime.getTime())/1000;
- ArdAccessNum list = ((ArdAccessNumServiceImpl) SpringUtils.getBean("ArdAccessNumServiceImpl")).queryNum();
+ ArdAccessNum list = accessNumService.queryNum();
if(list==null){
int alarm = list.getAlarm();
if(diff>=alarm){
+ //报警字段为1提示报警
ardAccessFence.setIsWarning(1);
ardAccessFence.setAlarmLat(lat);
ardAccessFence.setAlarmLng(lng);
- ((ArdAccessFenceServiceImpl) SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
+ ardAccessFenceService.updAccess(ardAccessFence);
}
}
}else {
@@ -159,13 +173,15 @@
ardAccessFence.setLat(lat);
ardAccessFence.setLng(lng);
ardAccessFence.setLastTime(time);
- ((ArdAccessFenceServiceImpl) SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
+ ardAccessFenceService.updAccess(ardAccessFence);
}
- }else {
- //如果车辆有数据判断是否有进入围栏ID，如果没有更新或赋值经纬度，判断是否进入围栏
+ }else if(ardAccessFence.getIsAlarm() == 0 || ardAccessFence.getIsAlarm() == null){
+ //车辆非手动添加数据，判断是否有进入围栏ID
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);
@@ -182,13 +198,15 @@
break;
}
}
+ ardAccessFenceService.updAccess(ardAccessFence);
}else {
//如果有进入围栏ID，判断是否开出装油点
String out = ardAccessFence.getOutShipmentId();
+ //出装油点ID为空
if(out == null){
- //车辆未开出装油点
+ //车辆未开出装油点,判断是否开出装油点
String into = ardAccessFence.getIntoShipmentId();
- ArdOilWall ardOilWall = SpringUtils.getBean(ArdOilWallService.class).one(into);
+ ArdOilWall ardOilWall = ardOilWallService.one(into);
pts.clear();
String[] coord = ardOilWall.getCoord().split(",");
for (int j = 0; j < coord.length; j = j + 3) {
@@ -200,17 +218,22 @@
ardAccessFence.setOutShipmentTime(time);
ardAccessFence.setNowWallName(ardOilWall.getName());
ardAccessFence.setLastTime(time);
+ ardAccessFence.setLng(lng);
+ ardAccessFence.setLat(lat);
+ ardAccessFenceService.updAccess(ardAccessFence);
+//开出装油点围栏，发送上锁及施封命令
+
+
+
+
}
- ardAccessFence.setLng(lng);
- ardAccessFence.setLat(lat);
- ((ArdAccessFenceServiceImpl) SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
}else {
- //车辆已经开出装油点，判断是否进入卸油点
+ //车辆已经开出装油点，查看是否有卸油点ID
String unload = ardAccessFence.getIntoUnloadId();
//如果unload为空，判断是否进入卸油点
if (unload == null) {
//车辆未进入卸油点
- List<ArdOilWall> ardOilWallUpload = ((ArdOilWallServiceImpl)SpringUtils.getBean("ArdOilWallServiceImpl")).uploadAll();
+ List<ArdOilWall> ardOilWallUpload = ardOilWallService.uploadAll();
//是否在路上
Boolean isRoad = true;
//判断是否进去卸油点
@@ -229,24 +252,15 @@
ardAccessFence.setLat(lat);
ardAccessFence.setNowWallName(ardOilWall.getName());
ardAccessFence.setLastTime(time);
- ((ArdAccessFenceServiceImpl) SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
- //发送解封指令
- ArdSyCarRtu ardSyCarRtu = ((ArdSyCarRtuServiceImpl) SpringUtils.getBean("ArdSyCarRtuServiceImpl")).one(carId);
- if(ardSyCarRtu!=null){
- Map<String,Object> map = new HashMap<>();
- map.put("A01", 110000);//导通第一路继电器
-// map.put("A02", 110000);//导通第二路继电器
- map.put("res", String.valueOf(System.currentTimeMillis()));
- MqttConsumer.publish(ardSyCarRtu.getTopicSubscribe(), String.valueOf(new JSONObject(map)));
- }else {
- log.error("车辆"+carId+"无锁状态");
- }
+ ardAccessFenceService.updAccess(ardAccessFence);
//已经进入卸油点，不在路上不需要停车报警
isRoad = false;
break;
}
}
+ //不在卸油点就是在路上
if(isRoad){
+ //所在围栏名称赋null
ardAccessFence.setNowWallName(null);
//如果在路上判断坐标是否与上次一样
if(ardAccessFence.getLng().equals(lng) && ardAccessFence.getLat().equals(lat)){
@@ -255,14 +269,14 @@
Date nowTime = sdf.parse(time);
Date lastTime = sdf.parse(ardAccessFence.getLastTime());
Long diff = (nowTime.getTime() - lastTime.getTime())/1000;
- ArdAccessNum list = ((ArdAccessNumServiceImpl) SpringUtils.getBean("ArdAccessNumServiceImpl")).queryNum();
+ ArdAccessNum list = accessNumService.queryNum();
if(list==null){
int alarm = list.getAlarm();
if(diff>=alarm){
ardAccessFence.setIsWarning(1);
ardAccessFence.setAlarmLat(lat);
ardAccessFence.setAlarmLng(lng);
- ((ArdAccessFenceServiceImpl) SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
+ ardAccessFenceService.updAccess(ardAccessFence);
}
}
}else {
@@ -270,35 +284,30 @@
ardAccessFence.setLat(lat);
ardAccessFence.setLng(lng);
ardAccessFence.setLastTime(time);
- ((ArdAccessFenceServiceImpl) SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
+ ardAccessFenceService.updAccess(ardAccessFence);
}
}
}else {
//车辆已经进入卸油点，判断是否已经开出卸油点
- ArdOilWall ardOilWall = ((ArdOilWallServiceImpl) SpringUtils.getBean("ArdOilWallServiceImpl")).one(unload);
+ 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)) {
- //开出了卸油点围栏，删除该条车辆数据
- //发送解封指令
- ArdSyCarRtu ardSyCarRtu = ((ArdSyCarRtuServiceImpl) SpringUtils.getBean("ArdSyCarRtuServiceImpl")).one(carId);
- if(ardSyCarRtu!=null) {
- Map<String, Object> map = new HashMap<>();
- map.put("A01", 100000);//断开第一路继电器
-// map.put("A02", 100000);//断开第二路继电器
- map.put("res", String.valueOf(System.currentTimeMillis()));
- MqttConsumer.publish(ardSyCarRtu.getTopicSubscribe(), String.valueOf(new JSONObject(map)));
- }
- ((ArdAccessFenceServiceImpl) SpringUtils.getBean("ArdAccessFenceServiceImpl")).delAccess(carId);
+//开出了卸油点围栏，发送上锁及施解封指令
+
+
+
+ //删除该条车辆数据
+ ardAccessFenceService.delAccess(carId);
}else {
//未开出卸油点，更新经纬度保存
ardAccessFence.setLng(lng);
ardAccessFence.setLat(lat);
ardAccessFence.setLastTime(time);
- ((ArdAccessFenceServiceImpl)SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
+ ardAccessFenceService.updAccess(ardAccessFence);
}
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarRtuService.java b/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarRtuService.java
index f88c5da..0fd028f 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarRtuService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarRtuService.java
@@ -9,7 +9,7 @@
*/
public interface ArdSyCarRtuService {
- String[] allCarTopic();
+ List<ArdSyCarRtu> allCarTopic();
ArdSyCarRtu one(String carId);
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java
index 3f2436f..8f94e14 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java
@@ -22,13 +22,8 @@
private ArdSyCarRtuMapper ardSyCarRtuMapper;
@Override
- public String[] allCarTopic() {
- List<ArdSyCarRtu> carRtus = ardSyCarRtuMapper.selectList(null);
- List<String> list = new ArrayList<>();
- for (int i = 0; i < carRtus.size(); i++) {
- list.add(carRtus.get(i).getTopicPublish());
- }
- return list.toArray(new String[list.size()]);
+ public List<ArdSyCarRtu> allCarTopic() {
+ return ardSyCarRtuMapper.selectList(null);
}
@Override
diff --git a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttOnce.java b/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttOnce.java
index e5e2825..b07a18b 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttOnce.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttOnce.java
@@ -3,11 +3,13 @@
import com.ruoyi.sy.domain.ArdSyCarRtu;
import com.ruoyi.sy.mapper.ArdSyCarRtuMapper;
import com.ruoyi.sy.service.ArdSyCarRtuService;
+import com.ruoyi.system.service.ISysConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.stereotype.Component;
+import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -17,18 +19,27 @@
*/
@Slf4j
@Component
-public class MqttOnce implements CommandLineRunner {
+public class MqttOnce{
@Autowired
private ArdSyCarRtuService ardSyCarRtuService;
- @Override
- public void run(String... args) throws Exception {
- String[] topic = ardSyCarRtuService.allCarTopic();
- MqttConsumer mqttConsumer = new MqttConsumer();
- for (int i = 0; i < topic.length; i++) {
- mqttConsumer.subscribe(topic[i],2);
+ @Autowired
+ private ISysConfigService sysConfigService;
+
+ @PostConstruct
+ public void init() {
+ //获取电磁锁地址
+ String mqttUrl = sysConfigService.selectConfigByKey("ElectromagneticLockUrl");
+ List<ArdSyCarRtu> rtus = ardSyCarRtuService.allCarTopic();
+ for (int i = 0; i < rtus.size(); i++) {
+ ArdSyCarRtu rtu = rtus.get(i);
+ String publish = rtu.getTopicPublish();
}
- log.info("mqtt订阅清淤车辆锁信息："+Arrays.toString(topic));
+// MqttConsumer mqttConsumer = new MqttConsumer();
+// for (int i = 0; i < topic.length; i++) {
+// mqttConsumer.subscribe(topic[i],2);
+// }
+// log.info("mqtt订阅清淤车辆锁信息："+Arrays.toString(topic));
}
}
--
Gitblit v1.9.3