裂解炉炉管测温测压 - 修改提交时检查数据是否包含负值

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

@@ -3152,6 +3152,76 @@ public class TFurnancePressureController extends BaseController
         return toAjax(tFurnancePressureService.insertTFurnancePressure(tFurnancePressure));
     }
 
+    public boolean isNegative(TFurnancePressure tFurnancePressure) {
+        String pass1 = tFurnancePressure.getPass1();
+        String pass2 = tFurnancePressure.getPass2();
+        String pass3 = tFurnancePressure.getPass3();
+        String pass4 = tFurnancePressure.getPass4();
+        String pass5 = tFurnancePressure.getPass5();
+        String pass6 = tFurnancePressure.getPass6();
+        String pass7 = tFurnancePressure.getPass7();
+        String pass8 = tFurnancePressure.getPass8();
+        String pass9 = tFurnancePressure.getPass9();
+        String pass10 = tFurnancePressure.getPass10();
+        String pass11 = tFurnancePressure.getPass11();
+        String pass12 = tFurnancePressure.getPass12();
+        String pass13 = tFurnancePressure.getPass13();
+        String pass14 = tFurnancePressure.getPass14();
+        String pass15 = tFurnancePressure.getPass15();
+        String pass16 = tFurnancePressure.getPass16();
+        if (this.isPassNegative(pass1)) {
+            return true;
+        } else if (this.isPassNegative(pass2)) {
+            return true;
+        } else if (this.isPassNegative(pass3)) {
+            return true;
+        } else if (this.isPassNegative(pass4)) {
+            return true;
+        } else if (this.isPassNegative(pass5)) {
+            return true;
+        } else if (this.isPassNegative(pass6)) {
+            return true;
+        } else if (this.isPassNegative(pass7)) {
+            return true;
+        } else if (this.isPassNegative(pass8)) {
+            return true;
+        } else if (this.isPassNegative(pass9)) {
+            return true;
+        } else if (this.isPassNegative(pass10)) {
+            return true;
+        } else if (this.isPassNegative(pass11)) {
+            return true;
+        } else if (this.isPassNegative(pass12)) {
+            return true;
+        } else if (this.isPassNegative(pass13)) {
+            return true;
+        } else if (this.isPassNegative(pass14)) {
+            return true;
+        } else if (this.isPassNegative(pass15)) {
+            return true;
+        } else if (this.isPassNegative(pass16)) {
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isPassNegative(String pass) {
+        boolean flag = false;
+        if (StringUtils.isNotNull(pass) && StringUtils.isNotEmpty(pass)) {
+            String[] split = pass.split(",");
+            for (int i = 0; i < split.length; i++) {
+                int element = Integer.parseInt(split[i]);
+                if (element < 0) {
+                    flag = true;
+                    break;
+                }
+            }
+            return flag;
+        } else {
+            return false;
+        }
+    }
+
     /**
      * 修改裂解炉炉管测压
      */
@@ -3159,64 +3229,69 @@ public class TFurnancePressureController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TFurnancePressure tFurnancePressure)
     {
-        //更新
-        tFurnancePressureService.updateTFurnancePressure(tFurnancePressure);
-        //计算ratio
-        TFurnancePressure pressure = tFurnancePressureService.selectTFurnancePressureById(tFurnancePressure.getId());
-        String furnanceName = pressure.getFurnanceName();
-        List<TFurnancePressure> list = new ArrayList();
-        list.add(pressure);
-        switch (furnanceName) {
-            case "H109":
-                FurnancePressureFvpVO furnancePressureFvpVO109A = this.calcRatio109A(list);
-                FurnancePressureFvpVO furnancePressureFvpVO109B = this.calcRatio109B(list);
-                this.checkRatio(furnancePressureFvpVO109A, pressure);
-                this.checkRatio(furnancePressureFvpVO109B, pressure);
-                break;
-            case "H110":
-                FurnancePressureFvpVO furnancePressureFvpVO110 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO110, pressure);
-                break;
-            case "H111":
-                FurnancePressureFvpVO furnancePressureFvpVO111 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO111, pressure);
-                break;
-            case "H112":
-                FurnancePressureFvpVO furnancePressureFvpVO112 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO112, pressure);
-                break;
-            case "H113":
-                FurnancePressureFvpVO furnancePressureFvpVO113 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO113, pressure);
-                break;
-            case "H114":
-                FurnancePressureFvpVO furnancePressureFvpVO114 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO114, pressure);
-                break;
-            case "H115":
-                FurnancePressureFvpVO furnancePressureFvpVO115 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO115, pressure);
-                break;
-            case "H116":
-                FurnancePressureFvpVO furnancePressureFvpVO116 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO116, pressure);
-                break;
-            case "H117":
-                FurnancePressureFvpVO furnancePressureFvpVO117 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO117, pressure);
-                break;
-            case "H118":
-                FurnancePressureFvpVO furnancePressureFvpVO118 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO118, pressure);
-                break;
-            case "H130":
-                FurnancePressureFvpVO furnancePressureFvpVO130 = this.calcRatio130(list);
-                this.checkRatio(furnancePressureFvpVO130, pressure);
-                break;
+        // 检查数据是否包含负值
+        if (!this.isNegative(tFurnancePressure)) {
+            //更新
+            tFurnancePressureService.updateTFurnancePressure(tFurnancePressure);
+            //计算ratio
+            TFurnancePressure pressure = tFurnancePressureService.selectTFurnancePressureById(tFurnancePressure.getId());
+            String furnanceName = pressure.getFurnanceName();
+            List<TFurnancePressure> list = new ArrayList();
+            list.add(pressure);
+            switch (furnanceName) {
+                case "H109":
+                    FurnancePressureFvpVO furnancePressureFvpVO109A = this.calcRatio109A(list);
+                    FurnancePressureFvpVO furnancePressureFvpVO109B = this.calcRatio109B(list);
+                    this.checkRatio(furnancePressureFvpVO109A, pressure);
+                    this.checkRatio(furnancePressureFvpVO109B, pressure);
+                    break;
+                case "H110":
+                    FurnancePressureFvpVO furnancePressureFvpVO110 = this.calcRatio(list);
+                    this.checkRatio(furnancePressureFvpVO110, pressure);
+                    break;
+                case "H111":
+                    FurnancePressureFvpVO furnancePressureFvpVO111 = this.calcRatio(list);
+                    this.checkRatio(furnancePressureFvpVO111, pressure);
+                    break;
+                case "H112":
+                    FurnancePressureFvpVO furnancePressureFvpVO112 = this.calcRatio(list);
+                    this.checkRatio(furnancePressureFvpVO112, pressure);
+                    break;
+                case "H113":
+                    FurnancePressureFvpVO furnancePressureFvpVO113 = this.calcRatio(list);
+                    this.checkRatio(furnancePressureFvpVO113, pressure);
+                    break;
+                case "H114":
+                    FurnancePressureFvpVO furnancePressureFvpVO114 = this.calcRatio(list);
+                    this.checkRatio(furnancePressureFvpVO114, pressure);
+                    break;
+                case "H115":
+                    FurnancePressureFvpVO furnancePressureFvpVO115 = this.calcRatio(list);
+                    this.checkRatio(furnancePressureFvpVO115, pressure);
+                    break;
+                case "H116":
+                    FurnancePressureFvpVO furnancePressureFvpVO116 = this.calcRatio(list);
+                    this.checkRatio(furnancePressureFvpVO116, pressure);
+                    break;
+                case "H117":
+                    FurnancePressureFvpVO furnancePressureFvpVO117 = this.calcRatio(list);
+                    this.checkRatio(furnancePressureFvpVO117, pressure);
+                    break;
+                case "H118":
+                    FurnancePressureFvpVO furnancePressureFvpVO118 = this.calcRatio(list);
+                    this.checkRatio(furnancePressureFvpVO118, pressure);
+                    break;
+                case "H130":
+                    FurnancePressureFvpVO furnancePressureFvpVO130 = this.calcRatio130(list);
+                    this.checkRatio(furnancePressureFvpVO130, pressure);
+                    break;
+            }
+            //更新
+            int result = tFurnancePressureService.updateTFurnancePressure(pressure);
+            return AjaxResult.success(result+"", pressure);
+        } else {
+            return AjaxResult.error("提交失败，数据必须>=0！");
         }
