|
@@ -1138,10 +1138,11 @@ public class LabRiskPlanServiceImpl implements ILabRiskPlanService {
|
|
|
R deviceList = remoteSpeakService.getDeviceList(1,10,newRiskPlan.getFloorId());
|
|
R deviceList = remoteSpeakService.getDeviceList(1,10,newRiskPlan.getFloorId());
|
|
|
if(deviceList.getCode()==200){
|
|
if(deviceList.getCode()==200){
|
|
|
List<Map<String,Object>> mapList = (List <Map <String, Object>>) deviceList.getData();
|
|
List<Map<String,Object>> mapList = (List <Map <String, Object>>) deviceList.getData();
|
|
|
- List<PlayVo> playVoList = new ArrayList<>();
|
|
|
|
|
|
|
+
|
|
|
for(Map<String,Object> map:mapList){
|
|
for(Map<String,Object> map:mapList){
|
|
|
log.info("喇叭日志============================="+map);
|
|
log.info("喇叭日志============================="+map);
|
|
|
if(StringUtils.isNotNull(map.get("deviceSn")) && StringUtils.isNotNull(map.get("port"))){
|
|
if(StringUtils.isNotNull(map.get("deviceSn")) && StringUtils.isNotNull(map.get("port"))){
|
|
|
|
|
+ List<PlayVo> playVoList = new ArrayList<>();
|
|
|
PlayVo playVo = new PlayVo();
|
|
PlayVo playVo = new PlayVo();
|
|
|
playVo.setSn(map.get("deviceSn")+"");
|
|
playVo.setSn(map.get("deviceSn")+"");
|
|
|
playVo.setDeviceIp(map.get("deviceIp")+"");
|
|
playVo.setDeviceIp(map.get("deviceIp")+"");
|
|
@@ -1149,9 +1150,10 @@ public class LabRiskPlanServiceImpl implements ILabRiskPlanService {
|
|
|
ParamVo paramVo=new ParamVo();
|
|
ParamVo paramVo=new ParamVo();
|
|
|
playVo.setParams(paramVo);
|
|
playVo.setParams(paramVo);
|
|
|
playVoList.add(playVo);
|
|
playVoList.add(playVo);
|
|
|
|
|
+ remoteSpeakService.textParseUrlAppIps(audioSyntheses.get(0).getNewMusicUrl(),playVoList);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- remoteSpeakService.textParseUrlAppIps(audioSyntheses.get(0).getNewMusicUrl(),playVoList);
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|