温度矩阵bug修复

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/TemperatureInfoController.java

@@ -23,22 +23,6 @@ public class TemperatureInfoController {
     private IEdosUtil edosUtil;
 
     /**
-     * 温度矩阵信息
-     */
-//    private List<TemperatureInfo> temperatureInfos =new ArrayList<>();
-
-
-    private Collection<TemperatureInfo> getPage(List<TemperatureInfo> ls, Integer pageNum, Integer pageSize) {
-        if (pageNum == null || pageSize == null) {
-            return ls;
-        }
-        int pagenum = pageNum < 1 ? 1 : pageNum;
-        return ls.stream().skip((long) (pagenum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-    }
-
-
-
-    /**
      * 获取温度信息
      *
      * @param id 场站ID
@@ -95,4 +79,14 @@ public class TemperatureInfoController {
     }
 
 
+
+    private Collection<TemperatureInfo> getPage(List<TemperatureInfo> ls, Integer pageNum, Integer pageSize) {
+        if (pageNum == null || pageSize == null) {
+            return ls;
+        }
+        int pagenum = pageNum < 1 ? 1 : pageNum;
+        return ls.stream().skip((long) (pagenum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+    }
+
+
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/model/TemperatureTagInfo.java

@@ -1,8 +1,6 @@
 package com.gyee.runeconomy.model;
 
 
-import java.io.Serializable;
-
 public class TemperatureTagInfo extends TagInfo {
     /**
      * 最大正常运行值
@@ -34,7 +32,8 @@ public class TemperatureTagInfo extends TagInfo {
     }
 
     public TemperatureStatus getStatus() {
-        if (this.getValue() >= 2000) {
+
+        if (this.getValue() >= 850 && maxval < 2200) {
             return TemperatureStatus.BadPoint;
         }
         if (maxval != -1 && this.getValue() >= maxval) {