预案多个设备处理 喇叭日志打印

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

@@ -1063,7 +1063,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             //有效预案延长一分钟
 //            if(redisService.getCacheObject("subjectByYa"+subFunction.getSubId())==null){
 //            redisService.setCacheObject("subjectByYa" + subFunction.getSubId(), subFunction.getSubId(), 2L, TimeUnit.MINUTES);
-            redisService.setCacheObject("subjectByYa" + subFunction.getSubId(), subFunction.getSubId(), 10L, TimeUnit.SECONDS);
+            redisService.setCacheObject("subjectByYa" + subFunction.getSubId(), subFunction.getSubId(), 2L, TimeUnit.MINUTES);
             log.info("@@@@@@@@@@@@@@@@@@@@预案延长3分钟@@@@@@@@@@@@@@@@@@@@");
 //            }
             Map<SenseType, List<SensorFunctionStatus>> sensorFunctionStatusListMap = hardwareFunctionStatusConfig.getSensorFunctionStatusListMap();
@@ -1137,9 +1137,9 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                     if (audioSyntheses.size() > 0) {
                         //预案调用喇叭
                         R deviceList = remoteSpeakService.getDeviceList(1, 10, labRiskPlanLevel.getFloorId(), subFunction.getSubId());
+                        log.info("调用喇叭查询内容： deviceList={}",deviceList.toString());
                         if (deviceList.getCode() == 200) {
                             List<Map<String, Object>> mapList = (List<Map<String, Object>>) deviceList.getData();
-
                             for (Map<String, Object> map : mapList) {
                                 log.info("喇叭日志=============================" + map);
                                 if (StringUtils.isNotNull(map.get("deviceSn")) && StringUtils.isNotNull(map.get("port"))) {
@@ -1153,10 +1153,12 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                                     playVo.setParams(paramVo);
                                     playVoList.add(playVo);
                                     remoteSpeakService.textParseUrlAppIps(audioSyntheses.get(0).getNewMusicUrl(), playVoList);
+                                }else {
+                                    log.info("喇叭deviceSn/port为空！");
                                 }
                             }
-
-
+                        }else {
+                            log.info("远程查询喇叭信息错误！");
                         }
                     }
                 } catch (Exception e) {