裂解炉炉管测压

- 压力表coil、max日期格式修改为yyyy-MM-dd HH:mm:ss
- 压力表每天两测fvp相应修改

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

@@ -45,41 +45,49 @@ public class TFurnancePressureController extends BaseController
     @GetMapping("/fvp")
     public AjaxResult fvp(TFurnancePressure tFurnancePressure) {
         tFurnancePressure.setFurnanceName("H109");
-        TFurnancePressure obj109 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        List<TFurnancePressure> list109 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
         tFurnancePressure.setFurnanceName("H110");
-        TFurnancePressure obj110 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        List<TFurnancePressure> list110 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
         tFurnancePressure.setFurnanceName("H111");
-        TFurnancePressure obj111 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        List<TFurnancePressure> list111 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
         tFurnancePressure.setFurnanceName("H112");
-        TFurnancePressure obj112 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        List<TFurnancePressure> list112 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
         tFurnancePressure.setFurnanceName("H113");
-        TFurnancePressure obj113 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        List<TFurnancePressure> list113 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
         tFurnancePressure.setFurnanceName("H114");
-        TFurnancePressure obj114 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        List<TFurnancePressure> list114 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
         tFurnancePressure.setFurnanceName("H115");
-        TFurnancePressure obj115 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        List<TFurnancePressure> list115 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
         tFurnancePressure.setFurnanceName("H116");
-        TFurnancePressure obj116 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        List<TFurnancePressure> list116 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
         tFurnancePressure.setFurnanceName("H117");
-        TFurnancePressure obj117 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        List<TFurnancePressure> list117 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
         tFurnancePressure.setFurnanceName("H118");
-        TFurnancePressure obj118 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        List<TFurnancePressure> list118 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
         tFurnancePressure.setFurnanceName("H130");
-        TFurnancePressure obj130 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
-        if (obj109 != null && obj110 != null && obj111 != null && obj112 != null && obj113 != null && obj114 != null &&
-                obj115 != null && obj116 != null && obj117 != null && obj118 != null && obj130 != null) {
-            FurnancePressureFvpVO vo109A = this.calcRatio109A(obj109);
-            FurnancePressureFvpVO vo109B = this.calcRatio109B(obj109);
-            FurnancePressureFvpVO vo110 = this.calcRatio(obj110);
-            FurnancePressureFvpVO vo111 = this.calcRatio(obj111);
-            FurnancePressureFvpVO vo112 = this.calcRatio(obj112);
-            FurnancePressureFvpVO vo113 = this.calcRatio(obj113);
-            FurnancePressureFvpVO vo114 = this.calcRatio(obj114);
-            FurnancePressureFvpVO vo115 = this.calcRatio(obj115);
-            FurnancePressureFvpVO vo116 = this.calcRatio(obj116);
-            FurnancePressureFvpVO vo117 = this.calcRatio(obj117);
-            FurnancePressureFvpVO vo118 = this.calcRatio(obj118);
-            FurnancePressureFvpVO vo130 = this.calcRatio130(obj130);
+        List<TFurnancePressure> list130 = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        if (list109.size() != list110.size() || list109.size() != list111.size()
+                || list109.size() != list112.size() || list109.size() != list113.size()
+                || list109.size() != list114.size() || list109.size() != list115.size()
+                || list109.size() != list116.size() || list109.size() != list117.size()
+                || list109.size() != list118.size() || list109.size() != list130.size()
+                ||list109.size() == 0 || list109.size() == 0 || list109.size() == 0 || list109.size() == 0
+                || list109.size() == 0 || list109.size() == 0 || list109.size() == 0 || list109.size() == 0
+                || list109.size() == 0 || list109.size() == 0) {
+            return AjaxResult.success("incompleteData");
+        } else {
+            FurnancePressureFvpVO vo109A = this.calcRatio109A(list109);
+            FurnancePressureFvpVO vo109B = this.calcRatio109B(list109);
+            FurnancePressureFvpVO vo110 = this.calcRatio(list110);
+            FurnancePressureFvpVO vo111 = this.calcRatio(list111);
+            FurnancePressureFvpVO vo112 = this.calcRatio(list112);
+            FurnancePressureFvpVO vo113 = this.calcRatio(list113);
+            FurnancePressureFvpVO vo114 = this.calcRatio(list114);
+            FurnancePressureFvpVO vo115 = this.calcRatio(list115);
+            FurnancePressureFvpVO vo116 = this.calcRatio(list116);
+            FurnancePressureFvpVO vo117 = this.calcRatio(list117);
+            FurnancePressureFvpVO vo118 = this.calcRatio(list118);
+            FurnancePressureFvpVO vo130 = this.calcRatio130(list130);
             vo110.setFurnanceName("H-110");
             vo111.setFurnanceName("H-111");
             vo112.setFurnanceName("H-112");
@@ -106,12 +114,11 @@ public class TFurnancePressureController extends BaseController
             voList.add(vo109A);
             voList.add(vo109B);
             return AjaxResult.success(voList);
-        } else {
-            return AjaxResult.success("incompleteData");
         }
     }
-    private FurnancePressureFvpVO calcRatio(TFurnancePressure tFurnancePressure) {
-        if (tFurnancePressure != null) {
+    private FurnancePressureFvpVO calcRatio(List<TFurnancePressure> tFurnancePressure) {
+        if (tFurnancePressure != null && tFurnancePressure.size() != 0) {
+            // pass max inlet
             double pass1Inlet = 0;
             double pass2Inlet = 0;
             double pass3Inlet = 0;
@@ -120,6 +127,7 @@ public class TFurnancePressureController extends BaseController
             double pass6Inlet = 0;
             double pass7Inlet = 0;
             double pass8Inlet = 0;
+            // pass max outlet
             double pass1Out = 0;
             double pass2Out = 0;
             double pass3Out = 0;
@@ -128,6 +136,7 @@ public class TFurnancePressureController extends BaseController
             double pass6Out = 0;
             double pass7Out = 0;
             double pass8Out = 0;
+            // pass ratio
             double pass1Ratio = 0;
             double pass2Ratio = 0;
             double pass3Ratio = 0;
@@ -136,48 +145,65 @@ public class TFurnancePressureController extends BaseController
             double pass6Ratio = 0;
             double pass7Ratio = 0;
             double pass8Ratio = 0;
-            double allPassMaxInlet = 0;
-            double allPassMaxOut = 0;
-            double allPassMaxRatio = 0;
-            String pass1Array = tFurnancePressure.getPass1();
-            String pass2Array = tFurnancePressure.getPass2();
-            String pass3Array = tFurnancePressure.getPass3();
-            String pass4Array = tFurnancePressure.getPass4();
-            String pass5Array = tFurnancePressure.getPass5();
-            String pass6Array = tFurnancePressure.getPass6();
-            String pass7Array = tFurnancePressure.getPass7();
-            String pass8Array = tFurnancePressure.getPass8();
-            if (StringUtils.isNotEmpty(pass1Array)) {
-                pass1Inlet = Double.parseDouble(pass1Array.substring(pass1Array.lastIndexOf(",")+1));
-                pass1Out = this.getMaxValue(pass1Array.substring(0, pass1Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass2Array)) {
-                pass2Inlet = Double.parseDouble(pass2Array.substring(pass2Array.lastIndexOf(",")+1));
-                pass2Out = this.getMaxValue(pass2Array.substring(0, pass2Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass3Array)) {
-                pass3Inlet = Double.parseDouble(pass3Array.substring(pass3Array.lastIndexOf(",")+1));
-                pass3Out = this.getMaxValue(pass3Array.substring(0, pass3Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass4Array)) {
-                pass4Inlet = Double.parseDouble(pass4Array.substring(pass4Array.lastIndexOf(",")+1));
-                pass4Out = this.getMaxValue(pass4Array.substring(0, pass4Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass5Array)) {
-                pass5Inlet = Double.parseDouble(pass5Array.substring(pass5Array.lastIndexOf(",")+1));
-                pass5Out = this.getMaxValue(pass5Array.substring(0, pass5Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass6Array)) {
-                pass6Inlet = Double.parseDouble(pass6Array.substring(pass6Array.lastIndexOf(",")+1));
-                pass6Out = this.getMaxValue(pass6Array.substring(0, pass6Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass7Array)) {
-                pass7Inlet = Double.parseDouble(pass7Array.substring(pass7Array.lastIndexOf(",")+1));
-                pass7Out = this.getMaxValue(pass7Array.substring(0, pass7Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass8Array)) {
-                pass8Inlet = Double.parseDouble(pass8Array.substring(pass8Array.lastIndexOf(",")+1));
-                pass8Out = this.getMaxValue(pass8Array.substring(0, pass8Array.indexOf(",")));
+            // 获取pass max值
+            // xxx,xxx,xxx,...->xxx
+            for (TFurnancePressure furnancePressure : tFurnancePressure) {
+                String pass1Array = furnancePressure.getPass1();
+                String pass2Array = furnancePressure.getPass2();
+                String pass3Array = furnancePressure.getPass3();
+                String pass4Array = furnancePressure.getPass4();
+                String pass5Array = furnancePressure.getPass5();
+                String pass6Array = furnancePressure.getPass6();
+                String pass7Array = furnancePressure.getPass7();
+                String pass8Array = furnancePressure.getPass8();
+                if (StringUtils.isNotEmpty(pass1Array)) {
+                    double in = Double.parseDouble(pass1Array.substring(pass1Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass1Array.substring(0, pass1Array.indexOf(",")));
+                    if (in > pass1Inlet) { pass1Inlet = in; }
+                    if (out > pass1Out) { pass1Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass2Array)) {
+                    double in = Double.parseDouble(pass2Array.substring(pass2Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass2Array.substring(0, pass2Array.indexOf(",")));
+                    if (in > pass2Inlet) { pass2Inlet = in; }
+                    if (out > pass2Out) { pass2Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass3Array)) {
+                    double in = Double.parseDouble(pass3Array.substring(pass3Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass3Array.substring(0, pass3Array.indexOf(",")));
+                    if (in > pass3Inlet) { pass3Inlet = in; }
+                    if (out > pass3Out) { pass3Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass4Array)) {
+                    double in = Double.parseDouble(pass4Array.substring(pass4Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass4Array.substring(0, pass4Array.indexOf(",")));
+                    if (in > pass4Inlet) { pass4Inlet = in; }
+                    if (out > pass4Out) { pass4Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass5Array)) {
+                    double in = Double.parseDouble(pass5Array.substring(pass5Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass5Array.substring(0, pass5Array.indexOf(",")));
+                    if (in > pass5Inlet) { pass5Inlet = in; }
+                    if (out > pass5Out) { pass5Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass6Array)) {
+                    double in = Double.parseDouble(pass6Array.substring(pass6Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass6Array.substring(0, pass6Array.indexOf(",")));
+                    if (in > pass6Inlet) { pass6Inlet = in; }
+                    if (out > pass6Out) { pass6Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass7Array)) {
+                    double in = Double.parseDouble(pass7Array.substring(pass7Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass7Array.substring(0, pass7Array.indexOf(",")));
+                    if (in > pass7Inlet) { pass7Inlet = in; }
+                    if (out > pass7Out) { pass7Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass8Array)) {
+                    double in = Double.parseDouble(pass8Array.substring(pass8Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass8Array.substring(0, pass8Array.indexOf(",")));
+                    if (in > pass8Inlet) { pass8Inlet = in; }
+                    if (out > pass8Out) { pass8Out = out; }
+                }
             }
             DecimalFormat df = new DecimalFormat("#.00");
             if (pass1Inlet != 0 && pass1Out != 0) { pass1Ratio = Double.parseDouble(df.format(pass1Out / pass1Inlet)); }
@@ -221,8 +247,8 @@ public class TFurnancePressureController extends BaseController
             return null;
         }
     }
-    private FurnancePressureFvpVO calcRatio109A(TFurnancePressure tFurnancePressure) {
-        if (tFurnancePressure != null) {
+    private FurnancePressureFvpVO calcRatio109A(List<TFurnancePressure> tFurnancePressure) {
+        if (tFurnancePressure != null && tFurnancePressure.size() != 0) {
             double pass1Inlet = 0;
             double pass2Inlet = 0;
             double pass3Inlet = 0;
@@ -247,48 +273,65 @@ public class TFurnancePressureController extends BaseController
             double pass6Ratio = 0;
             double pass7Ratio = 0;
             double pass8Ratio = 0;
-            double allPassMaxInlet = 0;
-            double allPassMaxOut = 0;
-            double allPassMaxRatio = 0;
-            String pass1Array = tFurnancePressure.getPass1();
-            String pass2Array = tFurnancePressure.getPass3();
-            String pass3Array = tFurnancePressure.getPass5();
-            String pass4Array = tFurnancePressure.getPass7();
-            String pass5Array = tFurnancePressure.getPass9();
-            String pass6Array = tFurnancePressure.getPass11();
-            String pass7Array = tFurnancePressure.getPass13();
-            String pass8Array = tFurnancePressure.getPass15();
-            if (StringUtils.isNotEmpty(pass1Array)) {
-                pass1Inlet = Double.parseDouble(pass1Array.substring(pass1Array.lastIndexOf(",")+1));
-                pass1Out = this.getMaxValue(pass1Array.substring(0, pass1Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass2Array)) {
-                pass2Inlet = Double.parseDouble(pass2Array.substring(pass2Array.lastIndexOf(",")+1));
-                pass2Out = this.getMaxValue(pass2Array.substring(0, pass2Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass3Array)) {
-                pass3Inlet = Double.parseDouble(pass3Array.substring(pass3Array.lastIndexOf(",")+1));
-                pass3Out = this.getMaxValue(pass3Array.substring(0, pass3Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass4Array)) {
-                pass4Inlet = Double.parseDouble(pass4Array.substring(pass4Array.lastIndexOf(",")+1));
-                pass4Out = this.getMaxValue(pass4Array.substring(0, pass4Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass5Array)) {
-                pass5Inlet = Double.parseDouble(pass5Array.substring(pass5Array.lastIndexOf(",")+1));
-                pass5Out = this.getMaxValue(pass5Array.substring(0, pass5Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass6Array)) {
-                pass6Inlet = Double.parseDouble(pass6Array.substring(pass6Array.lastIndexOf(",")+1));
-                pass6Out = this.getMaxValue(pass6Array.substring(0, pass6Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass7Array)) {
-                pass7Inlet = Double.parseDouble(pass7Array.substring(pass7Array.lastIndexOf(",")+1));
-                pass7Out = this.getMaxValue(pass7Array.substring(0, pass7Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass8Array)) {
-                pass8Inlet = Double.parseDouble(pass8Array.substring(pass8Array.lastIndexOf(",")+1));
-                pass8Out = this.getMaxValue(pass8Array.substring(0, pass8Array.indexOf(",")));
+            // 获取pass max值
+            // xxx,xxx,xxx,...->xxx
+            for (TFurnancePressure furnancePressure : tFurnancePressure) {
+                String pass1Array = furnancePressure.getPass1();
+                String pass2Array = furnancePressure.getPass3();
+                String pass3Array = furnancePressure.getPass5();
+                String pass4Array = furnancePressure.getPass7();
+                String pass5Array = furnancePressure.getPass9();
+                String pass6Array = furnancePressure.getPass11();
+                String pass7Array = furnancePressure.getPass13();
+                String pass8Array = furnancePressure.getPass15();
+                if (StringUtils.isNotEmpty(pass1Array)) {
+                    double in = Double.parseDouble(pass1Array.substring(pass1Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass1Array.substring(0, pass1Array.indexOf(",")));
+                    if (in > pass1Inlet) { pass1Inlet = in; }
+                    if (out > pass1Out) { pass1Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass2Array)) {
+                    double in = Double.parseDouble(pass2Array.substring(pass2Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass2Array.substring(0, pass2Array.indexOf(",")));
+                    if (in > pass2Inlet) { pass2Inlet = in; }
+                    if (out > pass2Out) { pass2Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass3Array)) {
+                    double in = Double.parseDouble(pass3Array.substring(pass3Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass3Array.substring(0, pass3Array.indexOf(",")));
+                    if (in > pass3Inlet) { pass3Inlet = in; }
+                    if (out > pass3Out) { pass3Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass4Array)) {
+                    double in = Double.parseDouble(pass4Array.substring(pass4Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass4Array.substring(0, pass4Array.indexOf(",")));
+                    if (in > pass4Inlet) { pass4Inlet = in; }
+                    if (out > pass4Out) { pass4Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass5Array)) {
+                    double in = Double.parseDouble(pass5Array.substring(pass5Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass5Array.substring(0, pass5Array.indexOf(",")));
+                    if (in > pass5Inlet) { pass5Inlet = in; }
+                    if (out > pass5Out) { pass5Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass6Array)) {
+                    double in = Double.parseDouble(pass6Array.substring(pass6Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass6Array.substring(0, pass6Array.indexOf(",")));
+                    if (in > pass6Inlet) { pass6Inlet = in; }
+                    if (out > pass6Out) { pass6Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass7Array)) {
+                    double in = Double.parseDouble(pass7Array.substring(pass7Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass7Array.substring(0, pass7Array.indexOf(",")));
+                    if (in > pass7Inlet) { pass7Inlet = in; }
+                    if (out > pass7Out) { pass7Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass8Array)) {
+                    double in = Double.parseDouble(pass8Array.substring(pass8Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass8Array.substring(0, pass8Array.indexOf(",")));
+                    if (in > pass8Inlet) { pass8Inlet = in; }
+                    if (out > pass8Out) { pass8Out = out; }
+                }
             }
             DecimalFormat df = new DecimalFormat("#.00");
             if (pass1Inlet != 0 && pass1Out != 0) { pass1Ratio = Double.parseDouble(df.format(pass1Out / pass1Inlet)); }
@@ -332,8 +375,8 @@ public class TFurnancePressureController extends BaseController
             return null;
         }
     }
-    private FurnancePressureFvpVO calcRatio109B(TFurnancePressure tFurnancePressure) {
-        if (tFurnancePressure != null) {
+    private FurnancePressureFvpVO calcRatio109B(List<TFurnancePressure> tFurnancePressure) {
+        if (tFurnancePressure != null && tFurnancePressure.size() != 0) {
             double pass1Inlet = 0;
             double pass2Inlet = 0;
             double pass3Inlet = 0;
@@ -358,48 +401,65 @@ public class TFurnancePressureController extends BaseController
             double pass6Ratio = 0;
             double pass7Ratio = 0;
             double pass8Ratio = 0;
-            double allPassMaxInlet = 0;
-            double allPassMaxOut = 0;
-            double allPassMaxRatio = 0;
-            String pass1Array = tFurnancePressure.getPass2();
-            String pass2Array = tFurnancePressure.getPass4();
-            String pass3Array = tFurnancePressure.getPass6();
-            String pass4Array = tFurnancePressure.getPass8();
-            String pass5Array = tFurnancePressure.getPass10();
-            String pass6Array = tFurnancePressure.getPass12();
-            String pass7Array = tFurnancePressure.getPass14();
-            String pass8Array = tFurnancePressure.getPass16();
-            if (StringUtils.isNotEmpty(pass1Array)) {
-                pass1Inlet = Double.parseDouble(pass1Array.substring(pass1Array.lastIndexOf(",")+1));
-                pass1Out = this.getMaxValue(pass1Array.substring(0, pass1Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass2Array)) {
-                pass2Inlet = Double.parseDouble(pass2Array.substring(pass2Array.lastIndexOf(",")+1));
-                pass2Out = this.getMaxValue(pass2Array.substring(0, pass2Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass3Array)) {
-                pass3Inlet = Double.parseDouble(pass3Array.substring(pass3Array.lastIndexOf(",")+1));
-                pass3Out = this.getMaxValue(pass3Array.substring(0, pass3Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass4Array)) {
-                pass4Inlet = Double.parseDouble(pass4Array.substring(pass4Array.lastIndexOf(",")+1));
-                pass4Out = this.getMaxValue(pass4Array.substring(0, pass4Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass5Array)) {
-                pass5Inlet = Double.parseDouble(pass5Array.substring(pass5Array.lastIndexOf(",")+1));
-                pass5Out = this.getMaxValue(pass5Array.substring(0, pass5Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass6Array)) {
-                pass6Inlet = Double.parseDouble(pass6Array.substring(pass6Array.lastIndexOf(",")+1));
-                pass6Out = this.getMaxValue(pass6Array.substring(0, pass6Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass7Array)) {
-                pass7Inlet = Double.parseDouble(pass7Array.substring(pass7Array.lastIndexOf(",")+1));
-                pass7Out = this.getMaxValue(pass7Array.substring(0, pass7Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass8Array)) {
-                pass8Inlet = Double.parseDouble(pass8Array.substring(pass8Array.lastIndexOf(",")+1));
-                pass8Out = this.getMaxValue(pass8Array.substring(0, pass8Array.indexOf(",")));
+            // 获取pass max值
+            // xxx,xxx,xxx,...->xxx
+            for (TFurnancePressure furnancePressure : tFurnancePressure) {
+                String pass1Array = furnancePressure.getPass2();
+                String pass2Array = furnancePressure.getPass4();
+                String pass3Array = furnancePressure.getPass6();
+                String pass4Array = furnancePressure.getPass8();
+                String pass5Array = furnancePressure.getPass10();
+                String pass6Array = furnancePressure.getPass12();
+                String pass7Array = furnancePressure.getPass14();
+                String pass8Array = furnancePressure.getPass16();
+                if (StringUtils.isNotEmpty(pass1Array)) {
+                    double in = Double.parseDouble(pass1Array.substring(pass1Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass1Array.substring(0, pass1Array.indexOf(",")));
+                    if (in > pass1Inlet) { pass1Inlet = in; }
+                    if (out > pass1Out) { pass1Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass2Array)) {
+                    double in = Double.parseDouble(pass2Array.substring(pass2Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass2Array.substring(0, pass2Array.indexOf(",")));
+                    if (in > pass2Inlet) { pass2Inlet = in; }
+                    if (out > pass2Out) { pass2Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass3Array)) {
+                    double in = Double.parseDouble(pass3Array.substring(pass3Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass3Array.substring(0, pass3Array.indexOf(",")));
+                    if (in > pass3Inlet) { pass3Inlet = in; }
+                    if (out > pass3Out) { pass3Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass4Array)) {
+                    double in = Double.parseDouble(pass4Array.substring(pass4Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass4Array.substring(0, pass4Array.indexOf(",")));
+                    if (in > pass4Inlet) { pass4Inlet = in; }
+                    if (out > pass4Out) { pass4Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass5Array)) {
+                    double in = Double.parseDouble(pass5Array.substring(pass5Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass5Array.substring(0, pass5Array.indexOf(",")));
+                    if (in > pass5Inlet) { pass5Inlet = in; }
+                    if (out > pass5Out) { pass5Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass6Array)) {
+                    double in = Double.parseDouble(pass6Array.substring(pass6Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass6Array.substring(0, pass6Array.indexOf(",")));
+                    if (in > pass6Inlet) { pass6Inlet = in; }
+                    if (out > pass6Out) { pass6Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass7Array)) {
+                    double in = Double.parseDouble(pass7Array.substring(pass7Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass7Array.substring(0, pass7Array.indexOf(",")));
+                    if (in > pass7Inlet) { pass7Inlet = in; }
+                    if (out > pass7Out) { pass7Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass8Array)) {
+                    double in = Double.parseDouble(pass8Array.substring(pass8Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass8Array.substring(0, pass8Array.indexOf(",")));
+                    if (in > pass8Inlet) { pass8Inlet = in; }
+                    if (out > pass8Out) { pass8Out = out; }
+                }
             }
             DecimalFormat df = new DecimalFormat("#.00");
             if (pass1Inlet != 0 && pass1Out != 0) { pass1Ratio = Double.parseDouble(df.format(pass1Out / pass1Inlet)); }
@@ -443,8 +503,8 @@ public class TFurnancePressureController extends BaseController
             return null;
         }
     }
-    private FurnancePressureFvpVO calcRatio130(TFurnancePressure tFurnancePressure) {
-        if (tFurnancePressure != null) {
+    private FurnancePressureFvpVO calcRatio130(List<TFurnancePressure> tFurnancePressure) {
+        if (tFurnancePressure != null && tFurnancePressure.size() != 0) {
             double pass1Inlet = 0;
             double pass2Inlet = 0;
             double pass3Inlet = 0;
@@ -457,28 +517,37 @@ public class TFurnancePressureController extends BaseController
             double pass2Ratio = 0;
             double pass3Ratio = 0;
             double pass4Ratio = 0;
-            double allPassMaxInlet = 0;
-            double allPassMaxOut = 0;
-            double allPassMaxRatio = 0;
-            String pass1Array = tFurnancePressure.getPass1();
-            String pass2Array = tFurnancePressure.getPass2();
-            String pass3Array = tFurnancePressure.getPass3();
-            String pass4Array = tFurnancePressure.getPass4();
-            if (StringUtils.isNotEmpty(pass1Array)) {
-                pass1Inlet = Double.parseDouble(pass1Array.substring(pass1Array.lastIndexOf(",")+1));
-                pass1Out = this.getMaxValue(pass1Array.substring(0, pass1Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass2Array)) {
-                pass2Inlet = Double.parseDouble(pass2Array.substring(pass2Array.lastIndexOf(",")+1));
-                pass2Out = this.getMaxValue(pass2Array.substring(0, pass2Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass3Array)) {
-                pass3Inlet = Double.parseDouble(pass3Array.substring(pass3Array.lastIndexOf(",")+1));
-                pass3Out = this.getMaxValue(pass3Array.substring(0, pass3Array.indexOf(",")));
-            }
-            if (StringUtils.isNotEmpty(pass4Array)) {
-                pass4Inlet = Double.parseDouble(pass4Array.substring(pass4Array.lastIndexOf(",")+1));
-                pass4Out = this.getMaxValue(pass4Array.substring(0, pass4Array.indexOf(",")));
+            // 获取pass max值
+            // xxx,xxx,xxx,...->xxx
+            for (TFurnancePressure furnancePressure : tFurnancePressure) {
+                String pass1Array = furnancePressure.getPass1();
+                String pass2Array = furnancePressure.getPass2();
+                String pass3Array = furnancePressure.getPass3();
+                String pass4Array = furnancePressure.getPass4();
+                if (StringUtils.isNotEmpty(pass1Array)) {
+                    double in = Double.parseDouble(pass1Array.substring(pass1Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass1Array.substring(0, pass1Array.indexOf(",")));
+                    if (in > pass1Inlet) { pass1Inlet = in; }
+                    if (out > pass1Out) { pass1Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass2Array)) {
+                    double in = Double.parseDouble(pass2Array.substring(pass2Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass2Array.substring(0, pass2Array.indexOf(",")));
+                    if (in > pass2Inlet) { pass2Inlet = in; }
+                    if (out > pass2Out) { pass2Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass3Array)) {
+                    double in = Double.parseDouble(pass3Array.substring(pass3Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass3Array.substring(0, pass3Array.indexOf(",")));
+                    if (in > pass3Inlet) { pass3Inlet = in; }
+                    if (out > pass3Out) { pass3Out = out; }
+                }
+                if (StringUtils.isNotEmpty(pass4Array)) {
+                    double in = Double.parseDouble(pass4Array.substring(pass4Array.lastIndexOf(",")+1));
+                    double out = this.getMaxValue(pass4Array.substring(0, pass4Array.indexOf(",")));
+                    if (in > pass4Inlet) { pass4Inlet = in; }
+                    if (out > pass4Out) { pass4Out = out; }
+                }
             }
             DecimalFormat df = new DecimalFormat("#.00");
             if (pass1Inlet != 0 && pass1Out != 0) { pass1Ratio = Double.parseDouble(df.format(pass1Out / pass1Inlet)); }

master/src/main/java/com/ruoyi/project/production/controller/vo/FurnancePressureVO.java

@@ -17,8 +17,8 @@ public class FurnancePressureVO extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "巡检日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @Excel(name = "巡检日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date recordTime;
 
     private String h109Out;

master/src/main/java/com/ruoyi/project/production/mapper/TFurnancePressureMapper.java

@@ -35,7 +35,7 @@ public interface TFurnancePressureMapper
      * @param tFurnancePressure 裂解炉炉管测压
      * @return 裂解炉炉管测压
      */
-    public TFurnancePressure selectTFurnancePressureByDate(TFurnancePressure tFurnancePressure);
+    public List<TFurnancePressure> selectTFurnancePressureByDate(TFurnancePressure tFurnancePressure);
 
     /**
      * 新增裂解炉炉管测压

master/src/main/java/com/ruoyi/project/production/service/ITFurnancePressureService.java

@@ -33,7 +33,7 @@ public interface ITFurnancePressureService
      * @param tFurnancePressure 裂解炉炉管测压
      * @return 裂解炉炉管测压
      */
-    public TFurnancePressure selectTFurnancePressureByDate(TFurnancePressure tFurnancePressure);
+    public List<TFurnancePressure> selectTFurnancePressureByDate(TFurnancePressure tFurnancePressure);
 
     /**
      * 新增裂解炉炉管测压

master/src/main/java/com/ruoyi/project/production/service/impl/TFurnancePressureServiceImpl.java

@@ -50,7 +50,7 @@ public class TFurnancePressureServiceImpl implements ITFurnancePressureService
      * @param tFurnancePressure 裂解炉炉管测压
      * @return 裂解炉炉管测压
      */
-    public TFurnancePressure selectTFurnancePressureByDate(TFurnancePressure tFurnancePressure) {
+    public List<TFurnancePressure> selectTFurnancePressureByDate(TFurnancePressure tFurnancePressure) {
         return tFurnancePressureMapper.selectTFurnancePressureByDate(tFurnancePressure);
     }
 

master/src/main/resources/mybatis/production/TFurnancePressureMapper.xml

@@ -81,9 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTFurnancePressureVo"/>
         <where>
             <if test="furnanceName != null  and furnanceName != ''"> and furnance_name = #{furnanceName}</if>
-            <if test="recordTime != null "> and record_time = #{recordTime}</if>
+            <if test="recordTime != null "> and trunc(record_time, 'dd') = #{recordTime}</if>
             and d.del_flag = 0
-            and rownum = 1
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}

ui/src/views/production/pressure/coil.vue

@@ -16,9 +16,9 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="pressureList" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column label="巡检日期" align="center" prop="recordTime" width="100">
+      <el-table-column label="巡检日期" align="center" prop="recordTime" width="150">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="H109 OUT" align="center" prop="h109Out" :show-overflow-tooltip="true">

ui/src/views/production/pressure/max.vue

@@ -16,9 +16,9 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="pressureList" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column label="巡检日期" align="center" prop="recordTime" width="100">
+      <el-table-column label="巡检日期" align="center" prop="recordTime" width="150">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="H109 OUT" align="center" prop="h109Out" :show-overflow-tooltip="true"></el-table-column>