Merge remote-tracking branch 'origin/master'

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

@@ -2197,7 +2197,69 @@ public class TFurnancePressureController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TFurnancePressure tFurnancePressure)
     {
-        return toAjax(tFurnancePressureService.updateTFurnancePressure(tFurnancePressure));
+        String furnanceName = tFurnancePressure.getFurnanceName();
+        List<TFurnancePressure> list = new ArrayList();
+        list.add(tFurnancePressure);
+        switch (furnanceName) {
+            case "H109":
+                FurnancePressureFvpVO furnancePressureFvpVO109A = this.calcRatio109A(list);
+                FurnancePressureFvpVO furnancePressureFvpVO109B = this.calcRatio109B(list);
+                this.checkRatio(furnancePressureFvpVO109A, tFurnancePressure);
+                this.checkRatio(furnancePressureFvpVO109B, tFurnancePressure);
+                break;
+            case "H110":
+                FurnancePressureFvpVO furnancePressureFvpVO110 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO110, tFurnancePressure);
+            case "H111":
+                FurnancePressureFvpVO furnancePressureFvpVO111 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO111, tFurnancePressure);
+            case "H112":
+                FurnancePressureFvpVO furnancePressureFvpVO112 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO112, tFurnancePressure);
+            case "H113":
+                FurnancePressureFvpVO furnancePressureFvpVO113 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO113, tFurnancePressure);
+            case "H114":
+                FurnancePressureFvpVO furnancePressureFvpVO114 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO114, tFurnancePressure);
+            case "H115":
+                FurnancePressureFvpVO furnancePressureFvpVO115 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO115, tFurnancePressure);
+            case "H116":
+                FurnancePressureFvpVO furnancePressureFvpVO116 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO116, tFurnancePressure);
+            case "H117":
+                FurnancePressureFvpVO furnancePressureFvpVO117 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO117, tFurnancePressure);
+            case "H118":
+                FurnancePressureFvpVO furnancePressureFvpVO118 = this.calcRatio(list);
+                this.checkRatio(furnancePressureFvpVO118, tFurnancePressure);
+                break;
+            case "H130":
+                FurnancePressureFvpVO furnancePressureFvpVO130 = this.calcRatio130(list);
+                this.checkRatio(furnancePressureFvpVO130, tFurnancePressure);
+                break;
+        }
+        int result = tFurnancePressureService.updateTFurnancePressure(tFurnancePressure);
+        return AjaxResult.success(result+"", tFurnancePressure);
+    }
+    private void checkRatio(FurnancePressureFvpVO vo, TFurnancePressure pressure) {
+        double pass1Ratio = vo.getPass1Ratio();
+        double pass2Ratio = vo.getPass2Ratio();
+        double pass3Ratio = vo.getPass3Ratio();
+        double pass4Ratio = vo.getPass4Ratio();
+        double pass5Ratio = vo.getPass5Ratio();
+        double pass6Ratio = vo.getPass6Ratio();
+        double pass7Ratio = vo.getPass7Ratio();
+        double pass8Ratio = vo.getPass8Ratio();
+        if (pass1Ratio > 0.9) { pressure.setPass1RatioExceeded(true); } else { pressure.setPass1RatioExceeded(false); }
+        if (pass2Ratio > 0.9) { pressure.setPass2RatioExceeded(true); } else { pressure.setPass2RatioExceeded(false); }
+        if (pass3Ratio > 0.9) { pressure.setPass3RatioExceeded(true); } else { pressure.setPass3RatioExceeded(false); }
+        if (pass4Ratio > 0.9) { pressure.setPass4RatioExceeded(true); } else { pressure.setPass4RatioExceeded(false); }
+        if (pass5Ratio > 0.9) { pressure.setPass5RatioExceeded(true); } else { pressure.setPass5RatioExceeded(false); }
+        if (pass6Ratio > 0.9) { pressure.setPass6RatioExceeded(true); } else { pressure.setPass6RatioExceeded(false); }
+        if (pass7Ratio > 0.9) { pressure.setPass7RatioExceeded(true); } else { pressure.setPass7RatioExceeded(false); }
+        if (pass8Ratio > 0.9) { pressure.setPass8RatioExceeded(true); } else { pressure.setPass8RatioExceeded(false); }
     }
 
     /**

master/src/main/java/com/ruoyi/project/production/domain/TFurnancePressure.java

@@ -153,6 +153,86 @@ public class TFurnancePressure extends BaseEntity
 
     private boolean isPass16Complete;
 
+    private boolean isPass1RatioExceeded;
+
+    private boolean isPass2RatioExceeded;
+
+    private boolean isPass3RatioExceeded;
+
+    private boolean isPass4RatioExceeded;
+
+    private boolean isPass5RatioExceeded;
+
+    private boolean isPass6RatioExceeded;
+
+    private boolean isPass7RatioExceeded;
+
+    private boolean isPass8RatioExceeded;
+
+    public boolean isPass1RatioExceeded() {
+        return isPass1RatioExceeded;
+    }
+
+    public void setPass1RatioExceeded(boolean pass1RatioExceeded) {
+        isPass1RatioExceeded = pass1RatioExceeded;
+    }
+
+    public boolean isPass2RatioExceeded() {
+        return isPass2RatioExceeded;
+    }
+
+    public void setPass2RatioExceeded(boolean pass2RatioExceeded) {
+        isPass2RatioExceeded = pass2RatioExceeded;
+    }
+
+    public boolean isPass3RatioExceeded() {
+        return isPass3RatioExceeded;
+    }
+
+    public void setPass3RatioExceeded(boolean pass3RatioExceeded) {
+        isPass3RatioExceeded = pass3RatioExceeded;
+    }
+
+    public boolean isPass4RatioExceeded() {
+        return isPass4RatioExceeded;
+    }
+
+    public void setPass4RatioExceeded(boolean pass4RatioExceeded) {
+        isPass4RatioExceeded = pass4RatioExceeded;
+    }
+
+    public boolean isPass5RatioExceeded() {
+        return isPass5RatioExceeded;
+    }
+
+    public void setPass5RatioExceeded(boolean pass5RatioExceeded) {
+        isPass5RatioExceeded = pass5RatioExceeded;
+    }
+
+    public boolean isPass6RatioExceeded() {
+        return isPass6RatioExceeded;
+    }
+
+    public void setPass6RatioExceeded(boolean pass6RatioExceeded) {
+        isPass6RatioExceeded = pass6RatioExceeded;
+    }
+
+    public boolean isPass7RatioExceeded() {
+        return isPass7RatioExceeded;
+    }
+
+    public void setPass7RatioExceeded(boolean pass7RatioExceeded) {
+        isPass7RatioExceeded = pass7RatioExceeded;
+    }
+
+    public boolean isPass8RatioExceeded() {
+        return isPass8RatioExceeded;
+    }
+
+    public void setPass8RatioExceeded(boolean pass8RatioExceeded) {
+        isPass8RatioExceeded = pass8RatioExceeded;
+    }
+
     public double getProgress() {
         return progress;
     }