Ver Fonte

告警规则bug修改

jingyuanchao há 1 ano atrás
pai
commit
bd17249ce5

+ 2 - 0
soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotAlarmRuleSourceServiceImpl.java

@@ -67,6 +67,7 @@ public class IotAlarmRuleSourceServiceImpl extends ServiceImpl<IotAlarmRuleSourc
         iotAlarmRuleSourceDetailVo.setRuleName(iotAlarmRule.getName());
         iotAlarmRuleSourceDetailVo.setRuleType(iotAlarmRule.getType());
         iotAlarmRuleSourceDetailVo.setEnable(iotAlarmRule.getEnabled());
+        iotAlarmRuleSourceDetailVo.setIotCode(iotAlarmRule.getIotCode());
         //2.获取告警规则对应有哪些设备的告警属性规则。
         List<ProductTypeDataVo> productTypeDataVos = iotAlarmRuleSourceMapper.selectRuleDevice(detailVo.getRuleId());
         //3.处理其他sql获取不了的数据
@@ -133,6 +134,7 @@ public class IotAlarmRuleSourceServiceImpl extends ServiceImpl<IotAlarmRuleSourc
                 ruleSource.setIotCode(productType.getIotCode());
                 ruleSource.setProductType(productType.getType());
                 ruleSource.setValue(null);
+                ruleSource.setIotCode(productType.getIotCode());
                 ruleSource.setValueType(ValueTypeEnum.AllDevice.getText());
                 iotAlarmRuleSourceMapper.insert(ruleSource);
                 continue;

+ 3 - 0
soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/alarm/IotAlarmRuleSourceDetailVo.java

@@ -28,6 +28,9 @@ public class IotAlarmRuleSourceDetailVo {
     @ApiModelProperty(value = "备注信息")
     private String ruleRemark;
 
+    @ApiModelProperty(value = "iotCode")
+    private String iotCode;
+
     @ApiModelProperty(value = "产品类型关联设备信息")
     private List<ProductTypeDataVo> typeDataList;