喇叭循环播报调整

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

@@ -1012,10 +1012,10 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 R deviceList = remoteSpeakService.getDeviceList(1, count + 10, floorId, subjectId);
                 log.info("打开喇叭-远程调用喇叭列表返回内容： deviceList={}", JSON.toJSONString(deviceList));
                 if (deviceList.getCode() == 200) {
+                    List<PlayVo> playVoList = new ArrayList<>();
                     List<Map<String, Object>> mapList = (List<Map<String, Object>>) deviceList.getData();
                     for (Map<String, Object> map : mapList) {
                         if (StringUtils.isNotNull(map.get("deviceSn")) && StringUtils.isNotNull(map.get("port"))) {
-                            List<PlayVo> playVoList = new ArrayList<>();
                             PlayVo playVo = new PlayVo();
                             playVo.setSn(map.get("deviceSn") + "");
                             playVo.setDeviceIp(map.get("deviceIp") + "");
@@ -1024,13 +1024,13 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                             paramVo.setVol(Integer.parseInt(map.get("deviceVol").toString()));
                             playVo.setParams(paramVo);
                             playVoList.add(playVo);
-                            log.info("打开喇叭-远程调用喇叭播放音乐！url={},playVoList={}", audioSyntheses.get(0).getNewMusicUrl(), JSON.toJSONString(playVoList));
-                            R r = remoteSpeakService.textMoreParseUrlAppIps(audioSyntheses.get(0).getNewMusicUrl(), playVoList,1000);
-                            log.info("打开喇叭-远程调用喇叭播放音乐返回信息：{}", JSON.toJSONString(r));
                         } else {
                             log.info("打开喇叭-喇叭deviceSn/port为空！");
                         }
                     }
+                    log.info("打开喇叭-远程调用喇叭播放音乐！url={},playVoList={}", audioSyntheses.get(0).getNewMusicUrl(), JSON.toJSONString(playVoList));
+                    R r = remoteSpeakService.textMoreParseUrlAppIps(audioSyntheses.get(0).getNewMusicUrl(), playVoList,100);
+                    log.info("打开喇叭-远程调用喇叭播放音乐返回信息：{}", JSON.toJSONString(r));
                 } else {
                     log.info("打开喇叭-远程查询喇叭信息错误！");
                 }