裂解炉炉管测温 - 温度过高提示信息定位到具体PASS口

master/src/main/java/com/ruoyi/project/production/controller/TFurnanceTemperatureController.java

@@ -1464,14 +1464,15 @@ public class TFurnanceTemperatureController extends BaseController
     public AjaxResult editWeb(@RequestBody TFurnanceTemperature tFurnanceTemperature)
     {
         // 检查数据是否包含负值或为Null
-        if (!this.isNegativeOrNull(tFurnanceTemperature)) {
+        String msg = this.isNegativeOrNull(tFurnanceTemperature);
+        if ("".equals(msg)) {
             return toAjax(tFurnanceTemperatureService.updateTFurnanceTemperature(tFurnanceTemperature));
         } else {
-            return AjaxResult.error("提交失败，数据必须>=600，并且<=1300！");
+            return AjaxResult.error("提交失败，" + msg + "数据必须>=600，并且<=1300！");
         }
     }
 
-    public boolean isNegativeOrNull(TFurnanceTemperature tFurnanceTemperature) {
+    public String isNegativeOrNull(TFurnanceTemperature tFurnanceTemperature) {
         String pass1 = tFurnanceTemperature.getPass1();
         String pass2 = tFurnanceTemperature.getPass2();
         String pass3 = tFurnanceTemperature.getPass3();
@@ -1490,86 +1491,89 @@ public class TFurnanceTemperatureController extends BaseController
         String pass16 = tFurnanceTemperature.getPass16();
         if ("H109".equals(tFurnanceTemperature.getFurnanceName())) {
             if (this.isPassNegativeOrNull(pass1)) {
-                return true;
+                return "PASS1";
             } else if (this.isPassNegativeOrNull(pass2)) {
-                return true;
+                return "PASS2";
             } else if (this.isPassNegativeOrNull(pass3)) {
-                return true;
+                return "PASS3";
             } else if (this.isPassNegativeOrNull(pass4)) {
-                return true;
+                return "PASS4";
             } else if (this.isPassNegativeOrNull(pass5)) {
-                return true;
+                return "PASS5";
             } else if (this.isPassNegativeOrNull(pass6)) {
-                return true;
+                return "PASS6";
             } else if (this.isPassNegativeOrNull(pass7)) {
-                return true;
+                return "PASS7";
             } else if (this.isPassNegativeOrNull(pass8)) {
-                return true;
+                return "PASS8";
             } else if (this.isPassNegativeOrNull(pass9)) {
-                return true;
+                return "PASS9";
             } else if (this.isPassNegativeOrNull(pass10)) {
-                return true;
+                return "PASS10";
             } else if (this.isPassNegativeOrNull(pass11)) {
-                return true;
+                return "PASS11";
             } else if (this.isPassNegativeOrNull(pass12)) {
-                return true;
+                return "PASS12";
             } else if (this.isPassNegativeOrNull(pass13)) {
-                return true;
+                return "PASS13";
             } else if (this.isPassNegativeOrNull(pass14)) {
-                return true;
+                return "PASS14";
             } else if (this.isPassNegativeOrNull(pass15)) {
-                return true;
+                return "PASS15";
             } else if (this.isPassNegativeOrNull(pass16)) {
-                return true;
+                return "PASS16";
             } else {
-                return false;
+                return "";
             }
         } else if ("H130".equals(tFurnanceTemperature.getFurnanceName())) {
             if (this.isPassNegativeOrNull(pass1)) {
-                return true;
+                return "PASS1";
             } else if (this.isPassNegativeOrNull(pass2)) {
-                return true;
+                return "PASS2";
             } else if (this.isPassNegativeOrNull(pass3)) {
-                return true;
+                return "PASS3";
             } else if (this.isPassNegativeOrNull(pass4)) {
-                return true;
+                return "PASS4";
             } else if (this.isPassNegativeOrNull(pass5)) {
-                return true;
+                return "PASS5";
             } else if (this.isPassNegativeOrNull(pass6)) {
-                return true;
+                return "PASS6";
             } else if (this.isPassNegativeOrNull(pass7)) {
-                return true;
+                return "PASS7";
             } else if (this.isPassNegativeOrNull(pass8)) {
-                return true;
+                return "PASS8";
             } else if (this.isPassNegativeOrNull(pass9)) {
-                return true;
+                return "PASS9";
             } else if (this.isPassNegativeOrNull(pass10)) {
-                return true;
+                return "PASS10";
             } else if (this.isPassNegativeOrNull(pass11)) {
-                return true;
+                return "PASS11";
             } else if (this.isPassNegativeOrNull(pass12)) {
-                return true;
+                return "PASS12";
+            } else {
+                return "";
             }
         } else {
             if (this.isPassNegativeOrNull(pass1)) {
-                return true;
+                return "PASS1";
             } else if (this.isPassNegativeOrNull(pass2)) {
-                return true;
+                return "PASS2";
             } else if (this.isPassNegativeOrNull(pass3)) {
-                return true;
+                return "PASS3";
             } else if (this.isPassNegativeOrNull(pass4)) {
-                return true;
+                return "PASS4";
             } else if (this.isPassNegativeOrNull(pass5)) {
-                return true;
+                return "PASS5";
             } else if (this.isPassNegativeOrNull(pass6)) {
-                return true;
+                return "PASS6";
             } else if (this.isPassNegativeOrNull(pass7)) {
-                return true;
+                return "PASS7";
             } else if (this.isPassNegativeOrNull(pass8)) {
-                return true;
+                return "PASS8";
+            } else {
+                return "";
             }
         }
-        return false;
     }
 
     public boolean isPassNegativeOrNull(String pass) {