zouxuan 5 سال پیش
والد
کامیت
6ed988f226

+ 1 - 2
mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -139,8 +139,7 @@ public class RoomController{
     }
 
     @RequestMapping(value = "/device/batchControl", method = RequestMethod.POST)
-    public Object batchControlDevice(@RequestBody ReqDeviceControlData data)
-            throws ApiException, Exception {
+    public Object batchControlDevice(@RequestBody ReqDeviceControlData data)throws Exception {
         boolean result = roomService.batchControlDevice(data);
         return new BaseResponse<>(result);
     }

+ 10 - 22
mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -785,7 +785,7 @@ public class RoomServiceImpl implements RoomService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean batchControlDevice(ReqDeviceControlData data) throws ApiException, Exception {
+    public Boolean batchControlDevice(ReqDeviceControlData data) throws Exception {
         //获取所有的学员列表
         List<RoomMember> roomMembers = roomMemberDao.findByRidAndRole(data.getRoomId(),RoleEnum.RoleStudent.getValue());
         if(roomMembers.size() == 0){
@@ -793,29 +793,17 @@ public class RoomServiceImpl implements RoomService {
         }
         boolean result = true;
         if (data.getCameraOn() != null) {
-            roomMembers.forEach(e->{
-                try {
-                    controlDevice(data.getRoomId(), e.getUid(), DeviceTypeEnum.Camera, data.getCameraOn());
-                } catch (Exception e1) {
-                    e1.printStackTrace();
-                }
-            });
+            for (RoomMember e:roomMembers) {
+                controlDevice(data.getRoomId(), e.getUid(), DeviceTypeEnum.Camera, data.getCameraOn());
+            }
         } else if (data.getMicrophoneOn() != null) {
-            roomMembers.forEach(e->{
-                try {
-                    controlDevice(data.getRoomId(), e.getUid(), DeviceTypeEnum.Microphone, data.getMicrophoneOn());
-                } catch (Exception e1) {
-                    e1.printStackTrace();
-                }
-            });
+            for (RoomMember e:roomMembers) {
+                controlDevice(data.getRoomId(), e.getUid(), DeviceTypeEnum.Microphone, data.getMicrophoneOn());
+            }
         } else if (data.getMusicModeOn() != null) {
-            roomMembers.forEach(e->{
-                try {
-                    controlDevice(data.getRoomId(), e.getUid(), DeviceTypeEnum.MusicMode, data.getMusicModeOn());
-                } catch (Exception e1) {
-                    e1.printStackTrace();
-                }
-            });
+            for (RoomMember e:roomMembers) {
+                controlDevice(data.getRoomId(), e.getUid(), DeviceTypeEnum.MusicMode, data.getMusicModeOn());
+            }
         } else {
             throw new ApiException(ErrorEnum.ERR_REQUEST_PARA_ERR);
         }

+ 1 - 1
mec-im/src/main/java/com/ym/service/RoomService.java

@@ -35,7 +35,7 @@ public interface RoomService {
 
     public Boolean controlDevice(String roomId, String userId, DeviceTypeEnum type, boolean enable) throws ApiException, Exception;
 
-    Boolean batchControlDevice(ReqDeviceControlData data) throws ApiException, Exception;
+    Boolean batchControlDevice(ReqDeviceControlData data) throws Exception;
 
     public Boolean approveControlDevice(String roomId, String ticket) throws ApiException, Exception;