From b35335619cbe855bd4191e61a4523361e20e0f12 Mon Sep 17 00:00:00 2001 From: tangzh Date: Tue, 22 Jul 2025 13:56:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/WebSocketSdcpServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketSdcpServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketSdcpServiceImpl.java index 4998ce0..ed60881 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketSdcpServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketSdcpServiceImpl.java @@ -141,21 +141,22 @@ public class WebSocketSdcpServiceImpl extends WebSocketService { Map dataMap = Arrays.stream(message.split("&")) .map(s-> s.split("=")) .collect(Collectors.toMap(data-> data[0], data -> data[1])); - String deviceSn = dataMap.get("MainboardID").toString(); - String userId = dataMap.get("UserId").toString(); - String img64 = dataMap.get("Data").toString(); + String deviceSn = dataMap.get("MainboardID"); + String userId = dataMap.get("UserId"); + String img64 = dataMap.get("Data"); WebSocketService uSocket = clients.get(userId); if (null == uSocket || null == uSocket.session || !uSocket.session.isOpen()) { log.info("<<< 用户【{}】已退出连接，忽略", userId); return; } - String category = dataMap.get("Category").toString(); + String category = dataMap.get("Category"); String mapKey = uSocket.session.getId() + "_" + category; ImageDataVo imageDataVo = imageUser.get(mapKey); imageDataVo.imgWrite(Base64.getDecoder().decode(img64)); imageUser.put(mapKey, imageDataVo); Map commandResult = new HashMap<>(); commandResult.put("deviceSn", deviceSn); + commandResult.put("category", category); commandResult.put("chunkIndex", (Integer.parseInt(dataMap.get("ChunkIndex")) + 1) + ""); // 图片当前分片数 commandResult.put("totalChunks", dataMap.get("TotalChunks")); // 图片总的分片数 sendVueMessage(JSON.toJSONString(new SocketMsg(commandResult, "图片传输中", MsgEnum.WRITEIMG)), uSocket.channel, uSocket.session);