~liusuyi/ruoyi-api.git

			@@ -20,6 +20,7 @@
			import com.ruoyi.utils.qymqtt.newM.EmqClient;
			import com.ruoyi.utils.qymqtt.newM.QosEnum;
			import com.ruoyi.utils.qymqtt.oldM.MqttCustomerClient;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.logging.Log;
			import org.apache.commons.logging.LogFactory;
			import org.eclipse.paho.client.mqttv3.MqttException;
			@@ -35,9 +36,10 @@
			* @author chencq
			* @version 1.0
			*/
			@Slf4j(topic = "mqttCar")
			public class PushClientImplPosition extends PushClient implements Runnable {

			private static final Log log = LogFactory.getLog(PushClientImplPosition.class);
			// private static final Log log = LogFactory.getLog(PushClientImplPosition.class);

			private String ip;

			@@ -78,9 +80,8 @@
			/*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.debug(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){
			@@ -89,13 +90,25 @@
			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 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");
			log.debug("定位数据：carId:"+carId+"lng:"+lng+"lat:"+lat);
			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("定位数据：车辆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>();
			@@ -114,7 +127,7 @@
			//查询所有装油点围栏
			List<ArdOilWall> ardOilWalls = ardOilWallService.accessAll();
			//日期格式
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
			//如果没有说明车辆未进入装油点，需要匹配所有装油点围栏
			if(ardAccessFence==null){
			//车辆未进入装油点
			@@ -144,21 +157,25 @@
			ardAccessFence1.setDrct(drct);
			ardAccessFence1.setIsAlarm(0);
			ardAccessFenceService.access(ardAccessFence1);
			//mqtt发送既定Rtu状态
			feng(carId,"装油点",carRtuService,lockService);
			break;
			if(rtuType){
			//mqtt发送既定Rtu状态
			feng(carId,"装油点",carRtuService,lockService);
			break;
			}
			}
			}
			}else {
			//车速标记
			Boolean stop = true;
			//判断车速
			if(speed>5){
			//mqtt发送既定Rtu状态
			feng(carId,"施封",carRtuService,lockService);
			stop = false;
			if(rtuType){
			if(speed>5){
			//mqtt发送既定Rtu状态
			feng(carId,"施封",carRtuService,lockService);
			stop = false;
			}
			}
			//带锁车辆有值优先判断是否为手动添加车辆
			//车辆有值优先判断是否为手动添加车辆
			if(ardAccessFence.getIsAlarm()==1){
			//1为手动添加车辆无需报警信息，更新位置即可
			ardAccessFence.setLng(lng);
			@@ -169,19 +186,23 @@
			ardAccessFence.setNowWallName(null);
			//如果在路上判断坐标是否与上次一样
			if(ardAccessFence.getLng().equals(lng) && ardAccessFence.getLat().equals(lat)){
			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(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 {
			//如果不一样更新坐标
			@@ -210,9 +231,11 @@
			ardAccessFence.setIntoShipmentTime(time);
			ardAccessFence.setNowWallName("进入装油点："+ardOilWall.getName());
			ardAccessFence.setLastTime(time);
			if(stop){
			//mqtt发送既定Rtu状态
			feng(carId,"装油点",carRtuService,lockService);
			if(rtuType){
			if(stop){
			//mqtt发送既定Rtu状态
			feng(carId,"装油点",carRtuService,lockService);
			}
			}
			break;
			}
			@@ -240,8 +263,10 @@
			ardAccessFence.setLng(lng);
			ardAccessFence.setLat(lat);
			ardAccessFenceService.updAccess(ardAccessFence);
			//开出装油点围栏，发送上锁及施封命令
			feng(carId,"施封",carRtuService,lockService);
			if(rtuType){
			//开出装油点围栏，发送上锁及施封命令
			feng(carId,"施封",carRtuService,lockService);
			}
			}
			}else {
			//车辆已经开出装油点，查看是否有卸油点ID
			@@ -271,9 +296,11 @@
			ardAccessFenceService.updAccess(ardAccessFence);
			//已经进入卸油点，不在路上不需要停车报警
			isRoad = false;
			if(stop){
			//mqtt发送既定Rtu状态
			feng(carId,"卸油点",carRtuService,lockService);
			if(rtuType){
			if(stop){
			//mqtt发送既定Rtu状态
			feng(carId,"卸油点",carRtuService,lockService);
			}
			}
			break;
			}
			@@ -285,19 +312,23 @@
			//如果在路上判断坐标是否与上次一样
			if(ardAccessFence.getLng().equals(lng) && ardAccessFence.getLat().equals(lat)){
			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);
			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);
			@@ -320,8 +351,10 @@
			pts.add(new Point2D.Double(Double.parseDouble(coord[j]), Double.parseDouble(coord[j + 1])));
			}
			if (!GeoTools.IsPtInPoly(point, pts)) {
			//开出了卸油点围栏，发送上锁及施解封指令
			feng(carId,"施封",carRtuService,lockService);
			if(rtuType){
			//开出了卸油点围栏，发送上锁及施解封指令
			feng(carId,"施封",carRtuService,lockService);
			}
			//删除该条车辆数据
			ardAccessFenceService.delAccess(carId);
			}else {