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 22:49:19 +08:00
parent dc26c2b55c
commit 223906117c
10 changed files with 125 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ public class AppVenueLessonController {
*/
@RequestMapping("/getLessonOrder/{id}")
public String getLessonOrder(@PathVariable("id") Integer id,String date) {
System.out.println("测试一下 ====================== " + date);
if (date == null && "".equals(date)){
LocalDate now = LocalDate.now();
date = now.toString();

23
api/src/main/java/com/sv/netty/controller/QREnterController.java
View File

@@ -9,6 +9,7 @@ import com.sv.netty.netty.service.MessageService;
import com.sv.service.api.QRCodeService;
import com.ydd.framework.core.common.dto.ResponseDTO;
import com.ydd.framework.core.controller.BaseApiController;
import com.ydd.framework.core.exception.ServiceException;
import io.netty.channel.Channel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,7 +37,8 @@ public class QREnterController extends BaseApiController {
Integer venueId = getVenueId(deviceId);
String deviceName = getDeviceName(deviceId);
DeviceType enterOrOut = getEnterOrOut(deviceId);
Venue venue = qrCodeService.initEnter(venueId, deviceName,enterOrOut);
Venue venue = qrCodeService.initEnter(venueId, deviceName,enterOrOut,memberId);
qrCodeService.unBindMember(venueId, deviceName, enterOrOut);
if (venue!=null){
if (DeviceType.OUT == enterOrOut){
// 出场
@@ -55,13 +57,18 @@ public class QREnterController extends BaseApiController {
*/
@RequestMapping(value = "/qrCode/init", method = RequestMethod.GET)
public ResponseDTO initEnter(@RequestParam("deviceId")String deviceId) {
Integer memberId = getMemberIdByAccessToken();
Integer venueId = getVenueId(deviceId);
String deviceName = getDeviceName(deviceId);
DeviceType enterOrOut = getEnterOrOut(deviceId);
Venue venue = qrCodeService.initEnter(venueId, deviceName,enterOrOut);
messageService.sendLoading(deviceName,venueId ,enterOrOut,memberId);
return ResponseDTO.ok().addAttribute("venueInit", venue);
try {
Integer memberId = getMemberIdByAccessToken();
Integer venueId = getVenueId(deviceId);
String deviceName = getDeviceName(deviceId);
DeviceType enterOrOut = getEnterOrOut(deviceId);
Venue venue = qrCodeService.initEnter(venueId, deviceName, enterOrOut,memberId);
qrCodeService.bindMember(venueId, deviceName, enterOrOut,memberId);
messageService.sendLoading(deviceName, venueId, enterOrOut, memberId);
return ResponseDTO.ok().addAttribute("venueInit", venue);
}catch(ServiceException e){
return ResponseDTO.ok().addAttribute("InitError",e.getMessage());
}
}

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

@@ -180,7 +180,7 @@ public class AppMessageHandlerAdapter implements MessageService {
*/
@Override
public void enterVenue(String deviceName, Integer venueId, Integer memberId, Venue venue) {
Member member = memberService.findByMember(memberId);
Member member = memberService.findByMember(memberId);
Channel channel = getCurrentChannel(deviceName, venueId, DeviceType.ENTER);
// 校验入场时间是否正常
if (checkInterval(member,venueId)) {
@@ -194,7 +194,7 @@ public class AppMessageHandlerAdapter implements MessageService {
sendMessage(channel,new MessageDTO(MessageType.FAILED, ErrorCode.NO_USE_CARD.getMsg()));
}
} else {
logger.info(member.getId() + "入场失败:连续入场");
logger.info(member == null ? "null" : member.getId() + "入场失败:连续入场");
Config config = configService.findById(1);
sendMessage(channel,new MessageDTO(MessageType.OPEN_DOOR, MessageFormat.format(ErrorCode.CHECK_ENTER_INTERVAL.getMsg(),config.getValue())));
}

1
api/src/main/resources/logback.xml
View File

@@ -58,5 +58,6 @@
<appender-ref ref="STDOUT" />
<appender-ref ref="COMMON-DEFAULT" />
<appender-ref ref="COMMON-ERROR" />
<appender-ref ref="CONNECTION_APPENDER" />
</root>
</configuration>

2
api/src/test/java/com/test/netty/client/ClientThread.java
View File

@@ -32,7 +32,7 @@ public class ClientThread extends Thread{
if (instance == null) {
synchronized (ClientThread.class) {
if (instance == null) {
instance = new ClientThread("127.0.0.1", 56792);
instance = new ClientThread("lmqhznn.goho.co", 26283);
}
}
}