处理查询预警空指针问题

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanWarningRuleSet.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -124,4 +125,6 @@ public class IdxBizFanWarningRuleSet {
 
     @TableField("GATEWAY_ID")
     private String gatewayId;
+    @TableField("ORG_CODE")
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvWarningRuleSet.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -140,4 +141,8 @@ public class IdxBizPvWarningRuleSet{
      */
     @TableField("GATEWAY_ID")
     private String gatewayId;
+
+    @TableField("ORG_CODE")
+    private String orgCode;
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/AlarmInfoDetailServiceImpl.java

@@ -619,7 +619,7 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
                         processValue1 = 0.0;
                     }
                     currentValueMap.put("processValue1", keepOneKeepDecimalPlace(processValue1));
-                    if(ObjectUtils.isEmpty(analyseValue)){
+                    if(ObjectUtils.isEmpty(processValue2)){
                         processValue2 = 0.0;
                     }
                     currentValueMap.put("processValue2", keepOneKeepDecimalPlace(processValue2));