Merge branch 'feature/0803-im'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/LiveRoomServiceImpl.java

@@ -793,7 +793,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
             String roomUid = Optional.ofNullable(user.getRoomUid()).orElse(userRoom.get());
 
             //获取当前用户状态变更的时间
-            long userStateTime = Optional.ofNullable(user.getTime()).orElse(now.getTime()/1000);
+            long userStateTime = Optional.ofNullable(user.getTime()).orElse(now.getTime());
             RBucket<Long> userStateTimeCache = redissonClient.getBucket(LIVE_USER_LAST_TIME.replace(USER_ID, userIdStr));
             if (userStateTimeCache.isExists()) {
                 //缓存的时间比当前传入时间大则放弃这条数据
@@ -1575,7 +1575,6 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
             imUserState.setUserid(userId.toString());
             imUserState.setStatus(onlineStatus == 1 && liveRoomStatus == 1?"0":"1");
             imUserState.setOs(callbackOnMemberStateChange.getOptPlatform());
-            imUserState.setTime(new Date().getTime());
             imUserState.setRoomUid(callbackOnMemberStateChange.getGroupId());
             imUserStates.add(imUserState);
         }
@@ -1606,7 +1605,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
             imUserState.setUserid(userId.toString());
             imUserState.setStatus("3");
             imUserState.setOs(callbackAfterMemberExit.getOptPlatform());
-            imUserState.setTime(callbackAfterMemberExit.getEventTime().atZone(ZoneId.systemDefault()).toEpochSecond());
+            imUserState.setTime(callbackAfterMemberExit.getEventTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
             imUserState.setRoomUid(callbackAfterMemberExit.getGroupId());
             imUserStates.add(imUserState);
         }
@@ -1649,7 +1648,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
             imUserState.setUserid(userId.toString());
             imUserState.setStatus(userMap.getOrDefault(userId, new ImLiveBroadcastRoomMember()).getOnlineStatus() == 1 ? "0" : "1");
             imUserState.setOs(callbackAfterNewMemberJoin.getOptPlatform());
-            imUserState.setTime(callbackAfterNewMemberJoin.getEventTime().atZone(ZoneId.systemDefault()).toEpochSecond());
+            imUserState.setTime(callbackAfterNewMemberJoin.getEventTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
             imUserState.setRoomUid(callbackAfterNewMemberJoin.getGroupId());
             imUserStates.add(imUserState);
         }

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/ImLiveBroadcastRoomController.java

@@ -62,9 +62,6 @@ public class ImLiveBroadcastRoomController extends BaseController {
     public HttpResponseResult<Object> quitRoom(@RequestBody List<ImUserStateSync> userState) {
         for (ImUserStateSync stateSync : userState) {
             stateSync.setUserid(imGroupService.analysisImUserId(stateSync.getUserid()));
-            if (stateSync.getTime() != null) {
-                stateSync.setTime(stateSync.getTime()/1000);
-            }
         }
         liveRoomService.opsRoom(userState);
         return succeed();

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentLiveRoomController.java

@@ -71,11 +71,6 @@ public class StudentLiveRoomController extends BaseController {
     @PostMapping(value = "/syncUserStatus")
     public void statusImUser(@RequestBody List<ImUserStateSync> userState) {
         log.info("opsRoom >>>>> : {}", JSONObject.toJSONString(userState));
-        for (ImUserStateSync stateSync : userState) {
-            if (stateSync.getTime() != null) {
-                stateSync.setTime(stateSync.getTime()/1000);
-            }
-        }
 
         liveRoomService.opsRoom(userState);
     }

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/UserController.java

@@ -51,11 +51,6 @@ public class UserController extends BaseController {
     @PostMapping(value = "/statusImUser")
     public void statusImUser(@RequestBody List<ImUserStateSync> userState) {
         log.info("opsRoom >>>>> : {}", JSONObject.toJSONString(userState));
-        for (ImUserStateSync stateSync : userState) {
-            if (stateSync.getTime() != null) {
-                stateSync.setTime(stateSync.getTime()/1000);
-            }
-        }
         liveRoomService.opsRoom(userState);
     }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherLiveRoomController.java

@@ -102,11 +102,6 @@ public class TeacherLiveRoomController extends BaseController {
     @PostMapping(value = "/syncUserStatus")
     public void statusImUser(@RequestBody List<ImUserStateSync> userState) {
         log.info("opsRoom >>>>> : {}", JSONObject.toJSONString(userState));
-        for (ImUserStateSync stateSync : userState) {
-            if (stateSync.getTime() != null) {
-                stateSync.setTime(stateSync.getTime()/1000);
-            }
-        }
         liveRoomService.opsRoom(userState);
     }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserController.java

@@ -40,11 +40,6 @@ public class UserController extends BaseController {
     @PostMapping(value = "/statusImUser")
     public void statusImUser(@RequestBody List<ImUserStateSync> userState) {
         log.info("opsRoom >>>>> : {}", JSONObject.toJSONString(userState));
-        for (ImUserStateSync stateSync : userState) {
-            if (stateSync.getTime() != null) {
-                stateSync.setTime(stateSync.getTime()/1000);
-            }
-        }
         liveRoomService.opsRoom(userState);
     }