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 getVenueList() { @@ -105,4 +107,12 @@ public class AppVenueLessonController { return venueItems; } + /** + * 查询远程配置项目,可以让APP联网可配置 + */ + @RequestMapping(value = "/getRemoteConfig", method = {RequestMethod.GET,RequestMethod.POST}) + public Map 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;