制造修改3

huimv-admin/src/main/java/com/huimv/admin/timer/ProtTimer.java

@@ -205,8 +205,8 @@ public class ProtTimer {
             }
             if (i == 2) {
                 String num1 = NumberUtils.getNum(0, 310,0);//cod
-                String num2 = NumberUtils.getNumFloat(0.0, 35.0);//nh3n
-                String num3 = NumberUtils.getNumFloat(0.0, 4.0);//tp
+                String num2 = NumberUtils.getNumFloat(0.0, 31.0);//nh3n
+                String num3 = NumberUtils.getNumFloat(0.0, 3.6);//tp
                 String num4 = NumberUtils.getNum(0, 32, 0);//tn
                 String num5 = NumberUtils.getNum(0, 55, 0);//flow
 
@@ -224,7 +224,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("处理口ph值为" + num + "达到红色预警");
                     protWarningInfo.setWarningType(1);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -236,7 +235,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("处理口ph值为" + num + "达到橙色预警");
                     protWarningInfo.setWarningType(1);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -248,7 +246,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("处理口cod值为" + num1 + "达到红色预警");
                     protWarningInfo.setWarningType(0);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -260,7 +257,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("处理口cod值为" + num1 + "达到橙色预警");
                     protWarningInfo.setWarningType(0);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -272,7 +268,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("处理口NH3N值为" + num2 + "达到红色预警");
                     protWarningInfo.setWarningType(2);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -284,7 +279,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("处理口NH3N值为" + num2 + "达到橙色预警");
                     protWarningInfo.setWarningType(2);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -296,7 +290,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("处理口TP值为" + num3 + "达到红色预警");
                     protWarningInfo.setWarningType(3);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -308,7 +301,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("处理口TP值为" + num3 + "达到橙色预警");
                     protWarningInfo.setWarningType(3);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -320,7 +312,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("处理口TN值为" + num4 + "达到红色预警");
                     protWarningInfo.setWarningType(4);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -332,7 +323,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("处理口TN值为" + num4 + "达到橙色预警");
                     protWarningInfo.setWarningType(4);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -344,7 +334,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("处理口累计流量值为" + num5 + "达到红色预警");
                     protWarningInfo.setWarningType(5);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -356,7 +345,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("处理口累计流量值为" + num5 + "达到橙色预警");
                     protWarningInfo.setWarningType(5);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -391,7 +379,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("排污口ph值为" + ph + "达到红色预警");
                     protWarningInfo.setWarningType(1);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -403,7 +390,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("排污口ph值为" + ph + "达到橙色预警");
                     protWarningInfo.setWarningType(1);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -415,7 +401,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("排污口cod值为" + cod + "达到红色预警");
                     protWarningInfo.setWarningType(0);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -427,7 +412,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("排污口cod值为" + cod + "达到橙色预警");
                     protWarningInfo.setWarningType(0);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -439,7 +423,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("排污口NH3N值为" + nh3n + "达到红色预警");
                     protWarningInfo.setWarningType(2);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -451,7 +434,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("排污口NH3N值为" + nh3n + "达到橙色预警");
                     protWarningInfo.setWarningType(2);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -463,7 +445,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("排污口TP值为" + tp + "达到红色预警");
                     protWarningInfo.setWarningType(3);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -475,7 +456,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("排污口TP值为" + tp + "达到橙色预警");
                     protWarningInfo.setWarningType(3);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -487,7 +467,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("排污口TN值为" + tn + "达到红色预警");
                     protWarningInfo.setWarningType(4);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -499,7 +478,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("排污口TN值为" + tn + "达到橙色预警");
                     protWarningInfo.setWarningType(4);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -511,7 +489,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("排污口累计流量值为" + flow + "达到红色预警");
                     protWarningInfo.setWarningType(5);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);
@@ -523,7 +500,6 @@ public class ProtTimer {
                     protWarningInfo.setWarningContent("排污口累计流量值为" + flow + "达到橙色预警");
                     protWarningInfo.setWarningType(5);
                     protWarningInfo.setFarmId(protThreshold.getFarmId());
-                    protWarningInfo.setWarningType(i);
                     protWarningInfo.setDate(new Date());
                     protWarningInfo.setUserIds(protThreshold.getUserIds());
                     protWarningInfo.setDeviceId(i);