From 570b322613e24644c49aec0a4647ea95e058be24 Mon Sep 17 00:00:00 2001
From: limqhz <l>
Date: Mon, 3 Aug 2020 00:26:03 +0800
Subject: [PATCH] =?UTF-8?q?api-=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sv/netty/netty/message/MessageType.java   | 3 ++-
 .../netty/netty/service/impl/AppMessageHandlerAdapter.java  | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/api/src/main/java/com/sv/netty/netty/message/MessageType.java b/api/src/main/java/com/sv/netty/netty/message/MessageType.java
index 60a85cc..6c26422 100644
--- a/api/src/main/java/com/sv/netty/netty/message/MessageType.java
+++ b/api/src/main/java/com/sv/netty/netty/message/MessageType.java
@@ -1,8 +1,9 @@
 package com.sv.netty.netty.message;
 
 public enum MessageType {
+    LINK("连接"),
     LOAD("加载"),
-    OPENDOOR("开门"),
+    OPEN_DOOR("开门"),
     FAILED("开门校验失败");
 
     private String message;
diff --git a/api/src/main/java/com/sv/netty/netty/service/impl/AppMessageHandlerAdapter.java b/api/src/main/java/com/sv/netty/netty/service/impl/AppMessageHandlerAdapter.java
index 793dced..762641e 100644
--- a/api/src/main/java/com/sv/netty/netty/service/impl/AppMessageHandlerAdapter.java
+++ b/api/src/main/java/com/sv/netty/netty/service/impl/AppMessageHandlerAdapter.java
@@ -88,6 +88,8 @@ public class AppMessageHandlerAdapter implements MessageService {
             } else {
                 deviceService.online(heartBeat.getDeviceName(),heartBeat.getVenueId(),deviceType,thisVenue.getType(),clientId);
                 putChannelType(heartBeat.getDeviceName(),heartBeat.getVenueId(),deviceType,channel);
+                MessageDTO messageDTO = new MessageDTO(MessageType.LINK,"第一次心跳成功，返回二维码");
+                channel.writeAndFlush(messageDTO);
             }
         }
     }
@@ -185,7 +187,7 @@ public class AppMessageHandlerAdapter implements MessageService {
                 if(venueService.qrCodeEnterVenue(memberId,deviceName,venueId,venue)){
                     // 可以进场
                     scheduledExecutorService.schedule(() -> {
-                        sendMessage(channel,new MessageDTO(MessageType.OPENDOOR,"OK"));
+                        sendMessage(channel,new MessageDTO(MessageType.OPEN_DOOR,"OK"));
                     }, 5, TimeUnit.SECONDS);
                 } else {
                     // 进场失败
@@ -194,7 +196,7 @@ public class AppMessageHandlerAdapter implements MessageService {
             } else {
                 logger.info(member.getId() + "入场失败:连续入场");
                 Config config = configService.findById(1);
-                sendMessage(channel,new MessageDTO(MessageType.OPENDOOR, MessageFormat.format(ErrorCode.CHECK_ENTER_INTERVAL.getMsg(),config.getValue())));
+                sendMessage(channel,new MessageDTO(MessageType.OPEN_DOOR, MessageFormat.format(ErrorCode.CHECK_ENTER_INTERVAL.getMsg(),config.getValue())));
             }
     }