-        //更新
-        int result = tFurnancePressureService.updateTFurnancePressure(pressure);
-        return AjaxResult.success(result+"", pressure);
     }
     public void checkRatio(FurnancePressureFvpVO vo, TFurnancePressure pressure) {
         double pass1Ratio = vo.getPass1Ratio();

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

@@ -1355,7 +1355,82 @@ public class TFurnanceTemperatureController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TFurnanceTemperature tFurnanceTemperature)
     {
-        return toAjax(tFurnanceTemperatureService.updateTFurnanceTemperature(tFurnanceTemperature));
+        // 检查数据是否包含负值
+        if (!this.isNegative(tFurnanceTemperature)) {
+            return toAjax(tFurnanceTemperatureService.updateTFurnanceTemperature(tFurnanceTemperature));
+        } else {
+            return AjaxResult.error("提交失败，数据必须>=0！");
+        }
+    }
+
+    public boolean isNegative(TFurnanceTemperature tFurnanceTemperature) {
+        String pass1 = tFurnanceTemperature.getPass1();
+        String pass2 = tFurnanceTemperature.getPass2();
+        String pass3 = tFurnanceTemperature.getPass3();
+        String pass4 = tFurnanceTemperature.getPass4();
+        String pass5 = tFurnanceTemperature.getPass5();
+        String pass6 = tFurnanceTemperature.getPass6();
+        String pass7 = tFurnanceTemperature.getPass7();
+        String pass8 = tFurnanceTemperature.getPass8();
+        String pass9 = tFurnanceTemperature.getPass9();
+        String pass10 = tFurnanceTemperature.getPass10();
+        String pass11 = tFurnanceTemperature.getPass11();
+        String pass12 = tFurnanceTemperature.getPass12();
+        String pass13 = tFurnanceTemperature.getPass13();
+        String pass14 = tFurnanceTemperature.getPass14();
+        String pass15 = tFurnanceTemperature.getPass15();
+        String pass16 = tFurnanceTemperature.getPass16();
+        if (this.isPassNegative(pass1)) {
+            return true;
+        } else if (this.isPassNegative(pass2)) {
+            return true;
+        } else if (this.isPassNegative(pass3)) {
+            return true;
+        } else if (this.isPassNegative(pass4)) {
+            return true;
+        } else if (this.isPassNegative(pass5)) {
+            return true;
+        } else if (this.isPassNegative(pass6)) {
+            return true;
+        } else if (this.isPassNegative(pass7)) {
+            return true;
+        } else if (this.isPassNegative(pass8)) {
+            return true;
+        } else if (this.isPassNegative(pass9)) {
+            return true;
+        } else if (this.isPassNegative(pass10)) {
+            return true;
+        } else if (this.isPassNegative(pass11)) {
+            return true;
+        } else if (this.isPassNegative(pass12)) {
+            return true;
+        } else if (this.isPassNegative(pass13)) {
+            return true;
+        } else if (this.isPassNegative(pass14)) {
+            return true;
+        } else if (this.isPassNegative(pass15)) {
+            return true;
+        } else if (this.isPassNegative(pass16)) {
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isPassNegative(String pass) {
+        boolean flag = false;
+        if (StringUtils.isNotNull(pass) && StringUtils.isNotEmpty(pass)) {
+            String[] split = pass.split(",");
+            for (int i = 0; i < split.length; i++) {
+                int element = Integer.parseInt(split[i]);
+                if (element < 0) {
+                    flag = true;
+                    break;
+                }
+            }
+            return flag;
+        } else {
+            return false;
+        }
     }
 
     /**