Pārlūkot izejas kodu

inOrOutRoom去掉platform入参

lyhzzz 1 gadu atpakaļ
vecāks
revīzija
bf87008556

+ 1 - 5
src/main/java/com/fdkankan/tk/controller/RoomController.java

@@ -122,11 +122,7 @@ public class RoomController extends BaseController{
                                   @RequestParam(required = false) String roomId,
                                   @RequestParam(required = false) Integer type,
                                   @RequestParam(required = false) String userId){
-        String platform = request.getHeader("platform");
-        if(StringUtils.isBlank(platform)){
-            platform = "4dkankan";
-        }
-        roomService.inOrOutRoom(roomId,role,type,userId,platform);
+        roomService.inOrOutRoom(roomId,role,type,userId);
         return ResultData.ok();
     }
 

+ 1 - 1
src/main/java/com/fdkankan/tk/service/IRoomService.java

@@ -35,7 +35,7 @@ public interface IRoomService extends IService<Room> {
 
     String getWxQrCode(String roomId,String type);
 
-    void inOrOutRoom(String roomId, String role, Integer type,String userId,String platform);
+    void inOrOutRoom(String roomId, String role, Integer type,String userId);
 
     Long getCountAndTbStatus();
 

+ 3 - 2
src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -404,8 +404,8 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
      * role  follower  leader
      */
     @Override
-    public void inOrOutRoom(String roomId, String role, Integer type,String userId,String platform) {
-        log.info("inOrOutRoom--roomId:{},role:{},type:{},userId:{},platform:{}",roomId,role,type,userId,platform);
+    public void inOrOutRoom(String roomId, String role, Integer type,String userId) {
+        log.info("inOrOutRoom--roomId:{},role:{},type:{},userId:{}",roomId,role,type,userId);
         if(roomId == null || StringUtils.isBlank(role)
                 || ( !role.equals("leader") && !role.equals("customer")) ){
             throw new BusinessException(ResultCode.PARAM_MISS);
@@ -421,6 +421,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         if(room == null){
             throw new BusinessException(ResultCode.ROOM_MISS);
         }
+        String platform = room.getPlatform();
 
         if(room.getUseStartTime() != null && room.getUseStartTime().getTime() > new Date().getTime()){
             throw new BusinessException(ResultCode.ROOM_TIME_ERROR);