|
|
@@ -800,7 +800,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
|
|
|
* @Param [subjectid 实验室id, floorId 楼层id, riskPlanId 预案id]
|
|
|
* @Return void
|
|
|
**/
|
|
|
- private void closeLoudSpeaker(Long subjectid, Long floorId, Long riskPlanId) {
|
|
|
+ private void closeLoudSpeaker(Long subjectId, Long floorId, Long riskPlanId) {
|
|
|
//预案关闭喇叭
|
|
|
try {
|
|
|
//这里查询预案下的合成音乐
|
|
|
@@ -809,16 +809,16 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
|
|
|
List<LabAudioSynthesis> audioSyntheses = labAudioSynthesisMapper.selectLabAudioSynthesisList(labAudioSynthesis);
|
|
|
log.info("关闭喇叭-查询的音乐列表信息 audioSyntheses= {}", JSON.toJSONString(audioSyntheses));
|
|
|
if (audioSyntheses != null && audioSyntheses.size() > 0) {
|
|
|
- log.info("关闭喇叭-远程调用查询喇叭列表，楼层id={}，实验室id={}", floorId, subjectid);
|
|
|
+ log.info("关闭喇叭-远程调用查询喇叭列表，楼层id={}，实验室id={}", floorId, subjectId);
|
|
|
Integer count = labSparseHardwareService.selectSpeakerCount();
|
|
|
log.info("查询喇叭总数：{}",count);
|
|
|
- R deviceList = remoteSpeakService.getDeviceList(1, count + 10, floorId, subjectid);
|
|
|
+ R deviceList = remoteSpeakService.getDeviceList(1, count + 10, null, subjectId);
|
|
|
log.info("关闭喇叭-远程调用喇叭列表返回内容： deviceList={}", JSON.toJSONString(deviceList));
|
|
|
if (deviceList.getCode() == 200) {
|
|
|
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"))) {
|
|
|
- log.info("关闭喇叭-远程调用喇叭播放音乐！deviceSn={},deviceIp={}",String.valueOf(map.get("deviceSn")), String.valueOf(map.get("deviceIp")));
|
|
|
+ log.info("关闭喇叭-远程调用喇叭播放音乐！deviceSn={},deviceIp={}",map.get("deviceSn"), map.get("deviceIp"));
|
|
|
R r = remoteSpeakService.stopPlayMusic(String.valueOf(map.get("deviceSn")), String.valueOf(map.get("deviceIp")));
|
|
|
log.info("关闭喇叭-远程调用喇叭播放音乐返回信息：{}", JSON.toJSONString(r));
|
|
|
} else {
|
hanzhiwei