From 41313ef7d3da311883ff9d14281810c44f0ffce6 Mon Sep 17 00:00:00 2001 From: andy <1042025947@qq.com> Date: Thu, 19 Jun 2025 12:39:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E5=A2=9E=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=9A=84=E7=85=A7=E7=89=87=E4=B8=8B=E5=8F=91=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E8=BF=9E=E6=8E=A5=E4=B8=8A?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E7=9A=84=E7=85=A7=E7=89=87=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E4=B8=8B=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/evo/framework/websocket/WebSocketServer.java | 2 ++ .../java/com/evo/system/service/impl/SysStaffServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/evo-admin/src/main/java/com/evo/framework/websocket/WebSocketServer.java b/evo-admin/src/main/java/com/evo/framework/websocket/WebSocketServer.java index 87df8be..58fdc1a 100644 --- a/evo-admin/src/main/java/com/evo/framework/websocket/WebSocketServer.java +++ b/evo-admin/src/main/java/com/evo/framework/websocket/WebSocketServer.java @@ -169,6 +169,8 @@ public class WebSocketServer{ } //发送设备按钮信息 snDetailService.sendButtons(Collections.asList(snDetail.getSn())); + //发送照片 + snDetailService.sendPhoto(Collections.asList(snDetail.getSn()), null); }else{ //接受设备端返回的数据，先不做处理 System.out.println("设备返回信息："+message); diff --git a/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java b/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java index ac9a80e..568c373 100644 --- a/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java +++ b/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java @@ -178,7 +178,7 @@ public class SysStaffServiceImpl extends ServiceImpl i dkj_list.add(com.evo.equipment.constant.Constants.EQ_DEVICE_PUBLIC_CODE); //公共 dkj_list.add(sysStaff.getTimeClock()); //下发照片 - eqSnDetailService.sendPhoto(dkj_list, Collections.asList(Collections.asMap("userId", String.valueOf(sysStaff.getUserId()), "name", sysStaff.getName(), "photoUrl", com.evo.equipment.constant.Constants.STAFF_IMAGE_URL_OVER_TIME+upload.getFileName()))); + eqSnDetailService.sendPhoto(dkj_list, Collections.asList(Collections.asMap("userId", String.valueOf(sysStaff.getUserId()), "name", sysStaff.getName(), "photoUrl", ParamUtils.getGlobalStaticUrl()+upload.getFileName()))); } }