裂解炉炉管测压 - 判断PASS口数据是否完成录入，以及裂解炉数据录入进度

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.project.production.controller.vo.FurnancePressureFvpVO;
 import com.ruoyi.project.production.controller.vo.FurnancePressureVO;
 import com.ruoyi.project.production.controller.vo.FvpAnalysisQueryVO;
+import com.ruoyi.project.production.domain.TFurnanceTemperature;
 import com.ruoyi.project.production.mapper.TFurnancePressureMapper;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -544,11 +545,292 @@ public class TFurnancePressureController extends BaseController
             }
         }
         if (recordTime.getTime() >= parse.getTime()) {
+            this.isComplete(pm);
             return AjaxResult.success(pm);
         } else {
+            this.isComplete(am);
             return AjaxResult.success(am);
         }
     }
+    private TFurnancePressure isComplete(TFurnancePressure tFurnancePressure) {
+        String furnanceName = tFurnancePressure.getFurnanceName();
+        tFurnancePressure.setProgress(0L);
+        tFurnancePressure.setPass1Complete(false);
+        tFurnancePressure.setPass2Complete(false);
+        tFurnancePressure.setPass3Complete(false);
+        tFurnancePressure.setPass4Complete(false);
+        tFurnancePressure.setPass5Complete(false);
+        tFurnancePressure.setPass6Complete(false);
+        tFurnancePressure.setPass7Complete(false);
+        tFurnancePressure.setPass8Complete(false);
+        tFurnancePressure.setPass9Complete(false);
+        tFurnancePressure.setPass10Complete(false);
+        tFurnancePressure.setPass11Complete(false);
+        tFurnancePressure.setPass12Complete(false);
+        tFurnancePressure.setPass13Complete(false);
+        tFurnancePressure.setPass14Complete(false);
+        tFurnancePressure.setPass15Complete(false);
+        tFurnancePressure.setPass16Complete(false);
+        switch (furnanceName) {
+            case "H109":
+                this.isComplete109(tFurnancePressure);
+                break;
+            case "H110":
+            case "H111":
+            case "H112":
+            case "H113":
+            case "H114":
+            case "H115":
+            case "H116":
+            case "H117":
+            case "H118":
+                this.isComplete11x(tFurnancePressure);
+                break;
+            case "H130":
+                this.isComplete130(tFurnancePressure);
+                break;
+        }
+        return tFurnancePressure;
+    }
+    private TFurnancePressure isComplete109(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();
+        double count = 0;
+        if (StringUtils.isNotNull(pass1) && StringUtils.isNotEmpty(pass1)) {
+            String[] split = pass1.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass1Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass2) && StringUtils.isNotEmpty(pass2)) {
+            String[] split = pass2.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass2Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass3) && StringUtils.isNotEmpty(pass3)) {
+            String[] split = pass3.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass3Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass4) && StringUtils.isNotEmpty(pass4)) {
+            String[] split = pass4.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass4Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass5) && StringUtils.isNotEmpty(pass5)) {
+            String[] split = pass5.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass5Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass6) && StringUtils.isNotEmpty(pass6)) {
+            String[] split = pass6.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass6Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass7) && StringUtils.isNotEmpty(pass7)) {
+            String[] split = pass7.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass7Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass8) && StringUtils.isNotEmpty(pass8)) {
+            String[] split = pass8.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass8Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass9) && StringUtils.isNotEmpty(pass9)) {
+            String[] split = pass9.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass9Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass10) && StringUtils.isNotEmpty(pass10)) {
+            String[] split = pass10.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass10Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass11) && StringUtils.isNotEmpty(pass11)) {
+            String[] split = pass11.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass11Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass12) && StringUtils.isNotEmpty(pass12)) {
+            String[] split = pass12.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass12Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass13) && StringUtils.isNotEmpty(pass13)) {
+            String[] split = pass13.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass13Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass14) && StringUtils.isNotEmpty(pass14)) {
+            String[] split = pass14.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass14Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass15) && StringUtils.isNotEmpty(pass15)) {
+            String[] split = pass15.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass15Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass16) && StringUtils.isNotEmpty(pass16)) {
+            String[] split = pass16.split(",");
+            if (split.length >= 15) {
+                tFurnancePressure.setPass16Complete(true);
+                count++;
+            }
+        }
+        tFurnancePressure.setProgress(count * 1.00d / 16L);
+        return tFurnancePressure;
+    }
+    private TFurnancePressure isComplete11x(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();
+        double count = 0;
+        if (StringUtils.isNotNull(pass1) && StringUtils.isNotEmpty(pass1)) {
+            String[] split = pass1.split(",");
+            if (split.length >= 11) {
+                tFurnancePressure.setPass1Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass2) && StringUtils.isNotEmpty(pass2)) {
+            String[] split = pass2.split(",");
+            if (split.length >= 11) {
+                tFurnancePressure.setPass2Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass3) && StringUtils.isNotEmpty(pass3)) {
+            String[] split = pass3.split(",");
+            if (split.length >= 11) {
+                tFurnancePressure.setPass3Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass4) && StringUtils.isNotEmpty(pass4)) {
+            String[] split = pass4.split(",");
+            if (split.length >= 11) {
+                tFurnancePressure.setPass4Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass5) && StringUtils.isNotEmpty(pass5)) {
+            String[] split = pass5.split(",");
+            if (split.length >= 11) {
+                tFurnancePressure.setPass5Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass6) && StringUtils.isNotEmpty(pass6)) {
+            String[] split = pass6.split(",");
+            if (split.length >= 11) {
+                tFurnancePressure.setPass6Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass7) && StringUtils.isNotEmpty(pass7)) {
+            String[] split = pass7.split(",");
+            if (split.length >= 11) {
+                tFurnancePressure.setPass7Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass8) && StringUtils.isNotEmpty(pass8)) {
+            String[] split = pass8.split(",");
+            if (split.length >= 11) {
+                tFurnancePressure.setPass8Complete(true);
+                count++;
+            }
+        }
+        tFurnancePressure.setProgress(count * 1.00d / 8L);
+        return tFurnancePressure;
+    }
+    private TFurnancePressure isComplete130(TFurnancePressure tFurnancePressure) {
+        String pass1 = tFurnancePressure.getPass1();
+        String pass2 = tFurnancePressure.getPass2();
+        String pass3 = tFurnancePressure.getPass3();
+        String pass4 = tFurnancePressure.getPass4();
+        double count = 0;
+        if (StringUtils.isNotNull(pass1) && StringUtils.isNotEmpty(pass1)) {
+            String[] split = pass1.split(",");
+            if (split.length >= 7) {
+                tFurnancePressure.setPass1Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass2) && StringUtils.isNotEmpty(pass2)) {
+            String[] split = pass2.split(",");
+            if (split.length >= 7) {
+                tFurnancePressure.setPass2Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass3) && StringUtils.isNotEmpty(pass3)) {
+            String[] split = pass3.split(",");
+            if (split.length >= 7) {
+                tFurnancePressure.setPass3Complete(true);
+                count++;
+            }
+        }
+        if (StringUtils.isNotNull(pass4) && StringUtils.isNotEmpty(pass4)) {
+            String[] split = pass4.split(",");
+            if (split.length >= 7) {
+                tFurnancePressure.setPass4Complete(true);
+                count++;
+            }
+        }
+        tFurnancePressure.setProgress(count * 1.00d / 4L);
+        return tFurnancePressure;
+    }
 
     /**
      * 查询裂解炉炉管测压FVP

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

@@ -119,6 +119,176 @@ public class TFurnancePressure extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private double progress;
+
+    private boolean isPass1Complete;
+
+    private boolean isPass2Complete;
+
+    private boolean isPass3Complete;
+
+    private boolean isPass4Complete;
+
+    private boolean isPass5Complete;
+
+    private boolean isPass6Complete;
+
+    private boolean isPass7Complete;
+
+    private boolean isPass8Complete;
+
+    private boolean isPass9Complete;
+
+    private boolean isPass10Complete;
+
+    private boolean isPass11Complete;
+
+    private boolean isPass12Complete;
+
+    private boolean isPass13Complete;
+
+    private boolean isPass14Complete;
+
+    private boolean isPass15Complete;
+
+    private boolean isPass16Complete;
+
+    public double getProgress() {
+        return progress;
+    }
+
+    public void setProgress(double progress) {
+        this.progress = progress;
+    }
+
+    public boolean isPass1Complete() {
+        return isPass1Complete;
+    }
+
+    public void setPass1Complete(boolean pass1Complete) {
+        isPass1Complete = pass1Complete;
+    }
+
+    public boolean isPass2Complete() {
+        return isPass2Complete;
+    }
+
+    public void setPass2Complete(boolean pass2Complete) {
+        isPass2Complete = pass2Complete;
+    }
+
+    public boolean isPass3Complete() {
+        return isPass3Complete;
+    }
+
+    public void setPass3Complete(boolean pass3Complete) {
+        isPass3Complete = pass3Complete;
+    }
+
+    public boolean isPass4Complete() {
+        return isPass4Complete;
+    }
+
+    public void setPass4Complete(boolean pass4Complete) {
+        isPass4Complete = pass4Complete;
+    }
+
+    public boolean isPass5Complete() {
+        return isPass5Complete;
+    }
+
+    public void setPass5Complete(boolean pass5Complete) {
+        isPass5Complete = pass5Complete;
+    }
+
+    public boolean isPass6Complete() {
+        return isPass6Complete;
+    }
+
+    public void setPass6Complete(boolean pass6Complete) {
+        isPass6Complete = pass6Complete;
+    }
+
+    public boolean isPass7Complete() {
+        return isPass7Complete;
+    }
+
+    public void setPass7Complete(boolean pass7Complete) {
+        isPass7Complete = pass7Complete;
+    }
+
+    public boolean isPass8Complete() {
+        return isPass8Complete;
+    }
+
+    public void setPass8Complete(boolean pass8Complete) {
+        isPass8Complete = pass8Complete;
+    }
+
+    public boolean isPass9Complete() {
+        return isPass9Complete;
+    }
+
+    public void setPass9Complete(boolean pass9Complete) {
+        isPass9Complete = pass9Complete;
+    }
+
+    public boolean isPass10Complete() {
+        return isPass10Complete;
+    }
+
+    public void setPass10Complete(boolean pass10Complete) {
+        isPass10Complete = pass10Complete;
+    }
+
+    public boolean isPass11Complete() {
+        return isPass11Complete;
+    }
+
+    public void setPass11Complete(boolean pass11Complete) {
+        isPass11Complete = pass11Complete;
+    }
+
+    public boolean isPass12Complete() {
+        return isPass12Complete;
+    }
+
+    public void setPass12Complete(boolean pass12Complete) {
+        isPass12Complete = pass12Complete;
+    }
+
+    public boolean isPass13Complete() {
+        return isPass13Complete;
+    }
+
+    public void setPass13Complete(boolean pass13Complete) {
+        isPass13Complete = pass13Complete;
+    }
+
+    public boolean isPass14Complete() {
+        return isPass14Complete;
+    }
+
+    public void setPass14Complete(boolean pass14Complete) {
+        isPass14Complete = pass14Complete;
+    }
+
+    public boolean isPass15Complete() {
+        return isPass15Complete;
+    }
+
+    public void setPass15Complete(boolean pass15Complete) {
+        isPass15Complete = pass15Complete;
+    }
+
+    public boolean isPass16Complete() {
+        return isPass16Complete;
+    }
+
+    public void setPass16Complete(boolean pass16Complete) {
+        isPass16Complete = pass16Complete;
+    }
+
     public Date getStartDate() {
         return startDate;
     }