diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/api/device/IoTDeviceApiImpl.java b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/api/device/IoTDeviceApiImpl.java
index 3b72e99..1cbec9f 100644
--- a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/api/device/IoTDeviceApiImpl.java
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/api/device/IoTDeviceApiImpl.java
@@ -53,6 +53,7 @@ public class IoTDeviceApiImpl implements IotDeviceCommonApi {
IotProductDO product = productService.getProductFromCache(deviceDTO.getProductId());
if (product != null) {
deviceDTO.setCodecType(product.getCodecType());
+ deviceDTO.setProductAuthType(product.getAuthType());
}
}));
}
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/dal/dataobject/device/IotDeviceDO.java b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/dal/dataobject/device/IotDeviceDO.java
index c0ecc5d..3a76ad9 100644
--- a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/dal/dataobject/device/IotDeviceDO.java
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/dal/dataobject/device/IotDeviceDO.java
@@ -124,9 +124,11 @@ public class IotDeviceDO extends TenantBaseDO {
*/
private String deviceSecret;
/**
- * 认证类型（如一机一密、动态注册）
+ * 认证类型
+ *
+ * 如果为空，则继承产品的 authType
+ * 枚举 {@link com.viewshanghai.module.iot.core.enums.IotAuthTypeEnum}
*/
- // TODO @haohao：是不是要枚举哈
private String authType;
/**
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/dal/dataobject/product/IotProductDO.java b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/dal/dataobject/product/IotProductDO.java
index 6acd98f..a0d2b9f 100644
--- a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/dal/dataobject/product/IotProductDO.java
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/dal/dataobject/product/IotProductDO.java
@@ -84,4 +84,17 @@ public class IotProductDO extends TenantBaseDO {
*/
private String codecType;
+ /**
+ * 认证类型（认证策略）
+ *
+ * 默认认证方式，可被设备级配置覆盖
+ * 枚举 {@link com.viewshanghai.module.iot.core.enums.IotAuthTypeEnum}
+ */
+ private String authType;
+
+ /**
+ * 产品密钥 (一型一密认证需要)
+ */
+ private String productSecret;
+
}
\ No newline at end of file
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/service/device/IotDeviceServiceImpl.java b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/service/device/IotDeviceServiceImpl.java
index fff7111..df1157f 100644
--- a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/service/device/IotDeviceServiceImpl.java
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/service/device/IotDeviceServiceImpl.java
@@ -13,6 +13,7 @@ import com.viewshanghai.framework.tenant.core.aop.TenantIgnore;
import com.viewshanghai.framework.tenant.core.util.TenantUtils;
import com.viewshanghai.module.iot.controller.admin.device.vo.device.*;
import com.viewshanghai.module.iot.core.biz.dto.IotDeviceAuthReqDTO;
+import com.viewshanghai.module.iot.core.enums.IotAuthTypeEnum;
import com.viewshanghai.module.iot.core.enums.IotDeviceStateEnum;
import com.viewshanghai.module.iot.core.util.IotDeviceAuthUtils;
import com.viewshanghai.module.iot.dal.dataobject.device.IotDeviceDO;
@@ -398,9 +399,31 @@ public class IotDeviceServiceImpl implements IotDeviceService {
@Override
public IotDeviceAuthInfoRespVO getDeviceAuthInfo(Long id) {
IotDeviceDO device = validateDeviceExists(id);
+
+ // 获取生效的认证类型
+ String effectiveAuthType = device.getAuthType();
+ String targetSecret = device.getDeviceSecret();
+
+ if (StrUtil.isEmpty(effectiveAuthType)) {
+ IotProductDO product = productService.getProductFromCache(device.getProductId());
+ if (product != null) {
+ effectiveAuthType = product.getAuthType();
+ // 如果是产品级一型一密，需要获取 ProductSecret
+ if (IotAuthTypeEnum.PRODUCT_SECRET.getType().equals(effectiveAuthType)) {
+ targetSecret = product.getProductSecret();
+ }
+ }
+ } else if (IotAuthTypeEnum.PRODUCT_SECRET.getType().equals(effectiveAuthType)) {
+ // 如果设备级强制设为一型一密（罕见但逻辑上兼容）
+ IotProductDO product = productService.getProductFromCache(device.getProductId());
+ if (product != null) {
+ targetSecret = product.getProductSecret();
+ }
+ }
+
// 使用 IotDeviceAuthUtils 生成认证信息
IotDeviceAuthUtils.AuthInfo authInfo = IotDeviceAuthUtils.getAuthInfo(
- device.getProductKey(), device.getDeviceName(), device.getDeviceSecret());
+ device.getProductKey(), device.getDeviceName(), targetSecret);
return BeanUtils.toBean(authInfo, IotDeviceAuthInfoRespVO.class);
}
@@ -455,13 +478,68 @@ public class IotDeviceServiceImpl implements IotDeviceService {
String deviceName = deviceInfo.getDeviceName();
String productKey = deviceInfo.getProductKey();
IotDeviceDO device = getSelf().getDeviceFromCache(productKey, deviceName);
+
+ // 1.1 处理动态注册 (Dynamic Registration)
+ if (device == null) {
+ // 获取产品信息
+ IotProductDO product = productService.getProductByProductKey(productKey);
+ if (product != null && IotAuthTypeEnum.DYNAMIC.getType().equals(product.getAuthType())) {
+ // 自动创建设备
+ IotDeviceSaveReqVO createReq = new IotDeviceSaveReqVO()
+ .setProductId(product.getId())
+ .setDeviceName(deviceName);
+ try {
+ // TODO: 考虑并发问题，这里简单处理
+ getSelf().createDevice(createReq);
+ // 重新获取设备
+ device = getSelf().getDeviceFromCache(productKey, deviceName);
+ log.info("[authDevice][动态注册设备成功: {}/{}]", productKey, deviceName);
+ } catch (Exception e) {
+ log.error("[authDevice][动态注册设备失败: {}/{}]", productKey, deviceName, e);
+ return false;
+ }
+ }
+ }
+
if (device == null) {
log.warn("[authDevice][设备({}/{}) 不存在]", productKey, deviceName);
return false;
}
// 2. 校验密码
- IotDeviceAuthUtils.AuthInfo authInfo = IotDeviceAuthUtils.getAuthInfo(productKey, deviceName, device.getDeviceSecret());
+ // 2.1 获取生效的认证类型
+ String effectiveAuthType = device.getAuthType();
+ if (StrUtil.isEmpty(effectiveAuthType)) {
+ IotProductDO product = productService.getProductFromCache(device.getProductId());
+ if (product != null) {
+ effectiveAuthType = product.getAuthType();
+ }
+ }
+
+ // 2.2 根据类型校验
+ String targetSecret = device.getDeviceSecret(); // 默认为一机一密
+
+ if (IotAuthTypeEnum.PRODUCT_SECRET.getType().equals(effectiveAuthType)) {
+ // 一型一密：使用 ProductSecret
+ IotProductDO product = productService.getProductFromCache(device.getProductId());
+ if (product == null || StrUtil.isEmpty(product.getProductSecret())) {
+ log.error("[authDevice][一型一密认证失败，ProductSecret 为空: {}]", productKey);
+ return false;
+ }
+ targetSecret = product.getProductSecret();
+ } else if (IotAuthTypeEnum.NONE.getType().equals(effectiveAuthType)) {
+ // 免鉴权：直接通过
+ return true;
+ } else if (IotAuthTypeEnum.DYNAMIC.getType().equals(effectiveAuthType)) {
+ // 动态注册后，通常转为一机一密或一型一密，这里假设动态注册使用一型一密校验
+ // 或者是免鉴权。具体策略视业务而定。这里暂定为一型一密。
+ IotProductDO product = productService.getProductFromCache(device.getProductId());
+ if (product != null) {
+ targetSecret = product.getProductSecret();
+ }
+ }
+
+ IotDeviceAuthUtils.AuthInfo authInfo = IotDeviceAuthUtils.getAuthInfo(productKey, deviceName, targetSecret);
if (ObjUtil.notEqual(authInfo.getPassword(), authReqDTO.getPassword())) {
log.error("[authDevice][设备({}/{}) 密码不正确]", productKey, deviceName);
return false;
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/service/device/message/IotDeviceMessageServiceImpl.java b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/service/device/message/IotDeviceMessageServiceImpl.java
index a2494f1..ea7bd86 100644
--- a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/service/device/message/IotDeviceMessageServiceImpl.java
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/service/device/message/IotDeviceMessageServiceImpl.java
@@ -169,10 +169,13 @@ public class IotDeviceMessageServiceImpl implements IotDeviceMessageService {
getSelf().createDeviceLogAsync(message);
// 3. 回复消息。前提：非 _reply 消息，并且非禁用回复的消息
+ // 条件1：防止对"回复消息"再次回复，避免无限循环
+ // 条件2：某些特定的method不需要回复（如设备状态变更、OTA进度上报）
+ // 条件3（新增）：HTTP短连接场景，因为已经在请求中直接响应了，不需要再通过消息总线发送回复
if (IotDeviceMessageUtils.isReplyMessage(message)
|| IotDeviceMessageMethodEnum.isReplyDisabled(message.getMethod())
|| StrUtil.isEmpty(message.getServerId())) {
- return;
+ return; // serverId 为空，不记录回复消息
}
try {
IotDeviceMessage replyMessage = IotDeviceMessage.replyOf(message.getRequestId(), message.getMethod(), replyData,
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/service/product/IotProductServiceImpl.java b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/service/product/IotProductServiceImpl.java
index f2f1098..fe48ea1 100644
--- a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/service/product/IotProductServiceImpl.java
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/service/product/IotProductServiceImpl.java
@@ -1,5 +1,6 @@
package com.viewshanghai.module.iot.service.product;
+import cn.hutool.core.util.IdUtil;
import cn.hutool.core.collection.CollUtil;
import com.viewshanghai.framework.common.pojo.PageResult;
import com.viewshanghai.framework.common.util.object.BeanUtils;
@@ -53,7 +54,8 @@ public class IotProductServiceImpl implements IotProductService {
// 2. 插入
IotProductDO product = BeanUtils.toBean(createReqVO, IotProductDO.class)
- .setStatus(IotProductStatusEnum.UNPUBLISHED.getStatus());
+ .setStatus(IotProductStatusEnum.UNPUBLISHED.getStatus())
+ .setProductSecret(IdUtil.fastSimpleUUID()); // 生成 ProductSecret
productMapper.insert(product);
return product.getId();
}
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/resources/mapper/device/IotDeviceMessageMapper.xml b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/resources/mapper/device/IotDeviceMessageMapper.xml
index 261ea92..2a0a10e 100644
--- a/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/resources/mapper/device/IotDeviceMessageMapper.xml
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/resources/mapper/device/IotDeviceMessageMapper.xml
@@ -38,7 +38,7 @@
USING device_message
TAGS (#{deviceId})
VALUES (
- NOW, #{id}, #{reportTime}, #{tenantId}, #{serverId},
+ #{reportTime}, #{id}, #{reportTime}, #{tenantId}, #{serverId},
#{upstream}, #{reply}, #{identifier}, #{requestId}, #{method},
#{params}, #{data}, #{code}, #{msg}
)
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-core/src/main/java/com/viewshanghai/module/iot/core/biz/dto/IotDeviceRespDTO.java b/viewshanghai-module-iot/viewshanghai-module-iot-core/src/main/java/com/viewshanghai/module/iot/core/biz/dto/IotDeviceRespDTO.java
index d3bb943..765f67c 100644
--- a/viewshanghai-module-iot/viewshanghai-module-iot-core/src/main/java/com/viewshanghai/module/iot/core/biz/dto/IotDeviceRespDTO.java
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-core/src/main/java/com/viewshanghai/module/iot/core/biz/dto/IotDeviceRespDTO.java
@@ -38,4 +38,16 @@ public class IotDeviceRespDTO {
*/
private String codecType;
+ /**
+ * 设备级认证类型
+ * 枚举 {@link com.viewshanghai.module.iot.core.enums.IotAuthTypeEnum}
+ */
+ private String authType;
+
+ /**
+ * 产品级认证类型 (兜底策略)
+ * 枚举 {@link com.viewshanghai.module.iot.core.enums.IotAuthTypeEnum}
+ */
+ private String productAuthType;
+
}
\ No newline at end of file
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-core/src/main/java/com/viewshanghai/module/iot/core/enums/IotAuthTypeEnum.java b/viewshanghai-module-iot/viewshanghai-module-iot-core/src/main/java/com/viewshanghai/module/iot/core/enums/IotAuthTypeEnum.java
new file mode 100644
index 0000000..7085735
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-core/src/main/java/com/viewshanghai/module/iot/core/enums/IotAuthTypeEnum.java
@@ -0,0 +1,58 @@
+package com.viewshanghai.module.iot.core.enums;
+
+import com.viewshanghai.framework.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * IoT 认证类型枚举
+ *
+ * 用于产品（Product）和设备（Device）的认证策略配置
+ *
+ * @author 芋道源码
+ */
+@AllArgsConstructor
+@Getter
+public enum IotAuthTypeEnum implements ArrayValuable {
+
+ /**
+ * 一机一密：每个设备有独立的 DeviceSecret
+ */
+ SECRET("SECRET", "一机一密"),
+
+ /**
+ * 一型一密：同产品下所有设备共用 ProductSecret
+ */
+ PRODUCT_SECRET("PRODUCT_SECRET", "一型一密"),
+
+ /**
+ * 动态注册：设备初次连接时自动创建，通常配合一型一密或免鉴权使用
+ * 注意：这通常是一个"能力开关"而非单纯的"认证方式"，但在某些简单模型下可作为一种策略标识
+ * TODO: 暂未实现动态注册
+ */
+ DYNAMIC("DYNAMIC", "动态注册"),
+
+ /**
+ * 免鉴权：仅校验 ProductKey 和 DeviceName 存在
+ */
+ NONE("NONE", "免鉴权");
+
+ public static final String[] ARRAYS = Arrays.stream(values()).map(IotAuthTypeEnum::getType).toArray(String[]::new);
+
+ /**
+ * 类型代码
+ */
+ private final String type;
+ /**
+ * 名字
+ */
+ private final String name;
+
+ @Override
+ public String[] array() {
+ return ARRAYS;
+ }
+
+}
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/IotJt808DeviceMessageCodec.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/IotJt808DeviceMessageCodec.java
new file mode 100644
index 0000000..0c1a87f
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/IotJt808DeviceMessageCodec.java
@@ -0,0 +1,672 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
+import com.viewshanghai.framework.common.util.json.JsonUtils;
+import com.viewshanghai.module.iot.core.enums.IotDeviceMessageMethodEnum;
+import com.viewshanghai.module.iot.core.mq.message.IotDeviceMessage;
+import com.viewshanghai.module.iot.gateway.codec.IotDeviceMessageCodec;
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.*;
+import com.viewshanghai.module.iot.gateway.codec.jt808.util.Jt808ProtocolUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * JT808 协议 {@link IotDeviceMessage} 编解码器
+ *
+ * 将 JT808 标准协议转换为统一的 IotDeviceMessage 格式
+ *
+ * @author lzh
+ */
+@Slf4j
+@Component
+public class IotJt808DeviceMessageCodec implements IotDeviceMessageCodec {
+
+ public static final String TYPE = "JT808";
+
+ private final Jt808Decoder decoder;
+ private final Jt808Encoder encoder;
+ private final Jt808ProtocolUtil protocolUtil;
+
+ public IotJt808DeviceMessageCodec() {
+ this.decoder = new Jt808Decoder();
+ this.encoder = new Jt808Encoder();
+ this.protocolUtil = new Jt808ProtocolUtil();
+ }
+
+ @Override
+ public String type() {
+ return TYPE;
+ }
+
+ @Override
+ public byte[] encode(IotDeviceMessage message) {
+ Assert.notNull(message, "消息不能为空");
+ Assert.notBlank(message.getMethod(), "消息方法不能为空");
+
+ try {
+ // 从消息中提取必要信息
+ String phone = extractPhoneNumber(message);
+ int flowId = extractFlowId(message);
+ String method = message.getMethod();
+
+ // 根据方法名路由到不同的编码器
+ return switch (method) {
+ // === 标准物模型方法 ===
+ case "thing.service.invoke" -> encodeServiceInvoke(message, phone, flowId); // 服务调用
+ case "thing.property.set" -> encodePropertySet(message, phone, flowId); // 属性设置
+
+ // === JT808 内部协议方法（向下兼容） ===
+ case "jt808.platform.commonResp", "commonResp" -> encodeCommonResp(message, phone, flowId);
+ case "jt808.platform.registerResp", "registerResp" -> encodeRegisterResp(message, phone, flowId);
+ case "jt808.platform.textDown", "textDown" -> encodeTextDown(message, phone, flowId);
+
+ default -> {
+ log.warn("[encode][不支持的消息方法: {}]", method);
+ yield new byte[0];
+ }
+ };
+ } catch (Exception e) {
+ log.error("[encode][JT808 消息编码失败，消息: {}]", message, e);
+ throw new RuntimeException("JT808 消息编码失败: " + e.getMessage(), e);
+ }
+ }
+
+ @Override
+ public IotDeviceMessage decode(byte[] bytes) {
+ Assert.notNull(bytes, "待解码数据不能为空");
+ Assert.isTrue(bytes.length >= 12, "数据包长度不足");
+
+ try {
+ // 1. 反转义（去除首尾标识符）
+ byte[] unescapedBytes = protocolUtil.doEscape4Receive(bytes, 1, bytes.length - 1);
+
+ // 2. 解析为 JT808 数据包
+ Jt808DataPack dataPack = decoder.bytes2PackageData(unescapedBytes);
+
+ // 3. 转换为统一的 IotDeviceMessage
+ return convertToIotDeviceMessage(dataPack);
+ } catch (Exception e) {
+ log.error("[decode][JT808 消息解码失败，数据长度: {}]", bytes.length, e);
+ throw new RuntimeException("JT808 消息解码失败: " + e.getMessage(), e);
+ }
+ }
+
+ /**
+ * 将 JT808 数据包转换为 IotDeviceMessage
+ */
+ private IotDeviceMessage convertToIotDeviceMessage(Jt808DataPack dataPack) {
+ Jt808DataPack.PackHead head = dataPack.getPackHead();
+ int msgId = head.getId();
+
+ // 生成消息ID（使用流水号作为标识）
+ String messageId = head.getTerminalPhone() + "_" + head.getFlowId();
+
+ // 根据消息ID确定物模型标准方法名
+ String method = getStandardMethodName(msgId);
+ Object params = parseMessageParams(dataPack, msgId);
+
+ // 构建元数据（保留在 params 中，用于调试和追踪）
+ if (params instanceof Map) {
+ @SuppressWarnings("unchecked")
+ Map paramsMap = (Map) params;
+ Map metadata = new HashMap<>();
+ metadata.put("jt808MsgId", String.format("0x%04X", msgId));
+ metadata.put("terminalPhone", head.getTerminalPhone());
+ metadata.put("flowId", head.getFlowId());
+ metadata.put("encryptionType", head.getEncryptionType());
+ paramsMap.put("_metadata", metadata);
+ }
+
+ // 创建 IotDeviceMessage
+ IotDeviceMessage message = IotDeviceMessage.of(messageId, method, params, null, null, null);
+ message.setReportTime(LocalDateTime.now());
+ return message;
+ }
+
+ /**
+ * 根据 JT808 消息ID获取物模型标准方法名
+ *
+ * 映射关系：
+ * - 0x0002 心跳 -> thing.state.update（设备状态更新）
+ * - 0x0200 位置上报 -> thing.property.post（属性上报）
+ * - 0x0704 批量位置上报 -> thing.property.post（属性上报）
+ * - 0x0006 按键事件 -> thing.event.post（事件上报）
+ * - 0x0100 注册 -> 内部认证流程，不使用标准方法
+ * - 0x0102 鉴权 -> 内部认证流程，不使用标准方法
+ * - 0x0001 通用应答 -> 内部应答，不使用标准方法
+ */
+ private String getStandardMethodName(int msgId) {
+ return switch (msgId) {
+ // 设备状态类
+ case 0x0002 -> IotDeviceMessageMethodEnum.STATE_UPDATE.getMethod(); // 心跳 -> 状态更新
+
+ // 属性上报类
+ case 0x0200 -> IotDeviceMessageMethodEnum.PROPERTY_POST.getMethod(); // 位置信息汇报 -> 属性上报
+ case 0x0704 -> IotDeviceMessageMethodEnum.PROPERTY_POST.getMethod(); // 批量位置上传 -> 属性上报
+
+ // 事件上报类
+ case 0x0006 -> IotDeviceMessageMethodEnum.EVENT_POST.getMethod(); // 按键事件 -> 事件上报
+
+ // 内部协议类（不映射到标准方法，使用 JT808 特定方法名）
+ case 0x0001 -> "jt808.terminal.commonResp"; // 终端通用应答
+ case 0x0100 -> "jt808.terminal.register"; // 终端注册
+ case 0x0102 -> "jt808.terminal.auth"; // 终端鉴权
+ case 0x0003 -> "jt808.terminal.logout"; // 终端注销
+
+ // 未知消息
+ default -> "jt808.unknown.0x" + Integer.toHexString(msgId);
+ };
+ }
+
+ /**
+ * 解析消息参数（根据物模型标准格式）
+ */
+ private Object parseMessageParams(Jt808DataPack dataPack, int msgId) {
+ byte[] bodyBytes = dataPack.getBodyBytes();
+
+ // 针对不同消息类型进行特殊解析，返回符合物模型标准的格式
+ return switch (msgId) {
+ // thing.property.post - 返回 properties
+ case 0x0200, 0x0704 -> parseLocationInfoAsProperties(dataPack);
+
+ // thing.state.update - 返回 state 信息
+ case 0x0002 -> parseHeartbeatAsState();
+
+ // thing.event.post - 返回 event 信息
+ case 0x0006 -> parseButtonEventAsEvent(dataPack);
+
+ // JT808 内部协议消息 - 保持原有格式
+ case 0x0100 -> parseRegisterInfo(dataPack);
+ case 0x0102 -> parseAuthInfo(bodyBytes);
+ default -> parseGenericParams(bodyBytes);
+ };
+ }
+
+ /**
+ * 解析心跳为状态信息（thing.state.update）
+ */
+ private Map parseHeartbeatAsState() {
+ Map result = new HashMap<>();
+ result.put("state", "online");
+ result.put("timestamp", System.currentTimeMillis());
+ return result;
+ }
+
+ /**
+ * 解析按键事件为事件上报格式（thing.event.post）
+ *
+ * 物模型标准格式：
+ * {
+ * "eventId": "button_event",
+ * "eventTime": 1234567890,
+ * "params": {
+ * "keyId": 1,
+ * "keyState": 1,
+ * "keyType": "short_press",
+ * "keyNumber": 1,
+ * "isLongPress": false
+ * }
+ * }
+ */
+ private Map parseButtonEventAsEvent(Jt808DataPack dataPack) {
+ Jt808ButtonEvent event = decoder.toButtonEventMsg(dataPack);
+
+ Map result = new HashMap<>();
+
+ // 统一使用一个事件标识符，通过 isLongPress 参数区分短按和长按
+ result.put("eventId", "button_event");
+
+ // 事件时间戳
+ result.put("eventTime", System.currentTimeMillis());
+
+ // 事件参数（包含 isLongPress 字段用于区分短按和长按）
+ Map eventParams = new HashMap<>();
+ eventParams.put("keyId", event.getKeyId());
+ eventParams.put("keyState", event.getKeyState());
+ eventParams.put("keyType", event.getKeyType());
+ eventParams.put("keyNumber", event.getKeyNumber());
+ eventParams.put("isLongPress", event.getIsLongPress());
+ result.put("params", eventParams);
+
+ return result;
+ }
+
+ /**
+ * 解析位置信息为属性上报格式（thing.property.post）
+ *
+ * 物模型标准格式：params 直接就是属性键值对
+ * {
+ * "latitude": 31.123456,
+ * "longitude": 121.123456,
+ * "batteryLevel": 80,
+ * ...
+ * }
+ */
+ private Map parseLocationInfoAsProperties(Jt808DataPack dataPack) {
+ Jt808LocationInfo locationInfo = decoder.toLocationInfoUploadMsg(dataPack);
+
+ // 物模型属性集合（所有属性平铺在同一层）
+ Map properties = new HashMap<>();
+
+ // === 基础位置信息（核心属性） ===
+ properties.put("latitude", locationInfo.getLatitude());
+ properties.put("longitude", locationInfo.getLongitude());
+ properties.put("elevation", locationInfo.getElevation());
+ properties.put("speed", locationInfo.getSpeed());
+ properties.put("direction", locationInfo.getDirection());
+ properties.put("time", locationInfo.getTime());
+
+ // 状态和告警字段（转为整数便于处理）
+ properties.put("warningFlag", locationInfo.getWarningFlagField());
+ properties.put("status", locationInfo.getStatusField());
+
+ // === 扩展信息（物模型属性） ===
+
+ // 电池信息
+ if (locationInfo.getBatteryInfo() != null) {
+ Jt808BatteryInfo batteryInfo = locationInfo.getBatteryInfo();
+ if (batteryInfo.getBatteryLevel() != null) {
+ properties.put("batteryLevel", batteryInfo.getBatteryLevel());
+ }
+ if (batteryInfo.getVersion() != null) {
+ properties.put("firmwareVersion", batteryInfo.getVersion());
+ }
+ if (batteryInfo.getIccid() != null) {
+ properties.put("iccid", batteryInfo.getIccid());
+ }
+ }
+
+ // 里程
+ if (locationInfo.getMileage() != null) {
+ properties.put("mileage", locationInfo.getMileage());
+ }
+
+ // 信号强度
+ if (locationInfo.getSignalStrength() != null) {
+ properties.put("signalStrength", locationInfo.getSignalStrength());
+ }
+
+ // 蓝牙设备列表
+ if (locationInfo.getBluetoothInfos() != null && !locationInfo.getBluetoothInfos().isEmpty()) {
+ List> bluetoothList = new ArrayList<>();
+ for (Jt808BluetoothInfo bleInfo : locationInfo.getBluetoothInfos()) {
+ Map bleMap = new HashMap<>();
+ bleMap.put("mac", bleInfo.getMac());
+ bleMap.put("rssi", bleInfo.getRssi());
+ bleMap.put("type", bleInfo.getType());
+ if (bleInfo.getCustomData() != null) {
+ bleMap.put("customData", bleInfo.getCustomData());
+ }
+ bluetoothList.add(bleMap);
+ }
+ properties.put("bluetoothDevices", bluetoothList);
+ }
+
+ // 保留原始扩展字段（用于调试和高级用途）
+ if (locationInfo.getExtensions() != null && !locationInfo.getExtensions().isEmpty()) {
+ properties.put("_rawExtensions", locationInfo.getExtensions());
+ }
+
+ return properties;
+ }
+
+ /**
+ * 解析注册信息
+ */
+ private Map parseRegisterInfo(Jt808DataPack dataPack) {
+ Map result = new HashMap<>();
+ try {
+ // 解析注册消息体
+ com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808RegisterInfo registerInfo =
+ decoder.toRegisterMsg(dataPack);
+
+ result.put("provinceId", registerInfo.getProvinceId());
+ result.put("cityId", registerInfo.getCityId());
+ result.put("manufacturerId", registerInfo.getManufacturerId());
+ result.put("terminalType", registerInfo.getTerminalType());
+ result.put("terminalId", registerInfo.getTerminalId());
+ result.put("licensePlateColor", registerInfo.getLicensePlateColor());
+ result.put("licensePlate", registerInfo.getLicensePlate());
+ } catch (Exception e) {
+ log.error("[parseRegisterInfo][解析注册信息失败]", e);
+ // 失败时返回原始数据
+ result.put("rawData", bytesToHex(dataPack.getBodyBytes()));
+ result.put("length", dataPack.getBodyBytes().length);
+ }
+ return result;
+ }
+
+ /**
+ * 解析鉴权信息
+ */
+ private Map parseAuthInfo(byte[] bodyBytes) {
+ Map result = new HashMap<>();
+ try {
+ // 鉴权码为字符串
+ String authCode = new String(bodyBytes, Jt808Constants.DEFAULT_CHARSET).trim();
+ result.put("authCode", authCode);
+ } catch (Exception e) {
+ result.put("rawData", bytesToHex(bodyBytes));
+ }
+ return result;
+ }
+
+ /**
+ * 通用参数解析
+ */
+ private Object parseGenericParams(byte[] bodyBytes) {
+ if (bodyBytes == null || bodyBytes.length == 0) {
+ return Map.of();
+ }
+
+ // 尝试解析为字符串，如果失败则返回十六进制
+ try {
+ String str = new String(bodyBytes, Jt808Constants.DEFAULT_CHARSET);
+ // 检查是否为可打印字符
+ if (str.matches("[\\x20-\\x7E\\u4E00-\\u9FA5]+")) {
+ return Map.of("content", str);
+ }
+ } catch (Exception ignored) {
+ }
+
+ return Map.of("rawData", bytesToHex(bodyBytes));
+ }
+
+ /**
+ * 编码通用应答
+ */
+ private byte[] encodeCommonResp(IotDeviceMessage message, String phone, int flowId) {
+ Map params = getParamsAsMap(message);
+ int replyFlowId = ((Number) params.getOrDefault("replyFlowId", 0)).intValue();
+ int replyId = ((Number) params.getOrDefault("replyId", 0)).intValue();
+ byte replyCode = ((Number) params.getOrDefault("replyCode", 0)).byteValue();
+
+ return encoder.encodeCommonResp(phone, replyFlowId, replyId, replyCode, flowId);
+ }
+
+ /**
+ * 编码注册应答
+ */
+ private byte[] encodeRegisterResp(IotDeviceMessage message, String phone, int flowId) {
+ Map params = getParamsAsMap(message);
+ int replyFlowId = ((Number) params.getOrDefault("replyFlowId", 0)).intValue();
+ byte replyCode = ((Number) params.getOrDefault("replyCode", 0)).byteValue();
+ String authToken = (String) params.get("authToken");
+
+ return encoder.encodeRegisterResp(phone, replyFlowId, replyCode, authToken, flowId);
+ }
+
+ /**
+ * 编码文本下发
+ */
+ private byte[] encodeTextDown(IotDeviceMessage message, String phone, int flowId) {
+ Map params = getParamsAsMap(message);
+ byte flag = ((Number) params.getOrDefault("flag", 0)).byteValue();
+ String content = (String) params.getOrDefault("content", "");
+
+ return encoder.encodeTextInfoDown(phone, flag, content, flowId);
+ }
+
+ /**
+ * 编码服务调用（thing.service.invoke）
+ *
+ * 根据服务标识符映射到不同的 JT808 指令
+ *
+ * 消息格式：
+ * {
+ * "identifier": "服务标识符",
+ * "params": {
+ * // 服务参数
+ * }
+ * }
+ */
+ private byte[] encodeServiceInvoke(IotDeviceMessage message, String phone, int flowId) {
+ Map params = getParamsAsMap(message);
+
+ // 获取服务标识符
+ String serviceIdentifier = (String) params.get("identifier");
+ if (StrUtil.isBlank(serviceIdentifier)) {
+ log.error("[encodeServiceInvoke][服务标识符为空]");
+ return new byte[0];
+ }
+
+ // 获取服务参数
+ @SuppressWarnings("unchecked")
+ Map serviceParams = (Map) params.getOrDefault("params", new HashMap<>());
+
+ // 根据服务标识符路由到不同的 JT808 指令
+ return switch (serviceIdentifier) {
+ case "TTS" -> {
+ // 语音播报服务 -> JT808 文本信息下发 (0x8300)
+ String ttsText = (String) serviceParams.getOrDefault("tts_text", "");
+ int ttsFlag = ((Number) serviceParams.getOrDefault("tts_flag", 4)).intValue(); // 默认 4-TTS 播读
+
+ log.info("[encodeServiceInvoke][TTS 语音播报] phone={}, flag={}, text={}", phone, ttsFlag, ttsText);
+ yield encoder.encodeTextInfoDown(phone, (byte) ttsFlag, ttsText, flowId);
+ }
+
+ case "locationQuery" -> {
+ // 位置查询服务 -> JT808 位置信息查询 (0x8201)
+ log.info("[encodeServiceInvoke][位置查询] phone={}", phone);
+ // TODO: 实现 encoder.encodeLocationInquiry(phone, flowId);
+ log.warn("[encodeServiceInvoke][位置查询服务暂未实现]");
+ yield new byte[0];
+ }
+
+ default -> {
+ log.warn("[encodeServiceInvoke][不支持的服务标识符: {}]", serviceIdentifier);
+ yield new byte[0];
+ }
+ };
+ }
+
+ /**
+ * 编码属性设置（thing.property.set）
+ *
+ * 属性设置映射到 JT808 的参数设置指令 (0x8103)
+ *
+ * 消息格式：
+ * {
+ * "properties": {
+ * "identifier1": value1,
+ * "identifier2": value2
+ * }
+ * }
+ */
+ private byte[] encodePropertySet(IotDeviceMessage message, String phone, int flowId) {
+ Map params = getParamsAsMap(message);
+
+ @SuppressWarnings("unchecked")
+ Map properties = (Map) params.get("properties");
+ if (properties == null || properties.isEmpty()) {
+ log.error("[encodePropertySet][属性列表为空]");
+ return new byte[0];
+ }
+
+ // 将物模型属性映射到 JT808 参数
+ Map jt808Params = mapPropertiesToJt808Params(properties);
+ if (jt808Params.isEmpty()) {
+ log.warn("[encodePropertySet][没有可映射的 JT808 参数]");
+ return new byte[0];
+ }
+
+ log.info("[encodePropertySet][属性设置] phone={}, params={}", phone, jt808Params);
+
+ // TODO: 实现 encoder.encodeParamSettings(phone, jt808Params, flowId);
+ log.warn("[encodePropertySet][参数设置指令暂未实现]");
+ return new byte[0];
+ }
+
+ /**
+ * 将物模型属性映射到 JT808 参数
+ *
+ * 映射关系参考 JT808 协议标准：
+ * - 0x0029: 心跳发送间隔
+ * - 0x0027: 位置汇报间隔
+ * - 0x0028: 休眠时汇报间隔
+ * - 等等...
+ *
+ * @param properties 物模型属性
+ * @return JT808 参数映射（参数ID -> 参数值）
+ */
+ private Map mapPropertiesToJt808Params(Map properties) {
+ Map jt808Params = new HashMap<>();
+
+ properties.forEach((identifier, value) -> {
+ Integer paramId = switch (identifier) {
+ case "heartbeatInterval" -> 0x0029; // 心跳发送间隔（单位：秒）
+ case "locationInterval" -> 0x0027; // 位置汇报间隔（单位：秒）
+ case "sleepLocationInterval" -> 0x0028; // 休眠时汇报间隔（单位：秒）
+ case "emergencyAlarmInterval" -> 0x002A; // 紧急报警时汇报间隔（单位：秒）
+ case "defaultReportInterval" -> 0x002B; // 缺省汇报间隔（单位：秒）
+ case "defaultReportDistance" -> 0x002C; // 缺省汇报距离（单位：米）
+ case "driverUnloginReportInterval" -> 0x002D; // 驾驶员未登录汇报间隔（单位：秒）
+ // 更多映射关系可根据实际需求添加
+ default -> null;
+ };
+
+ if (paramId != null) {
+ jt808Params.put(paramId, value);
+ log.debug("[mapPropertiesToJt808Params][属性映射] {} -> 0x{} = {}",
+ identifier, Integer.toHexString(paramId), value);
+ } else {
+ log.warn("[mapPropertiesToJt808Params][未知的属性标识符: {}]", identifier);
+ }
+ });
+
+ return jt808Params;
+ }
+
+ /**
+ * 提取终端手机号
+ *
+ * 优先级：
+ * 1. 从 params._deviceName 中获取（下发场景，IotTcpDownstreamHandler 自动注入）
+ * 2. 从 params._metadata.terminalPhone 中获取（上行消息回复场景）
+ * 3. 从 params.phone 中获取（手动指定，向下兼容，不推荐）
+ */
+ private String extractPhoneNumber(IotDeviceMessage message) {
+ if (!(message.getParams() instanceof Map)) {
+ log.error("[extractPhoneNumber][params 不是 Map 类型，消息: {}]", message);
+ throw new IllegalArgumentException("消息参数格式错误，params 必须是 Map 类型");
+ }
+
+ Map params = (Map) message.getParams();
+
+ // 1. 优先从 _deviceName 获取（下发场景，由 IotTcpDownstreamHandler 注入）
+ Object deviceName = params.get("_deviceName");
+ if (deviceName != null && StrUtil.isNotBlank(deviceName.toString())) {
+ String deviceNameStr = deviceName.toString().trim();
+ // 验证是否为数字（终端手机号应该是纯数字）
+ if (deviceNameStr.matches("\\d+")) {
+ return deviceNameStr;
+ } else {
+ log.warn("[extractPhoneNumber][_deviceName 不是纯数字: {}]", deviceNameStr);
+ }
+ }
+
+ // 2. 从 metadata 中获取（上行消息回复场景）
+ if (params.get("_metadata") instanceof Map) {
+ Map metadata = (Map) params.get("_metadata");
+ Object terminalPhone = metadata.get("terminalPhone");
+ if (terminalPhone != null && StrUtil.isNotBlank(terminalPhone.toString())) {
+ return terminalPhone.toString();
+ }
+ }
+
+ // 3. 从 phone 字段获取（向下兼容，不推荐）
+ Object phone = params.get("phone");
+ if (phone != null && StrUtil.isNotBlank(phone.toString())) {
+ String phoneStr = phone.toString().trim();
+ if (phoneStr.matches("\\d+")) {
+ return phoneStr;
+ }
+ }
+
+ // 4. 如果都获取不到，抛出异常
+ log.error("[extractPhoneNumber][无法提取终端手机号，params: {}]", params);
+ throw new IllegalArgumentException(
+ "消息中缺少终端手机号。请确保设备的 deviceName 为终端手机号（纯数字），例如: \"13800138000\"");
+ }
+
+ /**
+ * 提取流水号
+ *
+ * 对于下发消息，如果没有指定流水号，则生成一个随机流水号
+ */
+ private int extractFlowId(IotDeviceMessage message) {
+ if (message.getParams() instanceof Map) {
+ Map params = (Map) message.getParams();
+
+ // 尝试获取显式指定的流水号
+ Object flowId = params.get("flowId");
+ if (flowId instanceof Number) {
+ return ((Number) flowId).intValue();
+ }
+
+ // 尝试从 metadata 中获取（上行消息的流水号）
+ if (params.get("_metadata") instanceof Map) {
+ Map metadata = (Map) params.get("_metadata");
+ Object metaFlowId = metadata.get("flowId");
+ if (metaFlowId instanceof Number) {
+ return ((Number) metaFlowId).intValue();
+ }
+ }
+ }
+
+ // 生成随机流水号（1-65535）
+ return (int) (System.currentTimeMillis() % 65535) + 1;
+ }
+
+ /**
+ * 获取参数为Map
+ */
+ @SuppressWarnings("unchecked")
+ private Map getParamsAsMap(IotDeviceMessage message) {
+ if (message.getParams() instanceof Map) {
+ return (Map) message.getParams();
+ }
+ // 尝试JSON转换
+ if (message.getParams() != null) {
+ String json = JsonUtils.toJsonString(message.getParams());
+ return JsonUtils.parseObject(json, Map.class);
+ }
+ return new HashMap<>();
+ }
+
+ /**
+ * 字节数组转十六进制字符串
+ */
+ private String bytesToHex(byte[] bytes) {
+ if (bytes == null || bytes.length == 0) {
+ return "";
+ }
+ StringBuilder sb = new StringBuilder(bytes.length * 2);
+ for (byte b : bytes) {
+ sb.append(String.format("%02X", b));
+ }
+ return sb.toString();
+ }
+
+ /**
+ * 快速检测是否为JT808格式
+ *
+ * @param data 数据
+ * @return 是否为JT808格式
+ */
+ public static boolean isJt808Format(byte[] data) {
+ // 检查起止标识符 0x7e
+ return data != null && data.length >= 12
+ && data[0] == (byte) Jt808Constants.PKG_DELIMITER
+ && data[data.length - 1] == (byte) Jt808Constants.PKG_DELIMITER;
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/Jt808Constants.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/Jt808Constants.java
new file mode 100644
index 0000000..a81d71a
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/Jt808Constants.java
@@ -0,0 +1,93 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808;
+
+import java.nio.charset.Charset;
+
+/**
+ * JT808 协议常量
+ *
+ * @author lzh
+ */
+public class Jt808Constants {
+
+ /**
+ * 默认字符编码
+ */
+ public static final String DEFAULT_ENCODE = "GBK";
+ public static final Charset DEFAULT_CHARSET = Charset.forName(DEFAULT_ENCODE);
+
+ /**
+ * 标识位（起止符）
+ */
+ public static final int PKG_DELIMITER = 0x7e;
+
+ // ========== 终端上行消息ID ==========
+
+ /**
+ * 终端通用应答
+ */
+ public static final Integer MSGID_COMMON_RESP = 0x0001;
+
+ /**
+ * 终端心跳
+ */
+ public static final Integer MSGID_HEART_BEAT = 0x0002;
+
+ /**
+ * 终端注册
+ */
+ public static final Integer MSGID_REGISTER = 0x0100;
+
+ /**
+ * 终端注销
+ */
+ public static final Integer MSGID_LOG_OUT = 0x0003;
+
+ /**
+ * 终端鉴权
+ */
+ public static final Integer MSGID_AUTHENTICATION = 0x0102;
+
+ /**
+ * 位置信息汇报
+ */
+ public static final Integer MSGID_LOCATION_UPLOAD = 0x0200;
+
+ /**
+ * 按键事件上报
+ */
+ public static final Integer MSGID_BUTTON_EVENT = 0x0006;
+
+ /**
+ * 定位数据批量上传
+ */
+ public static final Integer MSGID_LOCATION_BATCH_UPLOAD = 0x0704;
+
+ // ========== 平台下行命令ID ==========
+
+ /**
+ * 平台通用应答
+ */
+ public static final int CMD_COMMON_RESP = 0x8001;
+
+ /**
+ * 终端注册应答
+ */
+ public static final int CMD_REGISTER_RESP = 0x8100;
+
+ /**
+ * 设置终端参数
+ */
+ public static final int CMD_PARAM_SETTINGS = 0X8103;
+
+ /**
+ * 文本信息下发
+ */
+ public static final int CMD_TEXT_INFO_DOWN = 0x8300;
+
+ /**
+ * 位置信息查询
+ */
+ public static final int CMD_LOCATION_INQUIRY = 0x8201;
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/Jt808Decoder.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/Jt808Decoder.java
new file mode 100644
index 0000000..f7ba279
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/Jt808Decoder.java
@@ -0,0 +1,295 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808;
+
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808ButtonEvent;
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808DataPack;
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808DataPack.PackHead;
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808LocationInfo;
+import com.viewshanghai.module.iot.gateway.codec.jt808.parser.Jt808ExtensionParser;
+import com.viewshanghai.module.iot.gateway.codec.jt808.parser.Jt808ExtensionParserFactory;
+import com.viewshanghai.module.iot.gateway.codec.jt808.util.Jt808BcdUtil;
+import com.viewshanghai.module.iot.gateway.codec.jt808.util.Jt808BitUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * JT808 协议解码器
+ *
+ * @author lzh
+ */
+@Slf4j
+public class Jt808Decoder {
+
+ private final Jt808BitUtil bitUtil;
+ private final Jt808BcdUtil bcdUtil;
+
+ public Jt808Decoder() {
+ this.bitUtil = new Jt808BitUtil();
+ this.bcdUtil = new Jt808BcdUtil();
+ }
+
+ /**
+ * 字节数组转JT808数据包
+ */
+ public Jt808DataPack bytes2PackageData(byte[] data) {
+ Jt808DataPack ret = new Jt808DataPack();
+
+ // 1. 解析消息头 (16byte 或 12byte)
+ PackHead msgHeader = this.parseMsgHeaderFromBytes(data);
+ ret.setPackHead(msgHeader);
+
+ // 2. 解析消息体
+ int msgBodyByteStartIndex = 12;
+ // 有子包信息,消息体起始字节后移四个字节
+ if (msgHeader.isHasSubPackage()) {
+ msgBodyByteStartIndex = 16;
+ }
+
+ byte[] bodyBytes = new byte[msgHeader.getBodyLength()];
+ System.arraycopy(data, msgBodyByteStartIndex, bodyBytes, 0, bodyBytes.length);
+ ret.setBodyBytes(bodyBytes);
+
+ // 3. 解析校验码
+ int checkSumInPkg = data[data.length - 1];
+ int calculatedCheckSum = this.bitUtil.getCheckSum4JT808(data, 0, data.length - 1);
+ ret.setCheckSum(checkSumInPkg);
+ if (checkSumInPkg != calculatedCheckSum) {
+ log.warn("[bytes2PackageData][校验码不一致, msgid: 0x{}, pkg: {}, calculated: {}]",
+ Integer.toHexString(msgHeader.getId()), checkSumInPkg, calculatedCheckSum);
+ }
+ return ret;
+ }
+
+ /**
+ * 解析消息头
+ */
+ private PackHead parseMsgHeaderFromBytes(byte[] data) {
+ PackHead msgHeader = new PackHead();
+
+ // 1. 消息ID word(16)
+ msgHeader.setId(this.parseIntFromBytes(data, 0, 2));
+
+ // 2. 消息体属性 word(16)
+ int msgBodyProps = this.parseIntFromBytes(data, 2, 2);
+ msgHeader.setBodyPropsField(msgBodyProps);
+ // [ 0-9 ] 消息体长度
+ msgHeader.setBodyLength(msgBodyProps & 0x3ff);
+ // [10-12] 加密类型
+ msgHeader.setEncryptionType((msgBodyProps & 0x1c00) >> 10);
+ // [ 13 ] 是否有子包
+ msgHeader.setHasSubPackage(((msgBodyProps & 0x2000) >> 13) == 1);
+ // [14-15] 保留位
+ msgHeader.setReservedBit(((msgBodyProps & 0xc000) >> 14) + "");
+
+ // 3. 终端手机号 bcd[6]
+ msgHeader.setTerminalPhone(this.parseBcdStringFromBytes(data, 4, 6));
+
+ // 4. 消息流水号 word(16)
+ msgHeader.setFlowId(this.parseIntFromBytes(data, 10, 2));
+
+ // 5. 消息包封装项（如果有子包）
+ if (msgHeader.isHasSubPackage()) {
+ msgHeader.setInfoField(this.parseIntFromBytes(data, 12, 4));
+ msgHeader.setSubPackage(this.parseIntFromBytes(data, 12, 2));
+ msgHeader.setSubPackageSequeue(this.parseIntFromBytes(data, 14, 2));
+ }
+
+ return msgHeader;
+ }
+
+ /**
+ * 解析位置信息上报消息
+ */
+ public Jt808LocationInfo toLocationInfoUploadMsg(Jt808DataPack packageData) {
+ Jt808LocationInfo ret = new Jt808LocationInfo();
+ final byte[] data = packageData.getBodyBytes();
+
+ // 1. byte[0-3] 报警标志(DWORD(32))
+ ret.setWarningFlagField(this.parseIntFromBytes(data, 0, 4));
+ // 2. byte[4-7] 状态(DWORD(32))
+ ret.setStatusField(this.parseIntFromBytes(data, 4, 4));
+ // 3. byte[8-11] 纬度(DWORD(32))
+ ret.setLatitude(this.parseIntFromBytes(data, 8, 4) / 1000000.0f);
+ // 4. byte[12-15] 经度(DWORD(32))
+ ret.setLongitude(this.parseIntFromBytes(data, 12, 4) / 1000000.0f);
+ // 5. byte[16-17] 高程(WORD(16))
+ ret.setElevation(this.parseIntFromBytes(data, 16, 2));
+ // 6. byte[18-19] 速度(WORD)
+ ret.setSpeed(this.parseIntFromBytes(data, 18, 2) / 10.0f);
+ // 7. byte[20-21] 方向(WORD)
+ ret.setDirection(this.parseIntFromBytes(data, 20, 2));
+ // 8. byte[22-27] 时间(BCD[6])
+ ret.setTime(this.parseBcdStringFromBytes(data, 22, 6));
+
+ // 9. 解析扩展字段 (从index 28开始)
+ parseExtensionFields(ret, data, 28);
+
+ return ret;
+ }
+
+ /**
+ * 解析扩展字段
+ */
+ private void parseExtensionFields(Jt808LocationInfo locationInfo, byte[] data, int startIndex) {
+ int index = startIndex;
+
+ while (index < data.length) {
+ // 确保至少有ID和长度字节
+ if (index + 1 >= data.length) {
+ break;
+ }
+
+ int extId = data[index] & 0xFF;
+ int extLen = data[index + 1] & 0xFF;
+
+ // 验证剩余长度
+ if (index + 2 + extLen > data.length) {
+ log.warn("[parseExtensionFields][扩展字段长度越界: ID=0x{}, Len={}, Remaining={}]",
+ String.format("%02X", extId), extLen, data.length - index - 2);
+ break;
+ }
+
+ int contentStart = index + 2;
+
+ // 尝试使用注册的解析器解析
+ Jt808ExtensionParser parser = Jt808ExtensionParserFactory.getParser(extId);
+ if (parser != null) {
+ try {
+ parser.parse(locationInfo, data, contentStart, extLen);
+ log.debug("[parseExtensionFields][扩展字段解析成功: ID=0x{}]",
+ String.format("%02X", extId));
+ } catch (Exception e) {
+ log.error("[parseExtensionFields][扩展字段解析失败: ID=0x{}]",
+ String.format("%02X", extId), e);
+ }
+ } else {
+ // 未知扩展字段，保存为原始字节数组
+ byte[] extData = new byte[extLen];
+ System.arraycopy(data, contentStart, extData, 0, extLen);
+ locationInfo.addExtension(extId, extData);
+ log.debug("[parseExtensionFields][未知扩展字段: ID=0x{}, Len={}]",
+ String.format("%02X", extId), extLen);
+ }
+
+ index += (2 + extLen);
+ }
+ }
+
+ /**
+ * 解析按键事件消息
+ */
+ public Jt808ButtonEvent toButtonEventMsg(Jt808DataPack packageData) {
+ Jt808ButtonEvent event = new Jt808ButtonEvent();
+ final byte[] data = packageData.getBodyBytes();
+
+ if (data.length >= 1) {
+ event.setKeyId(this.parseIntFromBytes(data, 0, 1));
+ }
+
+ if (data.length >= 2) {
+ event.setKeyState(this.parseIntFromBytes(data, 1, 1));
+ }
+
+ // 解析按键信息
+ event.parseKeyInfo();
+
+ return event;
+ }
+
+ /**
+ * 解析终端注册消息 (0x0100)
+ *
+ * @param packageData JT808 数据包
+ * @return 注册信息
+ */
+ public com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808RegisterInfo toRegisterMsg(Jt808DataPack packageData) {
+ com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808RegisterInfo registerInfo =
+ new com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808RegisterInfo();
+ final byte[] data = packageData.getBodyBytes();
+
+ if (data.length < 37) {
+ log.warn("[toRegisterMsg][注册消息体长度不足: {}]", data.length);
+ return registerInfo;
+ }
+
+ // 1. byte[0-1] 省域ID (WORD)
+ registerInfo.setProvinceId(this.parseIntFromBytes(data, 0, 2));
+
+ // 2. byte[2-3] 市县域ID (WORD)
+ registerInfo.setCityId(this.parseIntFromBytes(data, 2, 2));
+
+ // 3. byte[4-8] 制造商ID (BYTE[5])
+ registerInfo.setManufacturerId(this.parseStringFromBytes(data, 4, 5));
+
+ // 4. byte[9-28] 终端型号 (BYTE[20])
+ registerInfo.setTerminalType(this.parseStringFromBytes(data, 9, 20));
+
+ // 5. byte[29-35] 终端ID (BYTE[7])
+ registerInfo.setTerminalId(this.parseStringFromBytes(data, 29, 7));
+
+ // 6. byte[36] 车牌颜色 (BYTE)
+ registerInfo.setLicensePlateColor(this.parseIntFromBytes(data, 36, 1));
+
+ // 7. byte[37-x] 车牌 (STRING)
+ if (data.length > 37) {
+ registerInfo.setLicensePlate(this.parseStringFromBytes(data, 37, data.length - 37));
+ }
+
+ return registerInfo;
+ }
+
+ /**
+ * 解析字符串
+ */
+ protected String parseStringFromBytes(byte[] data, int startIndex, int length) {
+ return parseStringFromBytes(data, startIndex, length, null);
+ }
+
+ private String parseStringFromBytes(byte[] data, int startIndex, int length, String defaultVal) {
+ try {
+ byte[] tmp = new byte[length];
+ System.arraycopy(data, startIndex, tmp, 0, length);
+ return new String(tmp, Jt808Constants.DEFAULT_CHARSET);
+ } catch (Exception e) {
+ log.error("[parseStringFromBytes][解析字符串出错: {}]", e.getMessage());
+ return defaultVal;
+ }
+ }
+
+ /**
+ * 解析BCD字符串
+ */
+ private String parseBcdStringFromBytes(byte[] data, int startIndex, int length) {
+ return parseBcdStringFromBytes(data, startIndex, length, null);
+ }
+
+ private String parseBcdStringFromBytes(byte[] data, int startIndex, int length, String defaultVal) {
+ try {
+ byte[] tmp = new byte[length];
+ System.arraycopy(data, startIndex, tmp, 0, length);
+ return this.bcdUtil.bcd2String(tmp);
+ } catch (Exception e) {
+ log.error("[parseBcdStringFromBytes][解析BCD(8421码)出错: {}]", e.getMessage());
+ return defaultVal;
+ }
+ }
+
+ /**
+ * 解析整数
+ */
+ private int parseIntFromBytes(byte[] data, int startIndex, int length) {
+ return parseIntFromBytes(data, startIndex, length, 0);
+ }
+
+ private int parseIntFromBytes(byte[] data, int startIndex, int length, int defaultVal) {
+ try {
+ final int len = Math.min(length, 4);
+ byte[] tmp = new byte[len];
+ System.arraycopy(data, startIndex, tmp, 0, len);
+ return bitUtil.byteToInteger(tmp);
+ } catch (Exception e) {
+ log.error("[parseIntFromBytes][解析整数出错: {}]", e.getMessage());
+ return defaultVal;
+ }
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/Jt808Encoder.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/Jt808Encoder.java
new file mode 100644
index 0000000..52a7e43
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/Jt808Encoder.java
@@ -0,0 +1,155 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808;
+
+import com.viewshanghai.module.iot.gateway.codec.jt808.util.Jt808BitUtil;
+import com.viewshanghai.module.iot.gateway.codec.jt808.util.Jt808ProtocolUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Arrays;
+
+/**
+ * JT808 协议编码器
+ *
+ * @author lzh
+ */
+@Slf4j
+public class Jt808Encoder {
+
+ private final Jt808BitUtil bitUtil;
+ private final Jt808ProtocolUtil jt808Util;
+
+ public Jt808Encoder() {
+ this.bitUtil = new Jt808BitUtil();
+ this.jt808Util = new Jt808ProtocolUtil();
+ }
+
+ /**
+ * 编码通用应答消息
+ *
+ * @param phone 终端手机号
+ * @param replyFlowId 应答流水号
+ * @param replyId 应答ID
+ * @param replyCode 应答结果码
+ * @param flowId 消息流水号
+ * @return 编码后的字节数组
+ */
+ public byte[] encodeCommonResp(String phone, int replyFlowId, int replyId, byte replyCode, int flowId) {
+ try {
+ // 消息体
+ byte[] msgBody = this.bitUtil.concatAll(Arrays.asList(
+ bitUtil.integerTo2Bytes(replyFlowId), // 应答流水号
+ bitUtil.integerTo2Bytes(replyId), // 应答ID
+ new byte[]{replyCode} // 结果码
+ ));
+
+ // 消息头
+ int msgBodyProps = this.jt808Util.generateMsgBodyProps(msgBody.length, 0b000, false, 0);
+ byte[] msgHeader = this.jt808Util.generateMsgHeader(phone,
+ Jt808Constants.CMD_COMMON_RESP, msgBody, msgBodyProps, flowId);
+ byte[] headerAndBody = this.bitUtil.concatAll(msgHeader, msgBody);
+
+ // 校验码
+ int checkSum = this.bitUtil.getCheckSum4JT808(headerAndBody, 0, headerAndBody.length);
+
+ // 连接并转义
+ return this.doEncode(headerAndBody, checkSum);
+ } catch (Exception e) {
+ log.error("[encodeCommonResp][编码通用应答失败]", e);
+ throw new RuntimeException("编码通用应答失败", e);
+ }
+ }
+
+ /**
+ * 编码终端注册应答消息
+ *
+ * @param phone 终端手机号
+ * @param replyFlowId 应答流水号
+ * @param replyCode 应答结果码
+ * @param authToken 鉴权码（成功时必填）
+ * @param flowId 消息流水号
+ * @return 编码后的字节数组
+ */
+ public byte[] encodeRegisterResp(String phone, int replyFlowId, byte replyCode, String authToken, int flowId) {
+ try {
+ // 消息体
+ byte[] msgBody;
+ if (replyCode == 0 && authToken != null) {
+ // 成功：包含鉴权码
+ msgBody = this.bitUtil.concatAll(Arrays.asList(
+ bitUtil.integerTo2Bytes(replyFlowId), // 流水号
+ new byte[]{replyCode}, // 结果码
+ authToken.getBytes(Jt808Constants.DEFAULT_CHARSET) // 鉴权码
+ ));
+ } else {
+ // 失败：只有流水号和结果码
+ msgBody = this.bitUtil.concatAll(Arrays.asList(
+ bitUtil.integerTo2Bytes(replyFlowId), // 流水号
+ new byte[]{replyCode} // 结果码
+ ));
+ }
+
+ // 消息头
+ int msgBodyProps = this.jt808Util.generateMsgBodyProps(msgBody.length, 0b000, false, 0);
+ byte[] msgHeader = this.jt808Util.generateMsgHeader(phone,
+ Jt808Constants.CMD_REGISTER_RESP, msgBody, msgBodyProps, flowId);
+ byte[] headerAndBody = this.bitUtil.concatAll(msgHeader, msgBody);
+
+ // 校验码
+ int checkSum = this.bitUtil.getCheckSum4JT808(headerAndBody, 0, headerAndBody.length);
+
+ // 连接并转义
+ return this.doEncode(headerAndBody, checkSum);
+ } catch (Exception e) {
+ log.error("[encodeRegisterResp][编码注册应答失败]", e);
+ throw new RuntimeException("编码注册应答失败", e);
+ }
+ }
+
+ /**
+ * 编码文本信息下发消息
+ *
+ * @param phone 终端手机号
+ * @param flag 文本标志
+ * @param content 文本内容
+ * @param flowId 消息流水号
+ * @return 编码后的字节数组
+ */
+ public byte[] encodeTextInfoDown(String phone, byte flag, String content, int flowId) {
+ try {
+ byte[] contentBytes = content.getBytes(Jt808Constants.DEFAULT_CHARSET);
+ byte[] msgBody = this.bitUtil.concatAll(Arrays.asList(
+ new byte[]{flag}, // 标志
+ contentBytes // 文本信息
+ ));
+
+ // 消息头
+ int msgBodyProps = this.jt808Util.generateMsgBodyProps(msgBody.length, 0b000, false, 0);
+ byte[] msgHeader = this.jt808Util.generateMsgHeader(phone,
+ Jt808Constants.CMD_TEXT_INFO_DOWN, msgBody, msgBodyProps, flowId);
+ byte[] headerAndBody = this.bitUtil.concatAll(msgHeader, msgBody);
+
+ // 校验码
+ int checkSum = this.bitUtil.getCheckSum4JT808(headerAndBody, 0, headerAndBody.length);
+ return this.doEncode(headerAndBody, checkSum);
+ } catch (Exception e) {
+ log.error("[encodeTextInfoDown][编码文本下发失败]", e);
+ throw new RuntimeException("编码文本下发失败", e);
+ }
+ }
+
+ /**
+ * 编码完整消息（添加标识符和转义）
+ */
+ private byte[] doEncode(byte[] headerAndBody, int checkSum) throws Exception {
+ byte[] noEscapedBytes = this.bitUtil.concatAll(Arrays.asList(
+ new byte[]{(byte) Jt808Constants.PKG_DELIMITER}, // 0x7e
+ headerAndBody, // 消息头 + 消息体
+ bitUtil.integerTo1Bytes(checkSum), // 校验码
+ new byte[]{(byte) Jt808Constants.PKG_DELIMITER} // 0x7e
+ ));
+
+ // 转义（不包括首尾标识符）
+ return jt808Util.doEscape4Send(noEscapedBytes, 1, noEscapedBytes.length - 1);
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808BatteryInfo.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808BatteryInfo.java
new file mode 100644
index 0000000..b1bec35
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808BatteryInfo.java
@@ -0,0 +1,68 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.entity;
+
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * JT808 电池和版本信息
+ *
+ * 对应扩展字段 0xFE
+ *
+ * @author lzh
+ */
+@Data
+public class Jt808BatteryInfo {
+
+ /**
+ * 电池电量百分比 (0-100)
+ * 扩展字段 ID: 0x02
+ */
+ private Integer batteryLevel;
+
+ /**
+ * 版本信息
+ * 扩展字段 ID: 0x07
+ */
+ private String version;
+
+ /**
+ * ICCID (SIM卡号)
+ * 扩展字段 ID: 0x20
+ */
+ private String iccid;
+
+ /**
+ * 其他扩展数据
+ * Key: 子扩展字段ID
+ * Value: 数据值
+ */
+ private Map extraData;
+
+ public Jt808BatteryInfo() {
+ this.extraData = new HashMap<>();
+ }
+
+ /**
+ * 添加额外数据
+ */
+ public void addExtra(Integer id, String data) {
+ if (this.extraData == null) {
+ this.extraData = new HashMap<>();
+ }
+ this.extraData.put(id, data);
+ }
+
+ @Override
+ public String toString() {
+ return "Jt808BatteryInfo{" +
+ "batteryLevel=" + batteryLevel +
+ "%, version='" + version + '\'' +
+ ", iccid='" + iccid + '\'' +
+ ", extraData=" + extraData +
+ '}';
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808BluetoothInfo.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808BluetoothInfo.java
new file mode 100644
index 0000000..a6597d1
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808BluetoothInfo.java
@@ -0,0 +1,54 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.entity;
+
+import lombok.Data;
+
+/**
+ * JT808 蓝牙信息
+ *
+ * @author lzh
+ */
+@Data
+public class Jt808BluetoothInfo {
+
+ /**
+ * MAC 地址
+ */
+ private String mac;
+
+ /**
+ * RSSI 信号强度（负数，单位 dBm）
+ */
+ private Integer rssi;
+
+ /**
+ * 蓝牙类型
+ * 0xF3 - 蓝牙信标
+ * 0xF4 - 附近蓝牙设备
+ */
+ private Integer type;
+
+ /**
+ * 自定义数据（可选）
+ */
+ private String customData;
+
+ public Jt808BluetoothInfo() {
+ }
+
+ public Jt808BluetoothInfo(String mac, Integer rssi) {
+ this.mac = mac;
+ this.rssi = rssi;
+ }
+
+ @Override
+ public String toString() {
+ return "Jt808BluetoothInfo{" +
+ "mac='" + mac + '\'' +
+ ", rssi=" + rssi +
+ ", type=0x" + (type != null ? String.format("%02X", type) : "null") +
+ ", customData='" + customData + '\'' +
+ '}';
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808ButtonEvent.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808ButtonEvent.java
new file mode 100644
index 0000000..c0c79dc
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808ButtonEvent.java
@@ -0,0 +1,86 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.entity;
+
+import lombok.Data;
+
+/**
+ * JT808 按键事件
+ *
+ * 对应消息类型 0x0006
+ *
+ * @author lzh
+ */
+@Data
+public class Jt808ButtonEvent {
+
+ /**
+ * 按键ID
+ * 0x01 - 短按1号键
+ * 0x02 - 短按2号键
+ * 0x0B - 长按1号键
+ * 0x0C - 长按2号键
+ * 0x0D - 长按3号键
+ * 0x0E - 长按4号键
+ */
+ private Integer keyId;
+
+ /**
+ * 按键状态/次数
+ * 0x01 - 按键一次
+ * 0x02 - 按键两次
+ * ...
+ */
+ private Integer keyState;
+
+ /**
+ * 按键类型（解析后的）
+ */
+ private String keyType;
+
+ /**
+ * 按键编号（解析后的）
+ */
+ private Integer keyNumber;
+
+ /**
+ * 是否长按
+ */
+ private Boolean isLongPress;
+
+ /**
+ * 解析按键信息
+ */
+ public void parseKeyInfo() {
+ if (keyId == null) {
+ return;
+ }
+
+ // 解析按键类型和编号
+ if (keyId >= 0x01 && keyId <= 0x0A) {
+ // 短按
+ this.isLongPress = false;
+ this.keyNumber = keyId;
+ this.keyType = "short_press";
+ } else if (keyId >= 0x0B && keyId <= 0x0F) {
+ // 长按
+ this.isLongPress = true;
+ this.keyNumber = keyId - 0x0A;
+ this.keyType = "long_press";
+ } else {
+ // 未知类型
+ this.keyType = "unknown";
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "Jt808ButtonEvent{" +
+ "keyId=0x" + (keyId != null ? String.format("%02X", keyId) : "null") +
+ ", keyState=" + keyState +
+ ", keyType='" + keyType + '\'' +
+ ", keyNumber=" + keyNumber +
+ ", isLongPress=" + isLongPress +
+ '}';
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808DataPack.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808DataPack.java
new file mode 100644
index 0000000..c3f02c8
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808DataPack.java
@@ -0,0 +1,116 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.Arrays;
+
+/**
+ * JT808 数据包
+ *
+ * @author lzh
+ */
+@Data
+public class Jt808DataPack {
+
+ /**
+ * 16byte 消息头
+ */
+ protected PackHead packHead;
+
+ /**
+ * 消息体字节数组
+ */
+ @JsonIgnore
+ protected byte[] bodyBytes;
+
+ /**
+ * 校验码 1byte
+ */
+ protected int checkSum;
+
+ @Override
+ public String toString() {
+ return "Jt808DataPack{" +
+ "packHead=" + packHead +
+ ", bodyBytes=" + (bodyBytes != null ? Arrays.toString(bodyBytes) : "null") +
+ ", checkSum=" + checkSum +
+ '}';
+ }
+
+ /**
+ * JT808 消息头
+ */
+ @Data
+ public static class PackHead {
+
+ /**
+ * 消息ID
+ */
+ protected int id;
+
+ /**
+ * 消息体属性字段
+ */
+ protected int bodyPropsField;
+
+ /**
+ * 消息体长度
+ */
+ protected int bodyLength;
+
+ /**
+ * 数据加密方式
+ */
+ protected int encryptionType;
+
+ /**
+ * 是否分包
+ */
+ protected boolean hasSubPackage;
+
+ /**
+ * 保留位[14-15]
+ */
+ protected String reservedBit;
+
+ /**
+ * 终端手机号
+ */
+ protected String terminalPhone;
+
+ /**
+ * 流水号
+ */
+ protected int flowId;
+
+ /**
+ * 消息包封装项字段
+ */
+ protected int infoField;
+
+ /**
+ * 消息包总数(word(16))
+ */
+ protected long subPackage;
+
+ /**
+ * 包序号(word(16))
+ */
+ protected long subPackageSequeue;
+
+ @Override
+ public String toString() {
+ return "PackHead{" +
+ "id=0x" + Integer.toHexString(id) +
+ ", bodyLength=" + bodyLength +
+ ", encryptionType=" + encryptionType +
+ ", hasSubPackage=" + hasSubPackage +
+ ", terminalPhone='" + terminalPhone + '\'' +
+ ", flowId=" + flowId +
+ '}';
+ }
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808LocationInfo.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808LocationInfo.java
new file mode 100644
index 0000000..84ac149
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808LocationInfo.java
@@ -0,0 +1,107 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.entity;
+
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * JT808 位置信息
+ *
+ * @author lzh
+ */
+@Data
+public class Jt808LocationInfo {
+
+ /**
+ * 报警标志
+ */
+ private Integer warningFlagField;
+
+ /**
+ * 状态字段
+ */
+ private Integer statusField;
+
+ /**
+ * 纬度（度）
+ */
+ private Float latitude;
+
+ /**
+ * 经度（度）
+ */
+ private Float longitude;
+
+ /**
+ * 高程（米）
+ */
+ private Integer elevation;
+
+ /**
+ * 速度（km/h）
+ */
+ private Float speed;
+
+ /**
+ * 方向（0-359）
+ */
+ private Integer direction;
+
+ /**
+ * 时间（BCD格式字符串）
+ */
+ private String time;
+
+ /**
+ * 扩展字段映射
+ * Key: 扩展字段ID
+ * Value: 扩展字段值
+ */
+ private Map extensions = new HashMap<>();
+
+ // ========== 常用扩展字段（便于访问） ==========
+
+ /**
+ * 蓝牙设备列表
+ * 扩展字段 0xF3 (蓝牙信标) 或 0xF4 (附近蓝牙)
+ */
+ private List bluetoothInfos;
+
+ /**
+ * 电池和版本信息
+ * 扩展字段 0xFE
+ */
+ private Jt808BatteryInfo batteryInfo;
+
+ /**
+ * 里程（km）
+ * 扩展字段 0x01
+ */
+ private Float mileage;
+
+ /**
+ * 信号强度
+ * 扩展字段 0x30
+ */
+ private Integer signalStrength;
+
+ // ========== 扩展字段操作方法 ==========
+
+ /**
+ * 添加扩展字段
+ */
+ public void addExtension(int id, Object value) {
+ this.extensions.put(id, value);
+ }
+
+ /**
+ * 获取扩展字段
+ */
+ public Object getExtension(int id) {
+ return this.extensions.get(id);
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808RegisterInfo.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808RegisterInfo.java
new file mode 100644
index 0000000..4402513
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/entity/Jt808RegisterInfo.java
@@ -0,0 +1,60 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.entity;
+
+import lombok.Data;
+
+/**
+ * JT808 终端注册信息
+ *
+ * @author lzh
+ */
+@Data
+public class Jt808RegisterInfo {
+
+ /**
+ * 省域ID (WORD)
+ * 设备安装车辆所在的省域，省域ID采用GB/T2260中规定的行政区划代码6位中前两位
+ * 0保留，由平台取默认值
+ */
+ private Integer provinceId;
+
+ /**
+ * 市县域ID (WORD)
+ * 设备安装车辆所在的市域或县域，市县域ID采用GB/T2260中规定的行政区划代码6位中后四位
+ * 0保留，由平台取默认值
+ */
+ private Integer cityId;
+
+ /**
+ * 制造商ID (BYTE[5])
+ * 5个字节，终端制造商编码
+ */
+ private String manufacturerId;
+
+ /**
+ * 终端型号 (BYTE[20])
+ * 20个字节，此终端型号由制造商自行定义，位数不足时，后补"0X00"
+ */
+ private String terminalType;
+
+ /**
+ * 终端ID (BYTE[7])
+ * 7个字节，由大写字母和数字组成，此终端ID由制造商自行定义，位数不足时，后补"0X00"
+ */
+ private String terminalId;
+
+ /**
+ * 车牌颜色 (BYTE)
+ * 车牌颜色，按照 JT/T415-2006 的 5.4.12
+ * 0-未上车牌, 1-蓝色, 2-黄色, 3-黑色, 4-白色, 9-其他
+ */
+ private Integer licensePlateColor;
+
+ /**
+ * 车牌 (STRING)
+ * 车牌颜色为0时，表示车辆VIN；否则，表示公安交通管理部门颁发的机动车号牌
+ */
+ private String licensePlate;
+
+}
+
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808BatteryInfoParser.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808BatteryInfoParser.java
new file mode 100644
index 0000000..a8f2595
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808BatteryInfoParser.java
@@ -0,0 +1,134 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.parser;
+
+import com.viewshanghai.module.iot.gateway.codec.jt808.Jt808Constants;
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808BatteryInfo;
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808LocationInfo;
+import com.viewshanghai.module.iot.gateway.codec.jt808.util.Jt808BcdUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * JT808 电池和版本信息解析器
+ *
+ * 扩展字段 ID: 0xFE
+ *
+ * 格式：E6 + N * (子ID 1字节 + 长度 2字节 + 数据)
+ *
+ * 子扩展字段：
+ * - 0x02: 电池电量 (1字节)
+ * - 0x07: 版本信息 (ASCII字符串)
+ * - 0x20: ICCID (10字节 BCD)
+ *
+ * @author lzh
+ */
+@Slf4j
+public class Jt808BatteryInfoParser implements Jt808ExtensionParser {
+
+ private final Jt808BcdUtil bcdUtil = new Jt808BcdUtil();
+
+ @Override
+ public int getExtensionId() {
+ return 0xFE;
+ }
+
+ @Override
+ public void parse(Jt808LocationInfo locationInfo, byte[] data, int offset, int length) {
+ try {
+ Jt808BatteryInfo batteryInfo = new Jt808BatteryInfo();
+
+ // 检查是否以 0xE6 开头
+ int currentOffset = offset;
+ if (length > 0 && (data[currentOffset] & 0xFF) == 0xE6) {
+ currentOffset++; // 跳过 E6 标识
+
+ // 循环解析子扩展字段
+ while (currentOffset < offset + length) {
+ // 检查剩余长度 (至少需要 ID 1字节 + 长度 2字节)
+ if (currentOffset + 3 > offset + length) {
+ break;
+ }
+
+ // 读取子扩展字段 ID
+ int subId = data[currentOffset] & 0xFF;
+ currentOffset++;
+
+ // 读取子扩展字段长度 (2字节大端序)
+ int subLen = ((data[currentOffset] & 0xFF) << 8) | (data[currentOffset + 1] & 0xFF);
+ currentOffset += 2;
+
+ // 检查数据长度
+ if (currentOffset + subLen > offset + length) {
+ log.warn("[parse][0xFE 子字段长度越界: ID=0x{}, Len={}, Remaining={}]",
+ String.format("%02X", subId), subLen, offset + length - currentOffset);
+ break;
+ }
+
+ // 解析具体字段
+ parseSubField(batteryInfo, subId, data, currentOffset, subLen);
+
+ currentOffset += subLen;
+ }
+ }
+
+ locationInfo.setBatteryInfo(batteryInfo);
+ log.debug("[parse][电池信息解析完成: {}]", batteryInfo);
+ } catch (Exception e) {
+ log.error("[parse][电池信息解析失败]", e);
+ }
+ }
+
+ /**
+ * 解析子扩展字段
+ */
+ private void parseSubField(Jt808BatteryInfo batteryInfo, int subId, byte[] data, int offset, int length) {
+ try {
+ switch (subId) {
+ case 0x02 -> {
+ // 电池电量 (1字节，百分比)
+ if (length >= 1) {
+ int batteryLevel = data[offset] & 0xFF;
+ batteryInfo.setBatteryLevel(batteryLevel);
+ log.debug("[parseSubField][电池电量: {}%]", batteryLevel);
+ }
+ }
+ case 0x07 -> {
+ // 版本信息 (ASCII 字符串)
+ String version = new String(data, offset, length, Jt808Constants.DEFAULT_CHARSET);
+ batteryInfo.setVersion(version.trim());
+ log.debug("[parseSubField][版本信息: {}]", version);
+ }
+ case 0x20 -> {
+ // ICCID (10字节 BCD)
+ if (length >= 10) {
+ byte[] iccidBytes = new byte[10];
+ System.arraycopy(data, offset, iccidBytes, 0, 10);
+ String iccid = bcdUtil.bcd2String(iccidBytes);
+ batteryInfo.setIccid(iccid);
+ log.debug("[parseSubField][ICCID: {}]", iccid);
+ }
+ }
+ default -> {
+ // 其他未知子字段，保存为十六进制字符串
+ String hexData = bytesToHex(data, offset, length);
+ batteryInfo.addExtra(subId, hexData);
+ log.debug("[parseSubField][未知字段 0x{}: {}]",
+ String.format("%02X", subId), hexData);
+ }
+ }
+ } catch (Exception e) {
+ log.error("[parseSubField][解析子字段失败: ID=0x{}]", String.format("%02X", subId), e);
+ }
+ }
+
+ /**
+ * 字节数组转十六进制字符串
+ */
+ private String bytesToHex(byte[] data, int offset, int length) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < length; i++) {
+ sb.append(String.format("%02X", data[offset + i]));
+ }
+ return sb.toString();
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808BluetoothBeaconParser.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808BluetoothBeaconParser.java
new file mode 100644
index 0000000..cc84618
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808BluetoothBeaconParser.java
@@ -0,0 +1,102 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.parser;
+
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808BluetoothInfo;
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808LocationInfo;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * JT808 蓝牙信标解析器
+ *
+ * 扩展字段 ID: 0xF3
+ *
+ * 格式：E6 0C Count + N * (MAC 6字节 + RSSI 1字节)
+ *
+ * @author lzh
+ */
+@Slf4j
+public class Jt808BluetoothBeaconParser implements Jt808ExtensionParser {
+
+ @Override
+ public int getExtensionId() {
+ return 0xF3;
+ }
+
+ @Override
+ public void parse(Jt808LocationInfo locationInfo, byte[] data, int offset, int length) {
+ try {
+ // 格式: E6 (1 byte) + 0C (1 byte) + Count (1 byte) + 数据
+ if (length < 3) {
+ log.warn("[parse][蓝牙信标数据长度不足: {}]", length);
+ return;
+ }
+
+ int currentOffset = offset + 2; // 跳过 E6 0C
+ int count = data[currentOffset] & 0xFF;
+ currentOffset++;
+
+ List list = locationInfo.getBluetoothInfos();
+ if (list == null) {
+ list = new ArrayList<>();
+ }
+
+ for (int i = 0; i < count; i++) {
+ // 检查剩余长度
+ if (currentOffset + 7 > offset + length) {
+ log.warn("[parse][蓝牙信标数据不完整: 期望 {}, 剩余 {}]",
+ count, offset + length - currentOffset);
+ break;
+ }
+
+ // 读取 MAC 地址 (6 字节)
+ byte[] macBytes = new byte[6];
+ System.arraycopy(data, currentOffset, macBytes, 0, 6);
+ String mac = formatMac(bytesToHex(macBytes));
+
+ // 读取 RSSI (1 字节, 有符号)
+ int rssi = data[currentOffset + 6];
+
+ Jt808BluetoothInfo info = new Jt808BluetoothInfo(mac, rssi);
+ info.setType(0xF3);
+ list.add(info);
+
+ currentOffset += 7;
+ }
+
+ locationInfo.setBluetoothInfos(list);
+ log.debug("[parse][蓝牙信标解析完成: 数量={}]", list.size());
+ } catch (Exception e) {
+ log.error("[parse][蓝牙信标解析失败]", e);
+ }
+ }
+
+ /**
+ * 字节数组转十六进制字符串
+ */
+ private String bytesToHex(byte[] bytes) {
+ StringBuilder sb = new StringBuilder();
+ for (byte b : bytes) {
+ sb.append(String.format("%02X", b));
+ }
+ return sb.toString();
+ }
+
+ /**
+ * 格式化 MAC 地址
+ * 例如: 112233445566 → 11:22:33:44:55:66
+ */
+ private String formatMac(String hex) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < hex.length(); i += 2) {
+ if (i > 0) {
+ sb.append(":");
+ }
+ sb.append(hex.substring(i, Math.min(i + 2, hex.length())));
+ }
+ return sb.toString().toUpperCase();
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808ExtensionParser.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808ExtensionParser.java
new file mode 100644
index 0000000..a77f972
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808ExtensionParser.java
@@ -0,0 +1,30 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.parser;
+
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808LocationInfo;
+
+/**
+ * JT808 扩展字段解析器接口
+ *
+ * @author lzh
+ */
+public interface Jt808ExtensionParser {
+
+ /**
+ * 获取扩展字段ID
+ *
+ * @return 扩展字段ID (如 0xF3, 0xFE 等)
+ */
+ int getExtensionId();
+
+ /**
+ * 解析扩展字段
+ *
+ * @param locationInfo 位置信息对象（将解析结果填充到此对象）
+ * @param data 完整的消息字节数组
+ * @param offset 扩展字段内容的起始偏移量
+ * @param length 扩展字段内容的长度
+ */
+ void parse(Jt808LocationInfo locationInfo, byte[] data, int offset, int length);
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808ExtensionParserFactory.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808ExtensionParserFactory.java
new file mode 100644
index 0000000..8b575fd
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808ExtensionParserFactory.java
@@ -0,0 +1,49 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.parser;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * JT808 扩展字段解析器工厂
+ *
+ * @author lzh
+ */
+public class Jt808ExtensionParserFactory {
+
+ private static final Map PARSERS = new HashMap<>();
+
+ static {
+ // 注册所有解析器
+ register(new Jt808BluetoothBeaconParser()); // 0xF3 - 蓝牙信标
+ register(new Jt808NearbyBleParser()); // 0xF4 - 附近蓝牙
+ register(new Jt808BatteryInfoParser()); // 0xFE - 电池版本信息
+ register(new Jt808MileageParser()); // 0x01 - 里程
+ register(new Jt808SignalStrengthParser()); // 0x30 - 信号强度
+ }
+
+ /**
+ * 注册解析器
+ */
+ public static void register(Jt808ExtensionParser parser) {
+ PARSERS.put(parser.getExtensionId(), parser);
+ }
+
+ /**
+ * 获取解析器
+ *
+ * @param extensionId 扩展字段ID
+ * @return 对应的解析器，如果不存在则返回 null
+ */
+ public static Jt808ExtensionParser getParser(int extensionId) {
+ return PARSERS.get(extensionId);
+ }
+
+ /**
+ * 是否支持该扩展字段
+ */
+ public static boolean isSupported(int extensionId) {
+ return PARSERS.containsKey(extensionId);
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808MileageParser.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808MileageParser.java
new file mode 100644
index 0000000..77e7e92
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808MileageParser.java
@@ -0,0 +1,48 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.parser;
+
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808LocationInfo;
+import com.viewshanghai.module.iot.gateway.codec.jt808.util.Jt808BitUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * JT808 里程解析器
+ *
+ * 扩展字段 ID: 0x01
+ *
+ * 格式：4字节 DWORD，单位：0.1km
+ *
+ * @author lzh
+ */
+@Slf4j
+public class Jt808MileageParser implements Jt808ExtensionParser {
+
+ private final Jt808BitUtil bitUtil = new Jt808BitUtil();
+
+ @Override
+ public int getExtensionId() {
+ return 0x01;
+ }
+
+ @Override
+ public void parse(Jt808LocationInfo locationInfo, byte[] data, int offset, int length) {
+ try {
+ if (length >= 4) {
+ byte[] mileageBytes = new byte[4];
+ System.arraycopy(data, offset, mileageBytes, 0, 4);
+
+ // 读取里程（DWORD, 单位：0.1km）
+ int mileageValue = bitUtil.byteToInteger(mileageBytes);
+ Float mileage = mileageValue / 10.0f;
+
+ locationInfo.setMileage(mileage);
+ log.debug("[parse][里程解析完成: {} km]", mileage);
+ } else {
+ log.warn("[parse][里程数据长度不足: {}]", length);
+ }
+ } catch (Exception e) {
+ log.error("[parse][里程解析失败]", e);
+ }
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808NearbyBleParser.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808NearbyBleParser.java
new file mode 100644
index 0000000..5095e36
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808NearbyBleParser.java
@@ -0,0 +1,86 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.parser;
+
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808BluetoothInfo;
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808LocationInfo;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * JT808 附近蓝牙设备解析器
+ *
+ * 扩展字段 ID: 0xF4
+ *
+ * 格式：Count (1字节) + N * (MAC 6字节 + RSSI 1字节)
+ *
+ * @author lzh
+ */
+@Slf4j
+public class Jt808NearbyBleParser implements Jt808ExtensionParser {
+
+ @Override
+ public int getExtensionId() {
+ return 0xF4;
+ }
+
+ @Override
+ public void parse(Jt808LocationInfo locationInfo, byte[] data, int offset, int length) {
+ try {
+ // 格式: Count (1 byte) + 数据
+ if (length < 1) {
+ log.warn("[parse][附近蓝牙数据长度不足: {}]", length);
+ return;
+ }
+
+ int count = data[offset] & 0xFF;
+ int currentOffset = offset + 1;
+
+ List list = locationInfo.getBluetoothInfos();
+ if (list == null) {
+ list = new ArrayList<>();
+ }
+
+ for (int i = 0; i < count; i++) {
+ // 检查剩余长度
+ if (currentOffset + 7 > offset + length) {
+ log.warn("[parse][附近蓝牙数据不完整: 期望 {}, 剩余 {}]",
+ count, offset + length - currentOffset);
+ break;
+ }
+
+ // 读取 MAC 地址 (6 字节)
+ byte[] macBytes = new byte[6];
+ System.arraycopy(data, currentOffset, macBytes, 0, 6);
+ String mac = bytesToHex(macBytes);
+
+ // 读取 RSSI (1 字节)
+ int rssi = data[currentOffset + 6];
+
+ Jt808BluetoothInfo info = new Jt808BluetoothInfo(mac, rssi);
+ info.setType(0xF4);
+ list.add(info);
+
+ currentOffset += 7;
+ }
+
+ locationInfo.setBluetoothInfos(list);
+ log.debug("[parse][附近蓝牙解析完成: 数量={}]", list.size());
+ } catch (Exception e) {
+ log.error("[parse][附近蓝牙解析失败]", e);
+ }
+ }
+
+ /**
+ * 字节数组转十六进制字符串
+ */
+ private String bytesToHex(byte[] bytes) {
+ StringBuilder sb = new StringBuilder();
+ for (byte b : bytes) {
+ sb.append(String.format("%02X", b));
+ }
+ return sb.toString();
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808SignalStrengthParser.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808SignalStrengthParser.java
new file mode 100644
index 0000000..049e0f4
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/parser/Jt808SignalStrengthParser.java
@@ -0,0 +1,39 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.parser;
+
+import com.viewshanghai.module.iot.gateway.codec.jt808.entity.Jt808LocationInfo;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * JT808 信号强度解析器
+ *
+ * 扩展字段 ID: 0x30
+ *
+ * 格式：1字节 BYTE，无线通信网络信号强度
+ *
+ * @author lzh
+ */
+@Slf4j
+public class Jt808SignalStrengthParser implements Jt808ExtensionParser {
+
+ @Override
+ public int getExtensionId() {
+ return 0x30;
+ }
+
+ @Override
+ public void parse(Jt808LocationInfo locationInfo, byte[] data, int offset, int length) {
+ try {
+ if (length >= 1) {
+ int signalStrength = data[offset] & 0xFF;
+ locationInfo.setSignalStrength(signalStrength);
+ log.debug("[parse][信号强度解析完成: {}]", signalStrength);
+ } else {
+ log.warn("[parse][信号强度数据长度不足: {}]", length);
+ }
+ } catch (Exception e) {
+ log.error("[parse][信号强度解析失败]", e);
+ }
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/util/Jt808BcdUtil.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/util/Jt808BcdUtil.java
new file mode 100644
index 0000000..2011912
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/util/Jt808BcdUtil.java
@@ -0,0 +1,64 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.util;
+
+/**
+ * JT808 BCD码转换工具类
+ *
+ * @author lzh
+ */
+public class Jt808BcdUtil {
+
+ /**
+ * BCD字节数组 ==> String
+ *
+ * @param bytes BCD字节数组
+ * @return 十进制字符串
+ */
+ public String bcd2String(byte[] bytes) {
+ StringBuilder temp = new StringBuilder(bytes.length * 2);
+ for (byte b : bytes) {
+ // 高四位
+ temp.append((b & 0xf0) >>> 4);
+ // 低四位
+ temp.append(b & 0x0f);
+ }
+ return temp.toString().substring(0, 1).equalsIgnoreCase("0")
+ ? temp.toString().substring(1)
+ : temp.toString();
+ }
+
+ /**
+ * 字符串 ==> BCD字节数组
+ *
+ * @param str 十进制字符串
+ * @return BCD字节数组
+ */
+ public byte[] string2Bcd(String str) {
+ // 奇数,前补零
+ if ((str.length() & 0x1) == 1) {
+ str = "0" + str;
+ }
+
+ byte[] ret = new byte[str.length() / 2];
+ byte[] bs = str.getBytes();
+ for (int i = 0; i < ret.length; i++) {
+ byte high = ascII2Bcd(bs[2 * i]);
+ byte low = ascII2Bcd(bs[2 * i + 1]);
+ ret[i] = (byte) ((high << 4) | low);
+ }
+ return ret;
+ }
+
+ private byte ascII2Bcd(byte asc) {
+ if ((asc >= '0') && (asc <= '9')) {
+ return (byte) (asc - '0');
+ } else if ((asc >= 'A') && (asc <= 'F')) {
+ return (byte) (asc - 'A' + 10);
+ } else if ((asc >= 'a') && (asc <= 'f')) {
+ return (byte) (asc - 'a' + 10);
+ } else {
+ return (byte) (asc - 48);
+ }
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/util/Jt808BitUtil.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/util/Jt808BitUtil.java
new file mode 100644
index 0000000..a469f69
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/util/Jt808BitUtil.java
@@ -0,0 +1,182 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.util;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * JT808 位操作工具类
+ *
+ * @author lzh
+ */
+public class Jt808BitUtil {
+
+ /**
+ * 把一个整形改为1位的byte数组
+ */
+ public byte[] integerTo1Bytes(int value) {
+ return new byte[]{(byte) (value & 0xFF)};
+ }
+
+ /**
+ * 把一个整形改为2位的byte数组
+ */
+ public byte[] integerTo2Bytes(int value) {
+ byte[] result = new byte[2];
+ result[0] = (byte) ((value >>> 8) & 0xFF);
+ result[1] = (byte) (value & 0xFF);
+ return result;
+ }
+
+ /**
+ * 把一个整形改为3位的byte数组
+ */
+ public byte[] integerTo3Bytes(int value) {
+ byte[] result = new byte[3];
+ result[0] = (byte) ((value >>> 16) & 0xFF);
+ result[1] = (byte) ((value >>> 8) & 0xFF);
+ result[2] = (byte) (value & 0xFF);
+ return result;
+ }
+
+ /**
+ * 把一个整形改为4位的byte数组
+ */
+ public byte[] integerTo4Bytes(int value) {
+ byte[] result = new byte[4];
+ result[0] = (byte) ((value >>> 24) & 0xFF);
+ result[1] = (byte) ((value >>> 16) & 0xFF);
+ result[2] = (byte) ((value >>> 8) & 0xFF);
+ result[3] = (byte) (value & 0xFF);
+ return result;
+ }
+
+ /**
+ * 把byte[]转化为整形
+ */
+ public int byteToInteger(byte[] value) {
+ if (value.length == 1) {
+ return oneByteToInteger(value[0]);
+ } else if (value.length == 2) {
+ return twoBytesToInteger(value);
+ } else if (value.length == 3) {
+ return threeBytesToInteger(value);
+ } else {
+ return fourBytesToInteger(value);
+ }
+ }
+
+ /**
+ * 把一个byte转化为整形
+ */
+ public int oneByteToInteger(byte value) {
+ return (int) value & 0xFF;
+ }
+
+ /**
+ * 把一个2位的数组转化为整形
+ */
+ public int twoBytesToInteger(byte[] value) {
+ int temp0 = value[0] & 0xFF;
+ int temp1 = value[1] & 0xFF;
+ return ((temp0 << 8) + temp1);
+ }
+
+ /**
+ * 把一个3位的数组转化为整形
+ */
+ public int threeBytesToInteger(byte[] value) {
+ int temp0 = value[0] & 0xFF;
+ int temp1 = value[1] & 0xFF;
+ int temp2 = value[2] & 0xFF;
+ return ((temp0 << 16) + (temp1 << 8) + temp2);
+ }
+
+ /**
+ * 把一个4位的数组转化为整形
+ */
+ public int fourBytesToInteger(byte[] value) {
+ int temp0 = value[0] & 0xFF;
+ int temp1 = value[1] & 0xFF;
+ int temp2 = value[2] & 0xFF;
+ int temp3 = value[3] & 0xFF;
+ return ((temp0 << 24) + (temp1 << 16) + (temp2 << 8) + temp3);
+ }
+
+ /**
+ * 把一个4位的数组转化为长整形
+ */
+ public long fourBytesToLong(byte[] value) {
+ int temp0 = value[0] & 0xFF;
+ int temp1 = value[1] & 0xFF;
+ int temp2 = value[2] & 0xFF;
+ int temp3 = value[3] & 0xFF;
+ return (((long) temp0 << 24) + (temp1 << 16) + (temp2 << 8) + temp3);
+ }
+
+ /**
+ * 合并字节数组
+ */
+ public byte[] concatAll(byte[] first, byte[]... rest) {
+ int totalLength = first.length;
+ for (byte[] array : rest) {
+ if (array != null) {
+ totalLength += array.length;
+ }
+ }
+ byte[] result = Arrays.copyOf(first, totalLength);
+ int offset = first.length;
+ for (byte[] array : rest) {
+ if (array != null) {
+ System.arraycopy(array, 0, result, offset, array.length);
+ offset += array.length;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 合并字节数组
+ */
+ public byte[] concatAll(List rest) {
+ int totalLength = 0;
+ for (byte[] array : rest) {
+ if (array != null) {
+ totalLength += array.length;
+ }
+ }
+ byte[] result = new byte[totalLength];
+ int offset = 0;
+ for (byte[] array : rest) {
+ if (array != null) {
+ System.arraycopy(array, 0, result, offset, array.length);
+ offset += array.length;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 字节数组转浮点数
+ */
+ public float byte2Float(byte[] bs) {
+ return Float.intBitsToFloat(
+ (((bs[3] & 0xFF) << 24) + ((bs[2] & 0xFF) << 16) + ((bs[1] & 0xFF) << 8) + (bs[0] & 0xFF)));
+ }
+
+ /**
+ * 计算JT808校验码
+ */
+ public int getCheckSum4JT808(byte[] bs, int start, int end) {
+ if (start < 0 || end > bs.length) {
+ throw new ArrayIndexOutOfBoundsException("getCheckSum4JT808 error : index out of bounds(start=" + start
+ + ",end=" + end + ",bytes length=" + bs.length + ")");
+ }
+ int cs = 0;
+ for (int i = start; i < end; i++) {
+ cs ^= bs[i];
+ }
+ return cs;
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/util/Jt808ProtocolUtil.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/util/Jt808ProtocolUtil.java
new file mode 100644
index 0000000..f4ab8d5
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/util/Jt808ProtocolUtil.java
@@ -0,0 +1,140 @@
+package com.viewshanghai.module.iot.gateway.codec.jt808.util;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.ByteArrayOutputStream;
+
+/**
+ * JT808协议转义工具类
+ *
+ * 0x7d01 <==> 0x7d
+ * 0x7d02 <==> 0x7e
+ *
+ *
+ * @author lzh
+ */
+@Slf4j
+public class Jt808ProtocolUtil {
+
+ private final Jt808BitUtil bitOperator;
+ private final Jt808BcdUtil bcd8421Operater;
+
+ public Jt808ProtocolUtil() {
+ this.bitOperator = new Jt808BitUtil();
+ this.bcd8421Operater = new Jt808BcdUtil();
+ }
+
+ /**
+ * 接收消息时转义（反转义）
+ *
+ * 0x7d01 <==> 0x7d
+ * 0x7d02 <==> 0x7e
+ *
+ */
+ public byte[] doEscape4Receive(byte[] bs, int start, int end) throws Exception {
+ if (start < 0 || end > bs.length) {
+ throw new ArrayIndexOutOfBoundsException("doEscape4Receive error : index out of bounds(start=" + start
+ + ",end=" + end + ",bytes length=" + bs.length + ")");
+ }
+
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ // 写入起始部分
+ for (int i = 0; i < start; i++) {
+ baos.write(bs[i]);
+ }
+ // 处理需要反转义的部分
+ for (int i = start; i < end - 1; i++) {
+ if (bs[i] == 0x7d && bs[i + 1] == 0x01) {
+ baos.write(0x7d);
+ i++;
+ } else if (bs[i] == 0x7d && bs[i + 1] == 0x02) {
+ baos.write(0x7e);
+ i++;
+ } else {
+ baos.write(bs[i]);
+ }
+ }
+ // 写入结束部分
+ for (int i = end - 1; i < bs.length; i++) {
+ baos.write(bs[i]);
+ }
+ return baos.toByteArray();
+ }
+ }
+
+ /**
+ * 发送消息时转义
+ *
+ * 0x7d <==> 0x7d01
+ * 0x7e <==> 0x7d02
+ *
+ */
+ public byte[] doEscape4Send(byte[] bs, int start, int end) throws Exception {
+ if (start < 0 || end > bs.length) {
+ throw new ArrayIndexOutOfBoundsException("doEscape4Send error : index out of bounds(start=" + start
+ + ",end=" + end + ",bytes length=" + bs.length + ")");
+ }
+
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ // 写入起始部分
+ for (int i = 0; i < start; i++) {
+ baos.write(bs[i]);
+ }
+ // 处理需要转义的部分
+ for (int i = start; i < end; i++) {
+ if (bs[i] == 0x7e) {
+ baos.write(0x7d);
+ baos.write(0x02);
+ } else if (bs[i] == 0x7d) {
+ baos.write(0x7d);
+ baos.write(0x01);
+ } else {
+ baos.write(bs[i]);
+ }
+ }
+ // 写入结束部分
+ for (int i = end; i < bs.length; i++) {
+ baos.write(bs[i]);
+ }
+ return baos.toByteArray();
+ }
+ }
+
+ /**
+ * 生成消息体属性
+ */
+ public int generateMsgBodyProps(int msgLen, int encryptionType, boolean isSubPackage, int reversed_14_15) {
+ // [ 0-9 ] 消息体长度
+ // [10-12] 加密类型
+ // [ 13 ] 是否有子包
+ // [14-15] 保留位
+ if (msgLen >= 1024) {
+ log.warn("The max value of msgLen is 1023, but {} .", msgLen);
+ }
+ int subPkg = isSubPackage ? 1 : 0;
+ return (msgLen & 0x3FF)
+ | ((encryptionType << 10) & 0x1C00)
+ | ((subPkg << 13) & 0x2000)
+ | ((reversed_14_15 << 14) & 0xC000);
+ }
+
+ /**
+ * 生成消息头
+ */
+ public byte[] generateMsgHeader(String phone, int msgType, byte[] body, int msgBodyProps, int flowId)
+ throws Exception {
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ // 1. 消息ID word(16)
+ baos.write(bitOperator.integerTo2Bytes(msgType));
+ // 2. 消息体属性 word(16)
+ baos.write(bitOperator.integerTo2Bytes(msgBodyProps));
+ // 3. 终端手机号 bcd[6]
+ baos.write(bcd8421Operater.string2Bcd(phone));
+ // 4. 消息流水号 word(16)
+ baos.write(bitOperator.integerTo2Bytes(flowId));
+ return baos.toByteArray();
+ }
+ }
+
+}
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/people/IotPeopleCounterCodec.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/people/IotPeopleCounterCodec.java
new file mode 100644
index 0000000..d2c953f
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/people/IotPeopleCounterCodec.java
@@ -0,0 +1,131 @@
+package com.viewshanghai.module.iot.gateway.codec.people;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.viewshanghai.framework.common.util.json.JsonUtils;
+import com.viewshanghai.module.iot.core.enums.IotDeviceMessageMethodEnum;
+import com.viewshanghai.module.iot.core.mq.message.IotDeviceMessage;
+import com.viewshanghai.module.iot.gateway.codec.IotDeviceMessageCodec;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 客流计数器设备 编解码器
+ *
+ * 适配设备上传的特定 JSON 格式
+ */
+@Slf4j
+@Component
+public class IotPeopleCounterCodec implements IotDeviceMessageCodec {
+
+ /**
+ * 编解码器类型，需要在设备管理中配置为该值
+ */
+ public static final String TYPE = "PEOPLE_COUNTER";
+
+ @Override
+ public String type() {
+ return TYPE;
+ }
+
+ @Override
+ public IotDeviceMessage decode(byte[] bytes) {
+ // 1. 预处理：转换字符串并修复可能的中文引号问题
+ String jsonStr = new String(bytes, StandardCharsets.UTF_8);
+ jsonStr = jsonStr.replace("“", "\"").replace("”", "\""); // 修复中文双引号
+
+ // 2. 解析 JSON
+ PeopleCounterPayload payload;
+ try {
+ payload = JsonUtils.parseObject(jsonStr, PeopleCounterPayload.class);
+ } catch (Exception e) {
+ log.error("[decode][解析设备数据失败: {}]", jsonStr, e);
+ throw new IllegalArgumentException("JSON 格式错误");
+ }
+ Assert.notNull(payload, "消息内容不能为空");
+
+ // 3. 构建属性参数 Map (params)
+ Map params = MapUtil.newHashMap();
+ // 3.1 基础属性
+ params.put("rssi", payload.getRssi());
+ params.put("model", payload.getModel());
+ params.put("version", payload.getVersion());
+ params.put("pair_status", StrUtil.trim(payload.getPair())); // 去除可能的空格
+
+ // 3.2 业务数据 (取 data 列表中时间最新的一条)
+ LocalDateTime reportTime = LocalDateTime.now();
+ if (CollUtil.isNotEmpty(payload.getData())) {
+ // 尝试按时间排序取最新，或者直接取最后一条（视设备协议而定，这里假设时间字符串可排序）
+ PeopleCounterData latestData = payload.getData().stream()
+ .max(Comparator.comparing(PeopleCounterData::getTime))
+ .orElse(payload.getData().get(payload.getData().size() - 1));
+
+ params.put("people_in", latestData.getIn());
+ params.put("people_out", latestData.getOut());
+ params.put("battery_rx", latestData.getRxBat());
+ params.put("battery_tx", latestData.getTxBat());
+
+ // 解析上报时间（改为使用本地当前时间）
+// if (StrUtil.isNotBlank(latestData.getTime())) {
+// try {
+// // 格式：20250501093000 -> yyyyMMddHHmmss
+// reportTime = LocalDateTimeUtil.parse(latestData.getTime(), DatePattern.PURE_DATETIME_PATTERN);
+// } catch (Exception e) {
+// log.warn("[decode][时间格式解析失败: {}]", latestData.getTime());
+// }
+// }
+ }
+
+ // 4. 构建 IotDeviceMessage
+ return IotDeviceMessage.requestOf(IotDeviceMessageMethodEnum.PROPERTY_POST.getMethod(), params)
+ .setReportTime(LocalDateTime.now());
+ }
+
+ @Override
+ public byte[] encode(IotDeviceMessage message) {
+ // 如果需要下发指令给设备，可以在这里实现编码逻辑
+ // 目前需求主要是上报解码，暂不支持下行或透传原样
+ return new byte[0];
+ }
+
+ /**
+ * 设备上报的数据结构
+ */
+ @Data
+ public static class PeopleCounterPayload {
+ private String uuid;
+ private String model;
+ private String version;
+ private String pair;
+ private Integer num;
+
+ // 处理 JSON 中的大写或特殊命名，这里假设 JsonUtils 使用 Jackson
+ @JsonProperty("RSSI")
+ private Integer rssi;
+
+ private List data;
+ }
+
+ @Data
+ public static class PeopleCounterData {
+ private String time;
+ private Integer in;
+ private Integer out;
+ private Integer rxBat;
+ private Integer txBat;
+ }
+}
+
+
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/people/dto/PeopleCounterUploadResp.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/people/dto/PeopleCounterUploadResp.java
new file mode 100644
index 0000000..5612f0a
--- /dev/null
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/people/dto/PeopleCounterUploadResp.java
@@ -0,0 +1,44 @@
+package com.viewshanghai.module.iot.gateway.codec.people.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 客流计数器设备上报响应
+ *
+ * @author 芋道源码
+ */
+@Data
+public class PeopleCounterUploadResp {
+
+ private Integer statusCode; // 0 正常 1 未绑定平台 2 解析 json 出错
+ private String time; // yyyyMMddHHmmss
+ private String open; // 营业开始时间
+ private String close; // 营业结束时间
+ private Integer saveCycle; // 存储周期
+ private Integer upCycle; // 上报周期
+ private String license; // 0 正常 1 证书到期
+ private String direction; // twoWay / onlyIn / onlyOut / exchange
+ private String upgradeUrl; // 升级地址（无升级可为空）
+
+ /**
+ * 构建默认的客流计数器响应数据
+ *
+ * @return 响应对象
+ */
+ public static PeopleCounterUploadResp createDefault() {
+ PeopleCounterUploadResp resp = new PeopleCounterUploadResp();
+ resp.setStatusCode(0);
+ resp.setTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+ resp.setOpen("0800");
+ resp.setClose("2300");
+ resp.setSaveCycle(1);
+ resp.setUpCycle(1);
+ resp.setLicense("0");
+ resp.setDirection("twoWay");
+ resp.setUpgradeUrl("http://op.foorir.com/upgrade/2023120.bin");
+ return resp;
+ }
+}
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/config/IotGatewayConfiguration.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/config/IotGatewayConfiguration.java
index b1c500f..e84209d 100644
--- a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/config/IotGatewayConfiguration.java
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/config/IotGatewayConfiguration.java
@@ -12,10 +12,13 @@ import com.viewshanghai.module.iot.gateway.protocol.mqtt.manager.IotMqttConnecti
import com.viewshanghai.module.iot.gateway.protocol.mqtt.router.IotMqttDownstreamHandler;
import com.viewshanghai.module.iot.gateway.protocol.tcp.IotTcpDownstreamSubscriber;
import com.viewshanghai.module.iot.gateway.protocol.tcp.IotTcpUpstreamProtocol;
+import com.viewshanghai.module.iot.gateway.protocol.tcp.handler.ProtocolHandler;
import com.viewshanghai.module.iot.gateway.protocol.tcp.manager.IotTcpConnectionManager;
import com.viewshanghai.module.iot.gateway.service.device.IotDeviceService;
import com.viewshanghai.module.iot.gateway.service.device.message.IotDeviceMessageService;
import io.vertx.core.Vertx;
+
+import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -97,9 +100,10 @@ public class IotGatewayConfiguration {
IotDeviceService deviceService,
IotDeviceMessageService messageService,
IotTcpConnectionManager connectionManager,
+ List protocolHandlers,
Vertx tcpVertx) {
return new IotTcpUpstreamProtocol(gatewayProperties.getProtocol().getTcp(),
- deviceService, messageService, connectionManager, tcpVertx);
+ deviceService, messageService, connectionManager, protocolHandlers, tcpVertx);
}
@Bean
diff --git a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/protocol/http/router/IotHttpAbstractHandler.java b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/protocol/http/router/IotHttpAbstractHandler.java
index 69b1e4e..c2698e6 100644
--- a/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/protocol/http/router/IotHttpAbstractHandler.java
+++ b/viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/protocol/http/router/IotHttpAbstractHandler.java
@@ -8,7 +8,10 @@ import com.viewshanghai.framework.common.exception.ServiceException;
import com.viewshanghai.framework.common.pojo.CommonResult;
import com.viewshanghai.framework.common.util.json.JsonUtils;
import com.viewshanghai.module.iot.core.util.IotDeviceAuthUtils;
+import com.viewshanghai.module.iot.core.biz.dto.IotDeviceRespDTO;
+import com.viewshanghai.module.iot.core.enums.IotAuthTypeEnum;
import com.viewshanghai.module.iot.gateway.service.auth.IotDeviceTokenService;
+import com.viewshanghai.module.iot.gateway.service.device.IotDeviceService;
import io.vertx.core.Handler;
import io.vertx.core.http.HttpHeaders;
import io.vertx.ext.web.RoutingContext;
@@ -20,6 +23,7 @@ import static com.viewshanghai.framework.common.exception.enums.GlobalErrorCodeC
import static com.viewshanghai.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
import static com.viewshanghai.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.viewshanghai.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
+import static com.viewshanghai.module.iot.gateway.enums.ErrorCodeConstants.DEVICE_NOT_EXISTS;
/**
* IoT 网关 HTTP 协议的处理器抽象基类：提供通用的前置处理（认证）、全局的异常捕获等
@@ -31,6 +35,7 @@ import static com.viewshanghai.framework.common.exception.util.ServiceExceptionU
public abstract class IotHttpAbstractHandler implements Handler {
private final IotDeviceTokenService deviceTokenService = SpringUtil.getBean(IotDeviceTokenService.class);
+ private final IotDeviceService deviceService = SpringUtil.getBean(IotDeviceService.class);
@Override
public final void handle(RoutingContext context) {
@@ -40,29 +45,31 @@ public abstract class IotHttpAbstractHandler implements Handler
// 2. 执行逻辑
CommonResult