|
@@ -32,7 +32,6 @@ import com.keao.edu.util.date.DateUtil;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
-import org.springframework.scheduling.annotation.Async;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Isolation;
|
|
import org.springframework.transaction.annotation.Isolation;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -668,7 +667,6 @@ public class RoomServiceImpl implements RoomService {
|
|
public void destroyRoom(Long roomId,String userId) throws Exception {
|
|
public void destroyRoom(Long roomId,String userId) throws Exception {
|
|
|
|
|
|
CheckUtils.checkArgument(roomId != null, "destroyRoom roomId must't be null");
|
|
CheckUtils.checkArgument(roomId != null, "destroyRoom roomId must't be null");
|
|
- SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
|
List<RoomMember> roomMembers = roomMemberDao.findByRid(roomId.toString());
|
|
List<RoomMember> roomMembers = roomMemberDao.findByRid(roomId.toString());
|
|
if(roomMembers != null && roomMembers.size() > 0){
|
|
if(roomMembers != null && roomMembers.size() > 0){
|
|
roomMembers.forEach(e->{
|
|
roomMembers.forEach(e->{
|
|
@@ -678,7 +676,7 @@ public class RoomServiceImpl implements RoomService {
|
|
msg.setUserName(userInfoList.get(0).getName());
|
|
msg.setUserName(userInfoList.get(0).getName());
|
|
}
|
|
}
|
|
try {
|
|
try {
|
|
- imHelper.publishMessage(sysUser.getId().toString(), e.getRid(), msg, 1);
|
|
|
|
|
|
+ imHelper.publishMessage(userId, e.getRid(), msg, 1);
|
|
} catch (Exception e1) {
|
|
} catch (Exception e1) {
|
|
e1.printStackTrace();
|
|
e1.printStackTrace();
|
|
}
|
|
}
|
|
@@ -692,7 +690,7 @@ public class RoomServiceImpl implements RoomService {
|
|
e1.printStackTrace();
|
|
e1.printStackTrace();
|
|
}
|
|
}
|
|
}else {
|
|
}else {
|
|
- eduUserFeignService.upsetTeacherAttendance(Long.parseLong(e.getRid()),sysUser.getId(),1);
|
|
|
|
|
|
+ eduUserFeignService.upsetTeacherAttendance(Long.parseLong(e.getRid()),Integer.parseInt(e.getUid()),1);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
roomDao.deleteByRid(roomId.toString());
|
|
roomDao.deleteByRid(roomId.toString());
|