Commit 1659ce82 authored by hezhuozhi's avatar hezhuozhi

处理查询预警空指针问题

parent 806d1ece
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -124,4 +125,6 @@ public class IdxBizFanWarningRuleSet { ...@@ -124,4 +125,6 @@ public class IdxBizFanWarningRuleSet {
@TableField("GATEWAY_ID") @TableField("GATEWAY_ID")
private String gatewayId; private String gatewayId;
@TableField("ORG_CODE")
private String orgCode;
} }
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -140,4 +141,8 @@ public class IdxBizPvWarningRuleSet{ ...@@ -140,4 +141,8 @@ public class IdxBizPvWarningRuleSet{
*/ */
@TableField("GATEWAY_ID") @TableField("GATEWAY_ID")
private String gatewayId; private String gatewayId;
@TableField("ORG_CODE")
private String orgCode;
} }
...@@ -619,7 +619,7 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService { ...@@ -619,7 +619,7 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
processValue1 = 0.0; processValue1 = 0.0;
} }
currentValueMap.put("processValue1", keepOneKeepDecimalPlace(processValue1)); currentValueMap.put("processValue1", keepOneKeepDecimalPlace(processValue1));
if(ObjectUtils.isEmpty(analyseValue)){ if(ObjectUtils.isEmpty(processValue2)){
processValue2 = 0.0; processValue2 = 0.0;
} }
currentValueMap.put("processValue2", keepOneKeepDecimalPlace(processValue2)); currentValueMap.put("processValue2", keepOneKeepDecimalPlace(processValue2));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment