From 7aa02635f292a37e0a78470c065bae974dc3df68 Mon Sep 17 00:00:00 2001 From: DragonWenLong <552045633@qq.com> Date: Wed, 27 Aug 2025 17:30:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(device):=20=E4=BC=98=E5=8C=96=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整人员信息的顺序，符合兴汉设备接收数据的要求 - 添加设备上报人员登记信息的日志，方便问题追踪 --- .../fuyuanshen/global/mqtt/rule/xinghan/XinghanSendMsgRule.java | 1 + .../fuyuanshen/web/service/device/DeviceXinghanBizService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendMsgRule.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendMsgRule.java index d45d5b3c..6568b57c 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendMsgRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendMsgRule.java @@ -79,6 +79,7 @@ public class XinghanSendMsgRule implements MqttMessageRule { intData.add(blockIndex); // 获取块原内容 转成GBK 再转成无符号十进制整数 String blockTxt = data.get(blockIndex-1); + log.warn("设备上报人员登记信息：{}", blockTxt); // 再按 GBK 编码把字符串转成字节数组，并逐个转为无符号十进制整数 for (byte b : blockTxt.getBytes(GBK)) { intData.add(b & 0xFF); // b & 0xFF 得到 0~255 的整数 diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java index aadd4148..29b8374b 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java @@ -160,9 +160,9 @@ public class DeviceXinghanBizService { List appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw); List list = new ArrayList<>(); - list.add(bo.getUnitName()); list.add(bo.getName()); list.add(bo.getPosition()); + list.add(bo.getUnitName()); list.add(bo.getCode()); RedisUtils.setCacheList(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + deviceObj.getDeviceImei() + ":app_send_message_data", list); RedisUtils.expire(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + deviceObj.getDeviceImei() + ":app_send_message_data", Duration.ofSeconds(5 * 60L));