关闭喇叭修改

关闭异步

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

@@ -818,8 +818,8 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                     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("关闭喇叭-远程调用喇叭播放音乐！url={},deviceSn={}", audioSyntheses.get(0).getNewMusicUrl(), map.get("deviceSn"));
-                            R r = remoteSpeakService.stopPlayMusic(map.get("deviceSn") + "", audioSyntheses.get(0).getNewMusicUrl());
+                            log.info("关闭喇叭-远程调用喇叭播放音乐！deviceSn={},deviceIp={}",String.valueOf(map.get("deviceSn")), String.valueOf(map.get("deviceIp")));
+                            R r = remoteSpeakService.stopPlayMusic(String.valueOf(map.get("deviceSn")), String.valueOf(map.get("deviceIp")));
                             log.info("关闭喇叭-远程调用喇叭播放音乐返回信息：{}", JSON.toJSONString(r));
                         } else {
                             log.info("关闭喇叭deviceSn/port为空！");

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

@@ -124,7 +124,7 @@ public class LabSubjectManagerService {
 
     }
 
-    @Async("labExecutor")
+//    @Async("labExecutor")
     public void operationHardware(FunctionStatus status, List<LabHardware> hardwareList) {
         try {
             logger.info("异步线程处理硬件信息：id={},name={}",Thread.currentThread().getId(),Thread.currentThread().getName());