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