Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/dto/LabBuildFloorLayoutDTO.java

@@ -3,6 +3,8 @@ package com.zd.laboratory.domain.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @Description TODO
  * @Author hzw
@@ -68,4 +70,28 @@ public class LabBuildFloorLayoutDTO {
 
     @ApiModelProperty(value = "组id")
     private Long groupId;
+
+    /**
+     * 最小检测值
+     */
+    @ApiModelProperty(value = "最小检测值")
+    private BigDecimal minMonitor;
+
+    /**
+     * 最大检测值
+     */
+    @ApiModelProperty(value = "最大检测值")
+    private BigDecimal maxMonitor;
+
+    /**
+     * 功能编码
+     */
+    @ApiModelProperty(value = "功能编码")
+    private String funNum;
+
+    /**
+     * 传感器类型
+     */
+    @ApiModelProperty(value = "传感器类型")
+    private Integer sensorType;
 }

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());
@@ -1775,10 +1775,13 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         if (groupList.size() == 0) {
             return labBuilder;
         }
+        Map<SenseType, List<SensorFunctionStatus>> sensorFunctionStatusListMap = hardwareFunctionStatusConfig.getSensorFunctionStatusListMap();
         for (LabRiskPlanAbnormalGroupVO labRiskPlanAbnormalGroupVO : groupList) {
             LabBuildFloorLayoutDTO labBuildFloorLayoutDTO = labBuildFloorLayoutMapper.selectBuildInfoBySubIdAndUser(labRiskPlanAbnormalGroupVO.getSubjectId(), tokenService.getLoginUser().getUserid());
             if (!Objects.isNull(labBuildFloorLayoutDTO)) {
                 LabBuildFloorLayoutDTO labBuildFloorLayoutDTO1 = labRiskPlanAbnormalLogMapper.selectRiskPlanTriggerInfo(labRiskPlanAbnormalGroupVO.getRiskPlanId(), labRiskPlanAbnormalGroupVO.getId());
+                List<SensorFunctionStatus> sensorFunctionStatuses = sensorFunctionStatusListMap.get(SenseType.getByCode(labBuildFloorLayoutDTO1.getSensorType()));
+                labBuildFloorLayoutDTO1.setFunNum(sensorFunctionStatuses.get(0).getFunNum());
                 labBuildFloorLayoutDTO1.setBuildId(labBuildFloorLayoutDTO.getBuildId());
                 labBuildFloorLayoutDTO1.setFloorId(labBuildFloorLayoutDTO.getFloorId());
                 labBuildFloorLayoutDTO1.setSubId(labBuildFloorLayoutDTO.getSubId());

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabRiskPlanAbnormalLogMapper.xml

@@ -414,11 +414,15 @@
             lrpal.create_time riskPlanTriggerTime,
             lrpal.risk_attribute,
             lrp.NAME,
-            lrpag.if_check
+            lrpag.if_check,
+            lrpsr.min_monitor,
+            lrpsr.max_monitor,
+            lrpsr.sensor_type
         FROM
             lab_risk_plan_abnormal_group lrpag
             LEFT JOIN lab_risk_plan_abnormal_log lrpal ON lrpag.id = lrpal.group_id
             LEFT JOIN lab_risk_plan lrp ON lrpal.risk_plan_id = lrp.id
+            LEFT JOIN lab_risk_plan_sensor_relation lrpsr ON lrpal.risk_plan_level_id = lrpsr.risk_plan_level_id
         WHERE lrpal.group_id = #{groupId}
             and lrpal.risk_plan_id = #{riskPlanId}
         ORDER BY lrpal.id DESC