|
@@ -16,7 +16,10 @@ import com.ym.mec.biz.dal.dao.CourseScheduleDao;
|
|
import com.ym.mec.biz.dal.dao.StudentDao;
|
|
import com.ym.mec.biz.dal.dao.StudentDao;
|
|
import com.ym.mec.biz.dal.dao.SysConfigDao;
|
|
import com.ym.mec.biz.dal.dao.SysConfigDao;
|
|
import com.ym.mec.biz.dal.dao.TeacherDao;
|
|
import com.ym.mec.biz.dal.dao.TeacherDao;
|
|
-import com.ym.mec.biz.dal.entity.*;
|
|
|
|
|
|
+import com.ym.mec.biz.dal.entity.CourseSchedule;
|
|
|
|
+import com.ym.mec.biz.dal.entity.StudentAttendance;
|
|
|
|
+import com.ym.mec.biz.dal.entity.Teacher;
|
|
|
|
+import com.ym.mec.biz.dal.entity.TeacherAttendance;
|
|
import com.ym.mec.biz.dal.enums.GroupType;
|
|
import com.ym.mec.biz.dal.enums.GroupType;
|
|
import com.ym.mec.biz.dal.enums.SignStatusEnum;
|
|
import com.ym.mec.biz.dal.enums.SignStatusEnum;
|
|
import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
|
|
import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
|
|
@@ -46,8 +49,6 @@ import org.springframework.transaction.annotation.Transactional;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
-import java.util.Set;
|
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* Created by super_zou on 2019/11/28.
|
|
* Created by super_zou on 2019/11/28.
|
|
@@ -783,8 +784,16 @@ public class RoomServiceImpl implements RoomService {
|
|
@Override
|
|
@Override
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public Boolean batchControlDevice(ReqDeviceControlData data) throws Exception {
|
|
public Boolean batchControlDevice(ReqDeviceControlData data) throws Exception {
|
|
- //获取所有的学员列表
|
|
|
|
- List<RoomMember> roomMembers = roomMemberDao.findByRidAndRole(data.getRoomId(),RoleEnum.RoleStudent.getValue());
|
|
|
|
|
|
+ List<RoomMember> roomMembers;
|
|
|
|
+ if(StringUtils.isNotEmpty(data.getUserId())){
|
|
|
|
+ roomMembers = new ArrayList<>();
|
|
|
|
+ String[] split = data.getUserId().split(",");
|
|
|
|
+ for (int i = 0; i < split.length; i++) {
|
|
|
|
+ roomMembers.add(new RoomMember(split[i]));
|
|
|
|
+ }
|
|
|
|
+ }else {
|
|
|
|
+ roomMembers = roomMemberDao.findByRidAndRole(data.getRoomId(),RoleEnum.RoleStudent.getValue());
|
|
|
|
+ }
|
|
if(roomMembers.size() == 0){
|
|
if(roomMembers.size() == 0){
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|