From fdfa8b3b237d8bba8964bda67364f54c08d79432 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 18 七月 2025 16:17:17 +0800
Subject: [PATCH] 修改生产环境配置
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ExgMsgService.java | 218 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 138 insertions(+), 80 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ExgMsgService.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ExgMsgService.java
index 5fbf7fd..453684a 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ExgMsgService.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ExgMsgService.java
@@ -1,6 +1,7 @@
package com.ruoyi.dataInterchange.server;
import com.alibaba.fastjson.JSON;
+import com.ruoyi.dataInterchange.api.vo.GnssDataVo;
import com.ruoyi.dataInterchange.dao.*;
import com.ruoyi.dataInterchange.model.*;
import com.ruoyi.dataInterchange.model.enu.DataType;
@@ -12,6 +13,7 @@
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -19,6 +21,7 @@
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.Iterator;
+import java.util.List;
/**
* @author zhibing.pu
@@ -52,47 +55,47 @@
public void up_exg_msg(ChannelHandlerContext ctx, OuterPacket out) {
if (!redisTemplate.hasKey("login:" + out.getGnsscenterId())) {
- log.error("链路还未登录校验，拒绝连接");
+ log.error("链路还未登录校验，拒绝连接：{}", out.getGnsscenterId());
ctx.close();
return;
}
UPExgMsg exgMsg = getExgMsg(out);
DataType dataType = DataType.getDataType(exgMsg.getDataType());
- log.info("主链路车辆动态信息交换子业务({})：{}", dataType.getCode(), out);
+ log.debug("主链路车辆动态信息交换子业务({})：{}", dataType.getCode(), out);
switch (dataType) {
case UP_EXG_MSG_REGISTER:
- log.info("上传车辆注册信息({})：{}", DataType.UP_EXG_MSG_REGISTER.getCode(), out);
+ log.debug("上传车辆注册信息({})：{}", DataType.UP_EXG_MSG_REGISTER.getCode(), out);
up_exg_msg_register(ctx, out.getGnsscenterId(), exgMsg);
break;
case UP_EXG_MSG_REAL_LOCATION:
- log.info("上传车辆实时定位信息({})：{}", DataType.UP_EXG_MSG_REAL_LOCATION.getCode(), out);
+ log.debug("上传车辆实时定位信息({})：{}", DataType.UP_EXG_MSG_REAL_LOCATION.getCode(), out);
up_exg_msg_real_location(ctx, out.getGnsscenterId(), exgMsg);
break;
case UP_EXG_MSG_HISTORY_LOCATION:
- log.info("车辆定位信息自动补报请求({})：{}", DataType.UP_EXG_MSG_HISTORY_LOCATION.getCode(), out);
+ log.debug("车辆定位信息自动补报请求({})：{}", DataType.UP_EXG_MSG_HISTORY_LOCATION.getCode(), out);
up_exg_msg_history_location(ctx, out.getGnsscenterId(), exgMsg);
break;
case UP_EXG_MSG_RETURN_STARTUP_ACK:
- log.info("启动车辆定位信息交换应答({})：{}", DataType.UP_EXG_MSG_RETURN_STARTUP_ACK.getCode(), out);
+ log.debug("启动车辆定位信息交换应答({})：{}", DataType.UP_EXG_MSG_RETURN_STARTUP_ACK.getCode(), out);
break;
case UP_EXG_MSG_RETURN_END_ACK:
- log.info("结束车辆定位信息交换应答({})：{}", DataType.UP_EXG_MSG_RETURN_END_ACK.getCode(), out);
+ log.debug("结束车辆定位信息交换应答({})：{}", DataType.UP_EXG_MSG_RETURN_END_ACK.getCode(), out);
break;
case UP_EXG_MSG_APPLY_FOR_MONITOR_STARTUP:
- log.info("申请交换指定车辆定位信息请求({})：{}", DataType.UP_EXG_MSG_APPLY_FOR_MONITOR_STARTUP.getCode(), out);
+ log.debug("申请交换指定车辆定位信息请求({})：{}", DataType.UP_EXG_MSG_APPLY_FOR_MONITOR_STARTUP.getCode(), out);
break;
case UP_EXG_MSG_APPLY_FOR_MONITOR_END:
- log.info("取消交换指定车辆定位信息请求({})：{}", DataType.UP_EXG_MSG_APPLY_FOR_MONITOR_END.getCode(), out);
+ log.debug("取消交换指定车辆定位信息请求({})：{}", DataType.UP_EXG_MSG_APPLY_FOR_MONITOR_END.getCode(), out);
break;
case UP_EXG_MSG_APPLY_HISGNSSDATA_REQ:
- log.info("车辆定位信息补发请求({})：{}", DataType.UP_EXG_MSG_APPLY_HISGNSSDATA_REQ.getCode(), out);
+ log.debug("车辆定位信息补发请求({})：{}", DataType.UP_EXG_MSG_APPLY_HISGNSSDATA_REQ.getCode(), out);
break;
case UP_EXG_MSG_REPORT_DRIVER_INFO_ACK:
- log.info("上报驾驶员身份信息应答({})：{}", DataType.UP_EXG_MSG_REPORT_DRIVER_INFO_ACK.getCode(), out);
+ log.debug("上报驾驶员身份信息应答({})：{}", DataType.UP_EXG_MSG_REPORT_DRIVER_INFO_ACK.getCode(), out);
up_exg_msg_report_driver_info_ack(ctx, out.getGnsscenterId(), exgMsg);
break;
case UP_EXG_MSG_TAKE_EWAYBILL_ACK:
- log.info("上报车辆电子运单应答消息({})：{}", DataType.UP_EXG_MSG_TAKE_EWAYBILL_ACK.getCode(), out);
+ log.debug("上报车辆电子运单应答消息({})：{}", DataType.UP_EXG_MSG_TAKE_EWAYBILL_ACK.getCode(), out);
up_exg_msg_take_ewaybill_ack(ctx, out.getGnsscenterId(), exgMsg);
break;
default:
@@ -141,37 +144,11 @@
upExgMsgRegister.setInferiorPlatformId(inferiorPlatformId);
upExgMsgRegister.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
UPExgMsgRegister register = upExgMsgRegisterDao.findByVehicleNo(upExgMsgRegister.getVehicleNo());
+ log.info("上传车辆注册信息({})：{}", DataType.UP_EXG_MSG_REGISTER.getCode(), JSON.toJSON(upExgMsgRegister));
if (null == register) {
upExgMsgRegisterDao.save(upExgMsgRegister);
}
- //上报驾驶员身份识别信息请求
- UPExgMsgReportDriverInfoAck byVehicleNo = upExgMsgReportDriverInfoAckDao.findByVehicleNo(upExgMsgRegister.getVehicleNo());
- if (null == byVehicleNo) {
- down_exg_msg_report_driver_info(ctx, inferiorPlatformId, upExgMsgRegister.getVehicleNo(), upExgMsgRegister.getVehicleColor());
- }
}
-
- /**
- * 上报驾驶员身份识别信息请求
- *
- * @param ctx
- */
- public void down_exg_msg_report_driver_info(ChannelHandlerContext ctx, int inferiorPlatformId, String vehicleNo, int VehicleColor) {
- DOWNExgMsgReportDriverInfo downExgMsgReportDriverInfo = new DOWNExgMsgReportDriverInfo();
- downExgMsgReportDriverInfo.setVehicleNo(vehicleNo);
- downExgMsgReportDriverInfo.setVehicleColor(VehicleColor);
- downExgMsgReportDriverInfo.setDataType(DataType.DOWN_EXG_MSG_REPORT_DRIVER_INFO.getCode());
- downExgMsgReportDriverInfo.setDataLength(0);
- byte[] body = downExgMsgReportDriverInfo.encode();
- OuterPacket out = new OuterPacket(DataType.DOWN_EXG_MSG_REPORT_DRIVER_INFO.getCode(), body);
- //获取从链路通道
- Channel channel = ChannelMap.getClientChannel(inferiorPlatformId);
- if (null != channel && channel.isActive()) {
- channel.writeAndFlush(out);
- log.info("上报驾驶员身份识别信息请求({})：{}", DataType.DOWN_EXG_MSG_REPORT_DRIVER_INFO.getCode(), JSON.toJSONString(downExgMsgReportDriverInfo));
- }
- }
-
/**
* 上传车辆实时定位信息
@@ -183,47 +160,17 @@
upExgMsgRealLocation.setInferiorPlatformId(inferiorPlatformId);
upExgMsgRealLocation.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
upExgMsgRealLocationDao.save(upExgMsgRealLocation);
- }
-
-
- /**
- * 定时任务获取车辆运单信息
- */
- public void takeEwaybill() {
- Iterator<UPExgMsgRegister> iterator = upExgMsgRegisterDao.findAll().iterator();
- while (iterator.hasNext()) {
- UPExgMsgRegister pojo = iterator.next();
- down_exg_msg_take_ewaybill_req(pojo.getInferiorPlatformId(), pojo.getVehicleNo(), pojo.getVehicleColor());
+ log.info("上传车辆实时定位信息({})：{}", DataType.UP_EXG_MSG_REAL_LOCATION.getCode(), JSON.toJSON(upExgMsgRealLocation));
+ //修改车辆实时定位
+ GnssDataVo vo = new GnssDataVo();
+ BeanUtils.copyProperties(upExgMsgRealLocation.getGnssData(), vo);
+ redisTemplate.opsForValue().set("location:" + upExgMsgRealLocation.getVehicleNo(), vo);
+ //查询车辆信息，没有则主动发起请求
+ UPExgMsgRegister msgRegister = upExgMsgRegisterDao.findByVehicleNo(upExgMsgRealLocation.getVehicleNo());
+ if (null == msgRegister) {
+ down_base_msg_vehicle_added(inferiorPlatformId, upExgMsgRealLocation.getVehicleNo(), upExgMsgRealLocation.getVehicleColor());
}
}
-
-
- /**
- * 上报车辆电子运单请求
- *
- * @param inferiorPlatformId
- */
- public void down_exg_msg_take_ewaybill_req(int inferiorPlatformId, String vehicleNo, int VehicleColor) {
- if (!redisTemplate.hasKey("login:" + inferiorPlatformId)) {
- log.error("链路还未登录校验，拒绝连接");
- return;
- }
- DOWNExgMsgTakeEwaybillReq downExgMsgTakeEwaybillReq = new DOWNExgMsgTakeEwaybillReq();
- downExgMsgTakeEwaybillReq.setVehicleNo(vehicleNo);
- downExgMsgTakeEwaybillReq.setVehicleColor(VehicleColor);
- downExgMsgTakeEwaybillReq.setDataType(DataType.DOWN_EXG_MSG_TAKE_EWAYBILL_REQ.getCode());
- downExgMsgTakeEwaybillReq.setDataLength(0);
-
- byte[] body = downExgMsgTakeEwaybillReq.encode();
- OuterPacket out = new OuterPacket(DataType.DOWN_EXG_MSG_TAKE_EWAYBILL_REQ.getCode(), body);
- //获取从链路通道
- Channel channel = ChannelMap.getClientChannel(inferiorPlatformId);
- if (null != channel && channel.isActive()) {
- channel.writeAndFlush(out);
- log.info("上报车辆电子运单请求({})：{}", DataType.DOWN_EXG_MSG_TAKE_EWAYBILL_REQ.getCode(), JSON.toJSONString(downExgMsgTakeEwaybillReq));
- }
- }
-
/**
* 车辆定位信息自动补报请求
@@ -237,8 +184,21 @@
upExgMsgHistoryLocation.setInferiorPlatformId(inferiorPlatformId);
upExgMsgHistoryLocation.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
upExgMsgHistoryLocationDao.save(upExgMsgHistoryLocation);
+ log.info("车辆定位信息自动补报请求({})：{}", DataType.UP_EXG_MSG_HISTORY_LOCATION.getCode(), JSON.toJSONString(upExgMsgHistoryLocation));
+
+ //将数据存储实时定位数据表中
+ List<GnssData> gnssData = upExgMsgHistoryLocation.getGnssData();
+ for (GnssData gnssDatum : gnssData) {
+ UPExgMsgRealLocation upExgMsgRealLocation = new UPExgMsgRealLocation();
+ upExgMsgRealLocation.setVehicleNo(upExgMsgHistoryLocation.getVehicleNo());
+ upExgMsgRealLocation.setVehicleColor(upExgMsgHistoryLocation.getVehicleColor());
+ upExgMsgRealLocation.setInferiorPlatformId(inferiorPlatformId);
+ upExgMsgRealLocation.setDataType(DataType.UP_EXG_MSG_REAL_LOCATION.getCode());
+ upExgMsgRealLocation.setGnssData(gnssDatum);
+ upExgMsgRealLocation.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
+ upExgMsgRealLocationDao.save(upExgMsgRealLocation);
+ }
}
-
/**
* 上报驾驶员身份识别信息应答
@@ -252,8 +212,8 @@
upExgMsgReportDriverInfoAck.setInferiorPlatformId(inferiorPlatformId);
upExgMsgReportDriverInfoAck.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
upExgMsgReportDriverInfoAckDao.save(upExgMsgReportDriverInfoAck);
+ log.info("上报驾驶员身份信息应答({})：{}", DataType.UP_EXG_MSG_REPORT_DRIVER_INFO_ACK.getCode(), JSON.toJSONString(upExgMsgReportDriverInfoAck));
}
-
/**
* 上报车辆电子运单应答
@@ -267,9 +227,107 @@
upExgMsgTakeEwayBillAck.setInferiorPlatformId(inferiorPlatformId);
upExgMsgTakeEwayBillAck.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
UPExgMsgTakeEwayBillAck byVehicleNo = upExgMsgTakeEwayBillAckDao.findByVehicleNo(upExgMsgTakeEwayBillAck.getVehicleNo());
+ log.info("上报车辆电子运单应答消息({})：{}", DataType.UP_EXG_MSG_TAKE_EWAYBILL_ACK.getCode(), JSON.toJSONString(upExgMsgTakeEwayBillAck));
if (null == byVehicleNo) {
upExgMsgTakeEwayBillAckDao.save(upExgMsgTakeEwayBillAck);
}
}
+ /**
+ * 补报车辆静态信息
+ */
+ public void down_base_msg_vehicle_added(int inferiorPlatformId, String vehicleNo, int VehicleColor) {
+ if (!redisTemplate.hasKey("login:" + inferiorPlatformId)) {
+ log.error("链路还未登录校验，拒绝连接：{}", inferiorPlatformId);
+ return;
+ }
+ DOWNBaseMsgVehicleAdded downBaseMsgVehicleAdded = new DOWNBaseMsgVehicleAdded();
+ downBaseMsgVehicleAdded.setVehicleNo(vehicleNo);
+ downBaseMsgVehicleAdded.setVehicleColor(VehicleColor);
+ downBaseMsgVehicleAdded.setDataType(DataType.DOWN_BASE_MSG_VEHICLE_ADDED.getCode());
+ downBaseMsgVehicleAdded.setDataLength(0);
+
+ byte[] body = downBaseMsgVehicleAdded.encode();
+ OuterPacket out = new OuterPacket(DataType.DOWN_BASE_MSG.getCode(), inferiorPlatformId, body);
+ //获取从链路通道
+ Channel channel = ChannelMap.getClientChannel(inferiorPlatformId);
+ if (null != channel && channel.isActive()) {
+ channel.writeAndFlush(out);
+ log.info("补报车辆静态信息请求({})：{}", DataType.DOWN_BASE_MSG_VEHICLE_ADDED.getCode(), JSON.toJSONString(downBaseMsgVehicleAdded));
+ }
+ }
+
+ /**
+ * 定时获取司机基础信息
+ */
+ public void taskReportDriverInfo() {
+ Iterator<UPExgMsgRegister> iterator = upExgMsgRegisterDao.findAll().iterator();
+ while (iterator.hasNext()) {
+ UPExgMsgRegister register = iterator.next();
+
+ //上报驾驶员身份识别信息请求
+ UPExgMsgReportDriverInfoAck byVehicleNo = upExgMsgReportDriverInfoAckDao.findByVehicleNo(register.getVehicleNo());
+ if (null == byVehicleNo) {
+ down_exg_msg_report_driver_info(register.getInferiorPlatformId(), register.getVehicleNo(), register.getVehicleColor());
+ }
+ }
+
+ }
+
+ /**
+ * 上报驾驶员身份识别信息请求
+ */
+ public void down_exg_msg_report_driver_info(int inferiorPlatformId, String vehicleNo, int VehicleColor) {
+ DOWNExgMsgReportDriverInfo downExgMsgReportDriverInfo = new DOWNExgMsgReportDriverInfo();
+ downExgMsgReportDriverInfo.setVehicleNo(vehicleNo);
+ downExgMsgReportDriverInfo.setVehicleColor(VehicleColor);
+ downExgMsgReportDriverInfo.setDataType(DataType.DOWN_EXG_MSG_REPORT_DRIVER_INFO.getCode());
+ downExgMsgReportDriverInfo.setDataLength(0);
+ byte[] body = downExgMsgReportDriverInfo.encode();
+ OuterPacket out = new OuterPacket(DataType.DOWN_EXG_MSG.getCode(), inferiorPlatformId, body);
+ //获取从链路通道
+ Channel channel = ChannelMap.getClientChannel(inferiorPlatformId);
+ if (null != channel && channel.isActive()) {
+ channel.writeAndFlush(out);
+ log.info("上报驾驶员身份识别信息请求({})：{}", DataType.DOWN_EXG_MSG_REPORT_DRIVER_INFO.getCode(), JSON.toJSONString(downExgMsgReportDriverInfo));
+ }
+ }
+
+ /**
+ * 定时任务获取车辆运单信息
+ */
+ public void takeEwaybill() {
+ Iterator<UPExgMsgRegister> iterator = upExgMsgRegisterDao.findAll().iterator();
+ while (iterator.hasNext()) {
+ UPExgMsgRegister pojo = iterator.next();
+ down_exg_msg_take_ewaybill_req(pojo.getInferiorPlatformId(), pojo.getVehicleNo(), pojo.getVehicleColor());
+ }
+ }
+
+ /**
+ * 上报车辆电子运单请求
+ *
+ * @param inferiorPlatformId
+ */
+ public void down_exg_msg_take_ewaybill_req(int inferiorPlatformId, String vehicleNo, int VehicleColor) {
+ if (!redisTemplate.hasKey("login:" + inferiorPlatformId)) {
+ log.error("链路还未登录校验，拒绝连接：{}", inferiorPlatformId);
+ return;
+ }
+ DOWNExgMsgTakeEwaybillReq downExgMsgTakeEwaybillReq = new DOWNExgMsgTakeEwaybillReq();
+ downExgMsgTakeEwaybillReq.setVehicleNo(vehicleNo);
+ downExgMsgTakeEwaybillReq.setVehicleColor(VehicleColor);
+ downExgMsgTakeEwaybillReq.setDataType(DataType.DOWN_EXG_MSG_TAKE_EWAYBILL_REQ.getCode());
+ downExgMsgTakeEwaybillReq.setDataLength(0);
+
+ byte[] body = downExgMsgTakeEwaybillReq.encode();
+ OuterPacket out = new OuterPacket(DataType.DOWN_EXG_MSG.getCode(), inferiorPlatformId, body);
+ //获取从链路通道
+ Channel channel = ChannelMap.getClientChannel(inferiorPlatformId);
+ if (null != channel && channel.isActive()) {
+ channel.writeAndFlush(out);
+ log.info("上报车辆电子运单请求({})：{}", DataType.DOWN_EXG_MSG_TAKE_EWAYBILL_REQ.getCode(), JSON.toJSONString(downExgMsgTakeEwaybillReq));
+ }
+ }
+
}
--
Gitblit v1.7.1