From dc26c2b55c5851eaca45804eb34697c1bb0fb79f Mon Sep 17 00:00:00 2001
From: limqhz <l>
Date: Sun, 30 Aug 2020 15:58:40 +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

---
 .../netty/controller/AppVenueLessonController.java   | 12 +++++++++++-
 .../netty/service/impl/AppMessageHandlerAdapter.java |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java b/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java
index bc0017d..da56c33 100644
--- a/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java
+++ b/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java
@@ -13,7 +13,9 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 public class AppVenueLessonController {
@@ -91,7 +93,7 @@ public class AppVenueLessonController {
 
 
     /**
-     * 分页查询场馆
+     * 查询场馆
      */
     @RequestMapping(value = "/getVenueList", method = {RequestMethod.GET,RequestMethod.POST})
     public List<VenueItem> getVenueList() {
@@ -105,4 +107,12 @@ public class AppVenueLessonController {
         return venueItems;
     }
 
+    /**
+     * 查询远程配置项目，可以让APP联网可配置
+     */
+    @RequestMapping(value = "/getRemoteConfig", method = {RequestMethod.GET,RequestMethod.POST})
+    public Map<String,String> getRemoteConfig() {
+        return new HashMap<>();
+    }
+
 }
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 762641e..4711637 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,7 +88,7 @@ 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,"第一次心跳成功，返回二维码");
+                MessageDTO messageDTO = new MessageDTO(MessageType.LINK,"欢迎扫码进场！");
                 channel.writeAndFlush(messageDTO);
             }
         }
@@ -117,7 +117,7 @@ public class AppMessageHandlerAdapter implements MessageService {
         Member thisMember = memberService.findByMember(memberId);
         if (thisMember!=null){
             String nickname = thisMember.getNickname();
-            MessageDTO messageDTO = new MessageDTO(MessageType.LOAD,"欢迎光临!" + nickname);
+            MessageDTO messageDTO = new MessageDTO(MessageType.LOAD,"欢迎光临!" + nickname + ",请您60s内操作进场。");
             Channel currentChannel = getCurrentChannel(deviceName, venueId, deviceType);
             sendMessage(currentChannel,messageDTO);
             return true;