diff --git a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/WebSocketMsgType.java b/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/WebSocketMsgType.java index 3bbb1aef..bdb4454d 100644 --- a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/WebSocketMsgType.java +++ b/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/WebSocketMsgType.java @@ -7,21 +7,21 @@ package org.dromara.resource.api.domain; */ public enum WebSocketMsgType { - ALARM_MSG(100), + ALARM_MSG("100"), - MOBILE_QRCODE(200); + MOBILE_QRCODE("qrcode"); /** * 消息类型编码 * 大类型 - 100,200,300,400 累加100 * 小类型 - 101, 102, 103 累加1 */ - private final Integer code; + private final String code; - WebSocketMsgType(Integer code) { + WebSocketMsgType(String code) { this.code = code; } - public Integer getCode() { + public String getCode() { return code; } } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java index faaf10f6..f2a6cc69 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java @@ -94,6 +94,10 @@ public class TbVisitorManagementController extends BaseController { if (qrCodeInfo == null) { return R.fail("二维码已过期"); } +// JSONObject jsonObject = new JSONObject(); +// jsonObject.put("type", "qrcode"); +// jsonObject.put("date", qrcode); + remoteWebSocketMessageService.publishMessage(List.of(qrCodeInfo.getUserid()), WebSocketMsgType.MOBILE_QRCODE, qrcode); return R.ok("二维码可用"); diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteWebSocketMessageServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteWebSocketMessageServiceImpl.java index 67bc9d82..0f84c97a 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteWebSocketMessageServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteWebSocketMessageServiceImpl.java @@ -55,7 +55,7 @@ public class RemoteWebSocketMessageServiceImpl implements RemoteWebSocketMessage private String createMsg(WebSocketMsgType webSocketMsgType, Object data) { JSONObject msg = new JSONObject(); - msg.put("code", webSocketMsgType.getCode()); + msg.put("type", webSocketMsgType.getCode()); msg.put("data", data); return msg.toJSONString(); }