Преглед на файлове

传感器触发预案,数值闪烁提示

hanzhiwei преди 2 години
родител
ревизия
5d5e187a86
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

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

@@ -998,7 +998,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             //查询喇叭是否配置在预案中
             List<LabRiskPlanHardwareRelation> riskPlanHardwareList = labRiskPlanLevel.getRiskPlanHardwareList();
             riskPlanHardwareList.forEach(labRiskPlanHardwareRelation -> {
-                if (labRiskPlanHardwareRelation.getHardwareType().equals(HardwareTypeEnum.LOUDSPEAKER.getCode())) {
+                if (labRiskPlanHardwareRelation.getHardwareType().equals(HardwareTypeEnum.LOUDSPEAKER.getCode()) && labRiskPlanHardwareRelation.getOperate().equals("1")) {
                     //这里查询预案下的合成音乐
                     LabAudioSynthesis labAudioSynthesis = new LabAudioSynthesis();
                     labAudioSynthesis.setRiskPlanId(labRiskPlanLevel.getRiskPlanId());