Commit Graph

30 Commits

Author SHA1 Message Date
lzh
016a1e18b7 Merge remote-tracking branch 'origin/cleaning' into cleaning
# Conflicts:
#	viewshanghai-module-iot/viewshanghai-module-iot-biz/src/main/java/com/viewshanghai/module/iot/service/device/message/IotDeviceMessageServiceImpl.java
#	viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/codec/jt808/IotJt808DeviceMessageCodec.java
#	viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/java/com/viewshanghai/module/iot/gateway/protocol/tcp/handler/Jt808ProtocolHandler.java
2025-12-30 13:36:19 +08:00
lzh
7a81d9e478 fix: JT808事件消息eventId改为identifier
Some checks failed
aiot-platform CI/CD / build-and-deploy (push) Has been cancelled
2025-12-28 00:47:42 +08:00
lzh
ea55347651 fix: 业务层跳过 JT808 协议的回复消息生成
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 6m50s
2025-12-28 00:07:10 +08:00
lzh
7561ddf9e9 fix: JT808直接回复通用消息-处理数据上报 2025-12-28 00:06:59 +08:00
lzh
bb8f76d531 fix: 修复TCP上报空Json数据解析失败bug
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 6m23s
2025-12-27 23:05:19 +08:00
lzh
69b0767fd7 fix: JT808修改-若NONE跳过鉴权
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 7m22s
2025-12-26 18:40:00 +08:00
lzh
1737566245 fix: 新增只依据deviceName查询设备信息(暂时使用,后续调整)
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 7m4s
2025-12-26 18:25:44 +08:00
lzh
8d52e9e413 fix: 修复java.lang.RuntimeException: JT808 消息编码失败: 消息参数格式错误,params 必须是 Map 类型
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 7m41s
at com.viewshanghai.module.iot.gateway.codec.jt808.IotJt808DeviceMessageCodec.encode(IotJt808DeviceMessageCodec.java:77) ~[!/:na]
2025-12-26 17:58:36 +08:00
lzh
a5c2b7aabf fix: 修改了 IotJt808DeviceMessageCodec.java:82-111 的 decode() 方法
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 7m33s
2025-12-26 17:42:06 +08:00
lzh
6d159a02fe fix: 修复bug-Caused by: java.lang.RuntimeException: JT808 消息解码失败: null
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 7m28s
2025-12-26 17:07:35 +08:00
lzh
97fef34098 fix: docker部署打开8091端口
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 7m20s
2025-12-26 16:19:46 +08:00
lzh
5489125cfa fix: docker部署打开8091端口 2025-12-26 16:17:36 +08:00
lzh
a2a9ef0c30 cleaning-客流计数器、蓝牙工牌对接 (#1)
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 8m21s
完善了http上报数据、修改了tcp连接协议解析

Reviewed-on: http://124.221.55.225:3000/XW-AIOT/aiot-platform/pulls/1
2025-12-26 14:48:23 +08:00
lzh
2f4c836d1b chore: iot-gateway的TCP连接打开 2025-12-26 14:27:47 +08:00
lzh
d1d7eec5c9 chore: JT808/2013协议解析融合到现有TCP连接体系,对这个协议的注册鉴权做了定制化改造(注册返回鉴权码(返回phone),鉴权凭借鉴权码) 2025-12-26 14:26:30 +08:00
lzh
1886afc150 chore: JT808/2013协议解析(TCP连接) 2025-12-26 14:23:16 +08:00
lzh
861a78c092 fix: 修复http上报数据自动返回消息的bug 2025-12-25 15:22:50 +08:00
lzh
03a569c269 chore: 1、设备接入验证增加(一型一密PRODUCT_SECRET、无鉴权NONE)
2、产品增加productSecret,authType
3、authType优先级 - 设备级 》 产品级
ps:暂未实现动态注册
2025-12-25 15:22:13 +08:00
lzh
9d6b53c4f6 chore: 客流计数器对接-数据解析、自定义返回DTO 2025-12-25 15:16:53 +08:00
lzh
4066d65da2 fix: 修复插入设备消息覆盖的bug(将TSDB插入device_message的ts字段从 NOW 改为 report_time) 2025-12-25 11:18:39 +08:00
lzh
cf205e8337 fix: force rebuild gateway image to apply config changes
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 7m31s
2025-12-18 15:36:10 +08:00
lzh
e3c1e8a7f3 chore: update gateway config for local dev and docker
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 8m10s
2025-12-18 15:26:11 +08:00
lzh
527b9d7d44 chore: update config for local dev and docker
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 8m26s
2025-12-18 15:10:38 +08:00
lzh
31c8f8c0a6 chore: configure Maven to use Aliyun mirror 2025-12-18 14:22:26 +08:00
lzh
d8fb49452f feat: 修改后端配置,让服务监听 0.0.0.0
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 11m39s
2025-12-18 14:18:42 +08:00
lzh
3191877191 feat: 修改分支为master
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 10m22s
2025-12-18 11:48:54 +08:00
lzh
f56a35296d feat: 验证码配置调整 2025-12-18 11:38:56 +08:00
lzh
c7e370549b feat: 配置cicd & 运行配置调整 2025-12-18 11:35:48 +08:00
lzh
63090f26c5 del: 删除原有信息仓库相关信息 2025-12-18 11:06:03 +08:00
lzh
ac66d2e622 初始化提交
Some checks failed
viewshanghai-ui-admin CI / build (14.x) (push) Has been cancelled
viewshanghai-ui-admin CI / build (16.x) (push) Has been cancelled
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
2025-12-18 11:03:26 +08:00