venue/smart_venue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api-二维码显示问题

Browse Source
This commit is contained in:
limqhz
2020-08-30 15:58:40 +08:00
parent c177f67724
commit dc26c2b55c
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java
View File

@@ -13,7 +13,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
@RestController @RestController
public class AppVenueLessonController { public class AppVenueLessonController {
@@ -91,7 +93,7 @@ public class AppVenueLessonController {
/** /**
* 分页查询场馆 * 查询场馆
*/ */
@RequestMapping(value = "/getVenueList", method = {RequestMethod.GET,RequestMethod.POST}) @RequestMapping(value = "/getVenueList", method = {RequestMethod.GET,RequestMethod.POST})
public List<VenueItem> getVenueList() { public List<VenueItem> getVenueList() {
@@ -105,4 +107,12 @@ public class AppVenueLessonController {
return venueItems; return venueItems;
} }
/**
* 查询远程配置项目，可以让APP联网可配置
*/
@RequestMapping(value = "/getRemoteConfig", method = {RequestMethod.GET,RequestMethod.POST})
public Map<String,String> getRemoteConfig() {
return new HashMap<>();
}
} }

4
api/src/main/java/com/sv/netty/netty/service/impl/AppMessageHandlerAdapter.java
View File

@@ -88,7 +88,7 @@ public class AppMessageHandlerAdapter implements MessageService {
} else { } else {
deviceService.online(heartBeat.getDeviceName(),heartBeat.getVenueId(),deviceType,thisVenue.getType(),clientId); deviceService.online(heartBeat.getDeviceName(),heartBeat.getVenueId(),deviceType,thisVenue.getType(),clientId);
putChannelType(heartBeat.getDeviceName(),heartBeat.getVenueId(),deviceType,channel); putChannelType(heartBeat.getDeviceName(),heartBeat.getVenueId(),deviceType,channel);
MessageDTO messageDTO = new MessageDTO(MessageType.LINK,"第一次心跳成功，返回二维码"); MessageDTO messageDTO = new MessageDTO(MessageType.LINK,"欢迎扫码进场！");
channel.writeAndFlush(messageDTO); channel.writeAndFlush(messageDTO);
} }
} }
@@ -117,7 +117,7 @@ public class AppMessageHandlerAdapter implements MessageService {
Member thisMember = memberService.findByMember(memberId); Member thisMember = memberService.findByMember(memberId);
if (thisMember!=null){ if (thisMember!=null){
String nickname = thisMember.getNickname(); 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); Channel currentChannel = getCurrentChannel(deviceName, venueId, deviceType);
sendMessage(currentChannel,messageDTO); sendMessage(currentChannel,messageDTO);
return true; return true;