微信后台-二维码扫描代码初始化-简化，待处理细节

api/src/main/java/com/sv/api/controller/VenueController.java

@@ -83,7 +83,8 @@ public class VenueController extends BaseApiController {
      */
     @RequestMapping(value = "/venue/detail", method = RequestMethod.POST)
     public ResponseDTO detail(@RequestParam("venueId") Integer venueId) {
-        return ResponseDTO.ok().addAttribute("venues", venueService.findByVenueId(venueId));
+        Integer loginMemberId = getLoginMemberId();
+        return ResponseDTO.ok().addAttribute("venues", venueService.findByVenueId(venueId,loginMemberId));
     }
 
     /**
@@ -97,5 +98,16 @@ public class VenueController extends BaseApiController {
         return ResponseDTO.ok().addAttribute("flg", venueService.join(getMemberIdByAccessToken(), venueId));
     }
 
+    /**
+     * 我要进场
+     *
+     * @param venueId 场馆Id
+     * @return
+     */
+    @RequestMapping(value = "/venue/out", method = RequestMethod.GET)
+    public ResponseDTO out(@RequestParam("venueId") Integer venueId) {
+        return ResponseDTO.ok().addAttribute("flg", venueService.join(getMemberIdByAccessToken(), venueId));
+    }
+
 
 }

api/src/main/java/com/sv/netty/controller/QREnterController.java

@@ -3,10 +3,8 @@ package com.sv.netty.controller;
 import com.sv.entity.Venue;
 import com.sv.netty.config.NettyConstant;
 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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
@@ -21,8 +19,6 @@ public class QREnterController extends BaseApiController {
 
 	private final Logger logger = LoggerFactory.getLogger(QREnterController.class);
     @Resource
-    private QRCodeService qrCodeService;
-    @Resource
     private MessageService messageService;
 	/**
 	 * 进场指令发布
@@ -32,8 +28,7 @@ public class QREnterController extends BaseApiController {
         Integer memberId = getMemberIdByAccessToken();
         Integer venueId = getVenueId(deviceId);
         String deviceName = getDeviceName(deviceId);
-        Venue venue = qrCodeService.initEnter(venueId, deviceName,memberId);
-        qrCodeService.unBindMember(venueId, deviceName);
+        Venue venue = new Venue();// TODO
         if (venue!=null){
             if (true){
                 // 出场
@@ -46,26 +41,6 @@ public class QREnterController extends BaseApiController {
 	    return ResponseDTO.ok();
 	}
 
-    /**
-     * 扫码结果页初始化
-     * 需要进场的场馆信息
-     */
-    @RequestMapping(value = "/qrCode/init", method = RequestMethod.GET)
-    public ResponseDTO initEnter(@RequestParam("deviceId")String deviceId) {
-        try {
-            Integer memberId = getMemberIdByAccessToken();
-            Integer venueId = getVenueId(deviceId);
-            String deviceName = getDeviceName(deviceId);
-            Venue venue = qrCodeService.initEnter(venueId, deviceName,memberId);
-            qrCodeService.bindMember(venueId, deviceName,memberId);
-            messageService.sendLoading(deviceName, venueId, memberId);
-            return ResponseDTO.ok().addAttribute("venueInit", venue);
-        }catch(ServiceException e){
-            return ResponseDTO.ok().addAttribute("InitError",e.getMessage());
-        }
-    }
-
-
     /**
      * 根据字符串获取场馆
      * @param deviceId

api/src/main/java/com/sv/netty/netty/service/MessageService.java

@@ -35,9 +35,6 @@ public interface MessageService {
      * @return
      */
     Set<String> countConnection();
-
-    boolean sendLoading(String deviceName, Integer venueId, Integer memberId);
-
     /**
      * 出场
      * @param deviceName

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

@@ -100,24 +100,6 @@ public class AppMessageHandlerAdapter implements MessageService {
         }
     }
 
-    /**
-     * 通知客户端进入加载页面
-     * @param memberId
-     * @return
-     */
-    @Override
-    public boolean sendLoading(String deviceName, Integer venueId,Integer memberId) {
-        Member thisMember = memberService.findByMember(memberId);
-        if (thisMember!=null){
-            String nickname = thisMember.getNickname();
-            VenueMessage venueMessage = new VenueMessage(MessageType.LOAD,"欢迎光临!" + nickname + ",请您60s内操作进场。");
-            Channel currentChannel = getCurrentChannel(deviceName, venueId);
-            ServerMessageUtils.INSTANCE.sendMsg(currentChannel,venueMessage);
-            return true;
-        }
-        return false;
-    }
-
     /**
      * 测试客户端连接
      * @return