Jelajahi Sumber

裂解炉测温测压

wangggziwen 1 tahun lalu
induk
melakukan
337972e3dd

+ 0 - 5
master/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -133,11 +133,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/safecheck/weekcheck/downloadWeekcheck").anonymous()
                 .antMatchers("/safecheck/weekcheck/downloadWeekcheckPdf").anonymous()
                 .antMatchers("/production/quality/export").anonymous()
-                .antMatchers("/production/temperature/info").anonymous()
-                .antMatchers("/production/temperature").anonymous()
-                .antMatchers("/production/pressure/info").anonymous()
-                .antMatchers("/production/pressure").anonymous()
-                .antMatchers("/production/pressure/scan").anonymous()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

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

@@ -88,7 +88,7 @@ public class TFurnancePressureController extends BaseController
         }
         return AjaxResult.success(resultMap);
     }
-    private LinkedHashMap<Date, Double> calcAnalysis(List<TFurnancePressure> tFurnancePressures, String pass) {
+    public LinkedHashMap<Date, Double> calcAnalysis(List<TFurnancePressure> tFurnancePressures, String pass) {
         LinkedHashMap<Date, Double> map = new LinkedHashMap<>();
         if (tFurnancePressures != null && tFurnancePressures.size() != 0) {
             // pass max inlet
@@ -205,7 +205,7 @@ public class TFurnancePressureController extends BaseController
         }
         return null;
     }
-    private LinkedHashMap<Date, Double> calcAnalysis109A(List<TFurnancePressure> tFurnancePressures, String pass) {
+    public LinkedHashMap<Date, Double> calcAnalysis109A(List<TFurnancePressure> tFurnancePressures, String pass) {
         LinkedHashMap<Date, Double> map = new LinkedHashMap<>();
         if (tFurnancePressures != null && tFurnancePressures.size() != 0) {
             // pass max inlet
@@ -322,7 +322,7 @@ public class TFurnancePressureController extends BaseController
         }
         return null;
     }
-    private LinkedHashMap<Date, Double> calcAnalysis109B(List<TFurnancePressure> tFurnancePressures, String pass) {
+    public LinkedHashMap<Date, Double> calcAnalysis109B(List<TFurnancePressure> tFurnancePressures, String pass) {
         LinkedHashMap<Date, Double> map = new LinkedHashMap<>();
         if (tFurnancePressures != null && tFurnancePressures.size() != 0) {
             // pass max inlet
@@ -439,7 +439,7 @@ public class TFurnancePressureController extends BaseController
         }
         return null;
     }
-    private LinkedHashMap<Date, Double> calcAnalysis130(List<TFurnancePressure> tFurnancePressures, String pass) {
+    public LinkedHashMap<Date, Double> calcAnalysis130(List<TFurnancePressure> tFurnancePressures, String pass) {
         LinkedHashMap<Date, Double> map = new LinkedHashMap<>();
         if (tFurnancePressures != null && tFurnancePressures.size() != 0) {
             // pass max inlet
@@ -552,7 +552,7 @@ public class TFurnancePressureController extends BaseController
             return AjaxResult.success(am);
         }
     }
-    private TFurnancePressure isComplete(TFurnancePressure tFurnancePressure) {
+    public TFurnancePressure isComplete(TFurnancePressure tFurnancePressure) {
         String furnanceName = tFurnancePressure.getFurnanceName();
         tFurnancePressure.setProgress(0L);
         tFurnancePressure.setPass1Complete(false);
@@ -592,7 +592,7 @@ public class TFurnancePressureController extends BaseController
         }
         return tFurnancePressure;
     }
-    private TFurnancePressure isComplete109(TFurnancePressure tFurnancePressure) {
+    public TFurnancePressure isComplete109(TFurnancePressure tFurnancePressure) {
         String pass1 = tFurnancePressure.getPass1();
         String pass2 = tFurnancePressure.getPass2();
         String pass3 = tFurnancePressure.getPass3();
@@ -725,7 +725,7 @@ public class TFurnancePressureController extends BaseController
         tFurnancePressure.setProgress(count * 1.00d / 16L);
         return tFurnancePressure;
     }
-    private TFurnancePressure isComplete11x(TFurnancePressure tFurnancePressure) {
+    public TFurnancePressure isComplete11x(TFurnancePressure tFurnancePressure) {
         String pass1 = tFurnancePressure.getPass1();
         String pass2 = tFurnancePressure.getPass2();
         String pass3 = tFurnancePressure.getPass3();
@@ -794,7 +794,7 @@ public class TFurnancePressureController extends BaseController
         tFurnancePressure.setProgress(count * 1.00d / 8L);
         return tFurnancePressure;
     }
-    private TFurnancePressure isComplete130(TFurnancePressure tFurnancePressure) {
+    public TFurnancePressure isComplete130(TFurnancePressure tFurnancePressure) {
         String pass1 = tFurnancePressure.getPass1();
         String pass2 = tFurnancePressure.getPass2();
         String pass3 = tFurnancePressure.getPass3();
@@ -909,7 +909,7 @@ public class TFurnancePressureController extends BaseController
             return AjaxResult.success(voList);
         }
     }
-    private FurnancePressureFvpVO calcRatio(List<TFurnancePressure> tFurnancePressure) {
+    public FurnancePressureFvpVO calcRatio(List<TFurnancePressure> tFurnancePressure) {
         if (tFurnancePressure != null && tFurnancePressure.size() != 0) {
             // pass max inlet
             double pass1Inlet = 0;
@@ -1040,7 +1040,7 @@ public class TFurnancePressureController extends BaseController
             return null;
         }
     }
-    private FurnancePressureFvpVO calcRatio109A(List<TFurnancePressure> tFurnancePressure) {
+    public FurnancePressureFvpVO calcRatio109A(List<TFurnancePressure> tFurnancePressure) {
         if (tFurnancePressure != null && tFurnancePressure.size() != 0) {
             double pass1Inlet = 0;
             double pass2Inlet = 0;
@@ -1168,7 +1168,7 @@ public class TFurnancePressureController extends BaseController
             return null;
         }
     }
-    private FurnancePressureFvpVO calcRatio109B(List<TFurnancePressure> tFurnancePressure) {
+    public FurnancePressureFvpVO calcRatio109B(List<TFurnancePressure> tFurnancePressure) {
         if (tFurnancePressure != null && tFurnancePressure.size() != 0) {
             double pass1Inlet = 0;
             double pass2Inlet = 0;
@@ -1296,7 +1296,7 @@ public class TFurnancePressureController extends BaseController
             return null;
         }
     }
-    private FurnancePressureFvpVO calcRatio130(List<TFurnancePressure> tFurnancePressure) {
+    public FurnancePressureFvpVO calcRatio130(List<TFurnancePressure> tFurnancePressure) {
         if (tFurnancePressure != null && tFurnancePressure.size() != 0) {
             double pass1Inlet = 0;
             double pass2Inlet = 0;
@@ -1368,7 +1368,7 @@ public class TFurnancePressureController extends BaseController
             return null;
         }
     }
-    private double getMaxDouble(double[] list) {
+    public double getMaxDouble(double[] list) {
         double max = list[0];
         for (int i = 1; i < list.length; i++) {
             if (list[i] > max) {
@@ -2128,7 +2128,7 @@ public class TFurnancePressureController extends BaseController
         }
         return AjaxResult.success(coilList);
     }
-    private int getMaxValue(String value) {
+    public int getMaxValue(String value) {
         if (StringUtils.isNotNull(value) && StringUtils.isNotEmpty(value)) {
             String[] split = value.split(",");
             int max = Integer.parseInt(split[0]);
@@ -2243,7 +2243,7 @@ public class TFurnancePressureController extends BaseController
         int result = tFurnancePressureService.updateTFurnancePressure(tFurnancePressure);
         return AjaxResult.success(result+"", tFurnancePressure);
     }
-    private void checkRatio(FurnancePressureFvpVO vo, TFurnancePressure pressure) {
+    public void checkRatio(FurnancePressureFvpVO vo, TFurnancePressure pressure) {
         double pass1Ratio = vo.getPass1Ratio();
         double pass2Ratio = vo.getPass2Ratio();
         double pass3Ratio = vo.getPass3Ratio();

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

@@ -65,7 +65,7 @@ public class TFurnanceTemperatureController extends BaseController
         this.isComplete(temperature);
         return AjaxResult.success(temperature);
     }
-    private TFurnanceTemperature isComplete(TFurnanceTemperature tFurnanceTemperature) {
+    public TFurnanceTemperature isComplete(TFurnanceTemperature tFurnanceTemperature) {
         String furnanceName = tFurnanceTemperature.getFurnanceName();
         tFurnanceTemperature.setProgress(0L);
         tFurnanceTemperature.setPass1Complete(false);
@@ -105,7 +105,7 @@ public class TFurnanceTemperatureController extends BaseController
         }
         return tFurnanceTemperature;
     }
-    private TFurnanceTemperature isComplete109(TFurnanceTemperature tFurnanceTemperature) {
+    public TFurnanceTemperature isComplete109(TFurnanceTemperature tFurnanceTemperature) {
         String pass1 = tFurnanceTemperature.getPass1();
         String pass2 = tFurnanceTemperature.getPass2();
         String pass3 = tFurnanceTemperature.getPass3();
@@ -238,7 +238,7 @@ public class TFurnanceTemperatureController extends BaseController
         tFurnanceTemperature.setProgress(count * 1.00d / 16L);
         return tFurnanceTemperature;
     }
-    private TFurnanceTemperature isComplete11x(TFurnanceTemperature tFurnanceTemperature) {
+    public TFurnanceTemperature isComplete11x(TFurnanceTemperature tFurnanceTemperature) {
         String pass1 = tFurnanceTemperature.getPass1();
         String pass2 = tFurnanceTemperature.getPass2();
         String pass3 = tFurnanceTemperature.getPass3();
@@ -307,7 +307,7 @@ public class TFurnanceTemperatureController extends BaseController
         tFurnanceTemperature.setProgress(count * 1.00d / 8L);
         return tFurnanceTemperature;
     }
-    private TFurnanceTemperature isComplete130(TFurnanceTemperature tFurnanceTemperature) {
+    public TFurnanceTemperature isComplete130(TFurnanceTemperature tFurnanceTemperature) {
         String pass1 = tFurnanceTemperature.getPass1();
         String pass2 = tFurnanceTemperature.getPass2();
         String pass3 = tFurnanceTemperature.getPass3();
@@ -1159,7 +1159,7 @@ public class TFurnanceTemperatureController extends BaseController
         }
         return AjaxResult.success(coilList);
     }
-    private int getMaxValue(String value) {
+    public int getMaxValue(String value) {
         if (StringUtils.isNotNull(value) && StringUtils.isNotEmpty(value)) {
             String[] split = value.split(",");
             int max = Integer.parseInt(split[0]);