1、修复部分判断问题

src/main/java/com/steerinfo/ems/trmcalpoint/service/impl/TRmCalpointServiceImpl.java

@@ -701,7 +701,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
         }
         String maxValue = tc.getMaxVal() ==null||"".equals(tc.getMaxVal()) ? "9999" : tc.getMaxVal();
         String minValue = tc.getMinVal() ==null||"".equals(tc.getMinVal()) ? "0" : tc.getMinVal();
-        BigDecimal avgValue = tc.getRangeVal() ==null||"".equals(tc.getRangeVal()) ? new BigDecimal(999999) : tc.getRangeVal();
+        BigDecimal avgValue = tc.getRangeVal() ==null ? new BigDecimal(999999) : tc.getRangeVal();
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
         cal.add(Calendar.HOUR_OF_DAY, -1);
@@ -847,7 +847,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
                     //if (tc.getEnergytypeid().equalsIgnoreCase("W")) {
                         // 大于等于0
                         if (tenval.doubleValue() >= 0) {
-                            // 如果十分钟数据超出跳变范围就是错误的数据
+                            // 检查流量计处理。如果十分钟数据超出跳变范围就是错误的数据
                             if (tenval.compareTo(avgValue) == -1) {
                                 hval = hval.add(tenval);
                             } else {
@@ -897,7 +897,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
                                 }
                             }
                             //八万煤气柜柜容，特殊运算不计入
-                            if ( itemid != "DL421P00770002" || !"DL421P00770002".equals(itemid)) {
+                            if (!"DL421P00770002".equals(itemid)) {
                             // 记录异常数据
                             TRmCalpointExValue tce = new TRmCalpointExValue();
                             tce.setItemid(itemid);