From b420562862a0cd3899490e87cdd48cc075bc8544 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: Tue, 05 Dec 2023 09:26:58 +0800
Subject: [PATCH] 清淤BUG修改
---
ard-work/src/main/java/com/ruoyi/utils/qymqtt/newM/MessageCallback.java | 6
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 6
ard-work/src/main/java/com/ruoyi/utils/qymqtt/AutoMqtt.java | 2
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java | 3
ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml | 2
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java | 592 +++++++++++++++++++++++++++--------------------------
6 files changed, 313 insertions(+), 298 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 e34debc..764b72d 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,253 +78,257 @@
/*String carName = MapUtil.getStrVal(gpsMap, "carName","");//获取车牌号
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
System.out.println(sdf.format(new Date()));*/
-// log.error(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){
- //清淤开始----------
- 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("result");//定位时间
- 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");
- //定义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);
- //注入锁Bean
- ArdSyCarLockService lockService = SpringUtils.getBean(ArdSyCarLockService.class);
- //查询定位油车表中是否有该车辆
- ArdAccessFence ardAccessFence = ardAccessFenceService.queryAccess(carId);
- //查询所有装油点围栏
- List<ArdOilWall> ardOilWalls = ardOilWallService.accessAll();
- //车速标记
- Boolean stop = true;
- //判断车速
- if(speed>5){
- //mqtt发送既定Rtu状态
- feng(carId,"施封",carRtuService,lockService);
- stop = false;
- }
- //如果没有说明车辆未进入装油点，需要匹配所有装油点围栏
- 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(stop){
- //mqtt发送既定Rtu状态
- feng(carId,"装油点",carRtuService,lockService);
- }
- break;
- }
+ if("30".equals(carId)){
+ //清淤开始----------
+ 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("result");//定位时间
+ 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");
+ log.info("carId:"+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);
+ //注入电子锁Bean
+ ArdSyCarRtuService carRtuService = SpringUtils.getBean(ArdSyCarRtuService.class);
+ //注入锁Bean
+ ArdSyCarLockService lockService = SpringUtils.getBean(ArdSyCarLockService.class);
+ //查询定位油车表中是否有该车辆
+ ArdAccessFence ardAccessFence = ardAccessFenceService.queryAccess(carId);
+ //查询所有装油点围栏
+ List<ArdOilWall> ardOilWalls = ardOilWallService.accessAll();
+ //车速标记
+ Boolean stop = true;
+ //判断车速
+ if(speed>5){
+ //mqtt发送既定Rtu状态
+ feng(carId,"施封",carRtuService,lockService);
+ stop = false;
}
- }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)){
- //如果坐标一样时间相减
- 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){
- //报警字段为1提示报警
- ardAccessFence.setIsWarning(1);
- ardAccessFence.setAlarmLat(lat);
- ardAccessFence.setAlarmLng(lng);
- ardAccessFenceService.updAccess(ardAccessFence);
- }
+ //如果没有说明车辆未进入装油点，需要匹配所有装油点围栏
+ 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])));
}
- }else {
- //如果不一样更新坐标
- ardAccessFence.setLat(lat);
- ardAccessFence.setLng(lng);
- ardAccessFence.setLastTime(time);
- ardAccessFenceService.updAccess(ardAccessFence);
+ 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(stop){
+ //mqtt发送既定Rtu状态
+ feng(carId,"装油点",carRtuService,lockService);
+ }
+ break;
+ }
}
- }else if(ardAccessFence.getIsAlarm() == 0 || ardAccessFence.getIsAlarm() == null){
- //车辆非手动添加数据，判断是否有进入围栏ID
- if(ardAccessFence.getIntoShipmentId()==null){
- //没有进入装油点，赋值经纬度
+ }else {
+ //带锁车辆有值优先判断是否为手动添加车辆
+ if(ardAccessFence.getIsAlarm()==1){
+ //1为手动添加车辆无需报警信息，更新位置即可
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(stop){
- //mqtt发送既定Rtu状态
- feng(carId,"装油点",carRtuService,lockService);
- }
- break;
- }
- }
ardAccessFenceService.updAccess(ardAccessFence);
- }else {
- //如果有进入围栏ID，判断是否开出装油点
- 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);
- //开出装油点围栏，发送上锁及施封命令
- feng(carId,"施封",carRtuService,lockService);
+ }else if(ardAccessFence.getIsAlarm() == 2){
+ //2为手动添加报警车辆有报警，所在围栏名称赋null,排查报警信息,只需处理路上情况
+ 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;
+ 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 {
- //车辆已经开出装油点，查看是否有卸油点ID
- 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)) {
- //进入卸油点,存入卸油点围栏ID
- 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(stop){
- //mqtt发送既定Rtu状态
- feng(carId,"卸油点",carRtuService,lockService);
- }
- break;
- }
+ //如果不一样更新坐标
+ ardAccessFence.setLat(lat);
+ ardAccessFence.setLng(lng);
+ ardAccessFence.setLastTime(time);
+ ardAccessFenceService.updAccess(ardAccessFence);
+ }
+ }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);
+ 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(isRoad){
- //所在围栏名称赋null
- 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;
- 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.setLat(lat);
- ardAccessFence.setLng(lng);
- ardAccessFence.setLastTime(time);
- ardAccessFenceService.updAccess(ardAccessFence);
+ if(GeoTools.IsPtInPoly(point, pts)){
+ //进入装油点入库
+ ardAccessFence.setIntoShipmentId(ardOilWall.getId());
+ ardAccessFence.setIntoShipmentTime(time);
+ ardAccessFence.setNowWallName(ardOilWall.getName());
+ ardAccessFence.setLastTime(time);
+ if(stop){
+ //mqtt发送既定Rtu状态
+ feng(carId,"装油点",carRtuService,lockService);
}
+ break;
}
- }else {
- //车辆已经进入卸油点，判断是否已经开出卸油点
- ArdOilWall ardOilWall = ardOilWallService.one(unload);
+ }
+ ardAccessFenceService.updAccess(ardAccessFence);
+ }else {
+ //如果有进入围栏ID，判断是否开出装油点
+ 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)) {
- //开出了卸油点围栏，发送上锁及施解封指令
- feng(carId,"施封",carRtuService,lockService);
- //删除该条车辆数据
- ardAccessFenceService.delAccess(carId);
- }else {
- //未开出卸油点，更新经纬度保存
+ //车辆开出装油点
+ ardAccessFence.setOutShipmentId(into);
+ ardAccessFence.setOutShipmentTime(time);
+ ardAccessFence.setNowWallName(ardOilWall.getName());
+ ardAccessFence.setLastTime(time);
ardAccessFence.setLng(lng);
ardAccessFence.setLat(lat);
- ardAccessFence.setLastTime(time);
ardAccessFenceService.updAccess(ardAccessFence);
+ //开出装油点围栏，发送上锁及施封命令
+ feng(carId,"施封",carRtuService,lockService);
+ }
+ }else {
+ //车辆已经开出装油点，查看是否有卸油点ID
+ 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)) {
+ //进入卸油点,存入卸油点围栏ID
+ 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(stop){
+ //mqtt发送既定Rtu状态
+ feng(carId,"卸油点",carRtuService,lockService);
+ }
+ break;
+ }
+ }
+ //不在卸油点就是在路上
+ if(isRoad){
+ //所在围栏名称赋null
+ 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;
+ 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.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)) {
+ //开出了卸油点围栏，发送上锁及施解封指令
+ feng(carId,"施封",carRtuService,lockService);
+ //删除该条车辆数据
+ ardAccessFenceService.delAccess(carId);
+ }else {
+ //未开出卸油点，更新经纬度保存
+ ardAccessFence.setLng(lng);
+ ardAccessFence.setLat(lat);
+ ardAccessFence.setLastTime(time);
+ ardAccessFenceService.updAccess(ardAccessFence);
+ }
}
}
}
@@ -435,82 +439,88 @@
private void feng(String carId,String type,ArdSyCarRtuService carRtuService,ArdSyCarLockService lockService) throws MqttException {
//查询装油点既定Rtu状态
ArdSyCarRtu ardSyCarRtu = carRtuService.one(carId);
- //查询锁信息
- List<ArdSyCarLock> ardSyCarLocks = lockService.carLock(ardSyCarRtu.getId());
- Integer fengType = null;
- if("装油点".equals(type)){
- fengType = ardSyCarRtu.getInstallType();
- }else if("卸油点".equals(type)){
- fengType = ardSyCarRtu.getUnloadType();
- }else if("施封".equals(type)){
- fengType = 0;
- }
- if(ardSyCarLocks.size()>0){
- //1解封
- if(fengType==1){
- //如果不是解封封状态，则发送施封命令
- 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);
- EmqClient emqClient = new EmqClient(carId+"mqttPublish"+UUID.randomUUID());
- emqClient.connect();
- emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
- log.info("车辆"+carId+"解封命令发送成功！");
-// mqttOnce.publishCar(carId,ardSyCarRtu.getTopicPublish(),String.valueOf(new JSONObject(map)),"解封");
+ if(ardSyCarRtu!=null){
+ //查询锁信息
+ List<ArdSyCarLock> ardSyCarLocks = lockService.carLock(ardSyCarRtu.getId());
+ if(ardSyCarLocks.size()>0){
+ Integer fengType = null;
+ if("装油点".equals(type)){
+ fengType = ardSyCarRtu.getInstallType();
+ }else if("卸油点".equals(type)){
+ fengType = ardSyCarRtu.getUnloadType();
+ }else if("施封".equals(type)){
+ fengType = 0;
}
- }
- //0施封
- if(fengType==0){
- //锁开关状态
- int lockCloseNum = 0;
- //如果不是施封状态，则发送施封命令
- if(ardSyCarLocks.get(0).getRelayInfo()==1){
- for (int j = 0; j < ardSyCarLocks.size(); j++) {
- ArdSyCarLock ardSyCarLock = ardSyCarLocks.get(j);
- String currents = ardSyCarLock.getCurrents();
- Double currentInfo = ardSyCarLock.getCurrentInfo();
- //电流值为4.0是关锁状态
- if(currentInfo.equals(4.00) || currentInfo.equals(4)){
- lockCloseNum += 1;
- }else {
- String key = "";
- if(currents.equals("C01")){
- key = "D03";
- }else if(currents.equals("C02")){
- key = "D04";
- }
- Map<String,Object> map = new HashMap();
- map.put(key, 0.01);
+ //1解封
+ if(fengType==1){
+ //如果不是解封封状态，则发送施封命令
+ 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);
EmqClient emqClient = new EmqClient(carId+"mqttPublish"+UUID.randomUUID());
emqClient.connect();
emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
-// mqttOnce.publishCar("carId",ardSyCarRtu.getTopicPublish(),String.valueOf(new JSONObject(map)),"开锁："+currents);
- while(true){
- ArdSyCarLock ardSyCarLock1 = lockService.getCurrentInfo(ardSyCarRtu.getId(),currents);
- Double currentInfo1 = ardSyCarLock1.getCurrentInfo();
- if(currentInfo1.equals(4.00) || currentInfo1.equals(4)){
- lockCloseNum +=1;
- break;
- }
- }
+ log.info("车辆"+carId+"解封命令发送成功！");
+ // mqttOnce.publishCar(carId,ardSyCarRtu.getTopicPublish(),String.valueOf(new JSONObject(map)),"解封");
}
}
- 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+"施封命令发送成功！");
-// mqttOnce.publishCar(carId,ardSyCarRtu.getTopicPublish(),String.valueOf(new JSONObject(map)),"施封");
+ }
+ //0施封
+ if(fengType==0){
+ //锁开关状态
+ int lockCloseNum = 0;
+ //如果不是施封状态，则发送施封命令
+ if(ardSyCarLocks.get(0).getRelayInfo()!=null){
+ if(ardSyCarLocks.get(0).getRelayInfo()==1){
+ for (int j = 0; j < ardSyCarLocks.size(); j++) {
+ ArdSyCarLock ardSyCarLock = ardSyCarLocks.get(j);
+ String currents = ardSyCarLock.getCurrents();
+ Double currentInfo = ardSyCarLock.getCurrentInfo();
+ //电流值为4.0是关锁状态
+ if(currentInfo.equals(4.00) || currentInfo.equals(4)){
+ lockCloseNum += 1;
+ }else {
+ String key = "";
+ if(currents.equals("C01")){
+ key = "D03";
+ }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);
+ EmqClient emqClient = new EmqClient(carId+"mqttPublish"+UUID.randomUUID());
+ emqClient.connect();
+ emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
+ // mqttOnce.publishCar("carId",ardSyCarRtu.getTopicPublish(),String.valueOf(new JSONObject(map)),"开锁："+currents);
+ while(true){
+ ArdSyCarLock ardSyCarLock1 = lockService.getCurrentInfo(ardSyCarRtu.getId(),currents);
+ Double currentInfo1 = ardSyCarLock1.getCurrentInfo();
+ if(currentInfo1.equals(4.00) || currentInfo1.equals(4)){
+ lockCloseNum +=1;
+ break;
+ }
+ }
+ }
+ }
+ 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+"施封命令发送成功！");
+ // mqttOnce.publishCar(carId,ardSyCarRtu.getTopicPublish(),String.valueOf(new JSONObject(map)),"施封");
+ }
+ }
}
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java
index da8ce6e..fe3e90b 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java
@@ -59,7 +59,8 @@
List<ArdAccessFence> list = ardAccessFenceMapper.selectList(null);
for (int i = 0; i < list.size(); i++) {
ArdAccessFence ardAccessFence = list.get(i);
- ardAccessFence.setCarModel(url+ardAccessFence.getCarModel());
+// ardAccessFence.setCarModel(url+ardAccessFence.getCarModel());
+ ardAccessFence.setCarModel(ardAccessFence.getCarModel());
}
return list;
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
index e9dab35..dca46eb 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -193,7 +193,11 @@
@Override
public List<CarVo> queryCar(List<String> list) {
QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
- queryWrapper.ne("reserved_1","").notIn("car_id",list);
+ if(list.size()>0){
+ queryWrapper.ne("reserved_1","").notIn("car_id",list);
+ }else {
+ queryWrapper.ne("reserved_1","");
+ }
List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
return carAnalysis(ardSyCars);
}
diff --git a/ard-work/src/main/java/com/ruoyi/utils/qymqtt/AutoMqtt.java b/ard-work/src/main/java/com/ruoyi/utils/qymqtt/AutoMqtt.java
index d6bff1d..fa9b91c 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/qymqtt/AutoMqtt.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/qymqtt/AutoMqtt.java
@@ -33,7 +33,7 @@
// MqttCustomerClient mqttCustomerClient = new MqttCustomerClient();
// mqttCustomerClient.connect(carId+"mqtt"+ UUID.randomUUID());
// mqttCustomerClient.subscribe(subscribe);
- EmqClient emqClient = new EmqClient(carId+"mqttSubscribe");
+ EmqClient emqClient = new EmqClient(carId+"mqttSubscribe"+UUID.randomUUID());
emqClient.connect();
emqClient.subscribe(subscribe, QosEnum.QoS2);
log.info("订阅主题："+subscribe);
diff --git a/ard-work/src/main/java/com/ruoyi/utils/qymqtt/newM/MessageCallback.java b/ard-work/src/main/java/com/ruoyi/utils/qymqtt/newM/MessageCallback.java
index 51bd311..3daf965 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/qymqtt/newM/MessageCallback.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/qymqtt/newM/MessageCallback.java
@@ -40,7 +40,7 @@
@Override //消息发布者消息发布完成产生的回调
public void deliveryComplete(IMqttDeliveryToken token) {
- System.out.println("deliveryComplete---------" + token.isComplete());
+ log.info("deliveryComplete---------" + token.isComplete());
int messageId = token.getMessageId();
String[] topics = token.getTopics();
String clientId = token.getClient().getClientId();
@@ -50,13 +50,13 @@
topicStr = topicStr + topic + ",";
}
topicStr = topicStr.substring(0, topicStr.length() - 1);
- System.out.println("消息发布完成,messageId="+messageId+",topics="+topicStr+",clientId="+clientId);
+ log.info("消息发布完成,messageId="+messageId+",topics="+topicStr+",clientId="+clientId);
}
@Override//消息订阅者收到消息后触发的回调
public void messageArrived(String topic, MqttMessage message) throws Exception {
try {
-// System.out.println("【车辆锁主题】："+topic+"【车辆锁信息】："+new String(message.getPayload(), StandardCharsets.UTF_8));
+ log.info("【车辆锁主题】："+topic+"【车辆锁信息】："+new String(message.getPayload(), StandardCharsets.UTF_8));
//出来回调数据
List<ArdSyCarLock> ardSyCarLocks = carLockService.data(new String(message.getPayload(), StandardCharsets.UTF_8));
//根据topic查询RTUID
diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
index 6f5aedd..67d8437 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
@@ -60,7 +60,7 @@
right join sys_user su on asu.sys_user_id = su.user_id
<where>
<if test="sysUserId != null and sysUserId != ''"> and sys_user_id = #{sysUserId}</if>
- <if test="userId != null and userId != ''"> and user_id = #{userId}</if>
+ <if test="userId != null and userId != ''"> and asu.user_id = #{userId}</if>
<if test="password != null and password != ''"> and password = #{password}</if>
<if test="reserved1 != null and reserved1 != ''"> and reserved_1 = #{reserved1}</if>
<if test="reserved2 != null and reserved2 != ''"> and reserved_2 = #{reserved2}</if>
--
Gitblit v1.9.3