|
@@ -9,7 +9,6 @@ import java.util.List;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
import com.ruoyi.project.production.controller.vo.FurnanceSummaryVO;
|
|
import com.ruoyi.project.production.controller.vo.FurnanceSummaryVO;
|
|
import com.ruoyi.project.production.controller.vo.FurnanceTemperatureVO;
|
|
import com.ruoyi.project.production.controller.vo.FurnanceTemperatureVO;
|
|
-import com.ruoyi.project.production.domain.TFurnancePressure;
|
|
|
|
import com.ruoyi.project.production.domain.TFurnanceTemperature;
|
|
import com.ruoyi.project.production.domain.TFurnanceTemperature;
|
|
import com.ruoyi.project.production.service.ITFurnancePressureService;
|
|
import com.ruoyi.project.production.service.ITFurnancePressureService;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
@@ -672,329 +671,254 @@ public class TFurnanceTemperatureController extends BaseController
|
|
TFurnanceTemperature ft = list109.get(i);
|
|
TFurnanceTemperature ft = list109.get(i);
|
|
FurnanceTemperatureVO coil = new FurnanceTemperatureVO();
|
|
FurnanceTemperatureVO coil = new FurnanceTemperatureVO();
|
|
coil.setRecordTime(ft.getRecordTime());
|
|
coil.setRecordTime(ft.getRecordTime());
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- String pass9 = ft.getPass9();
|
|
|
|
- String pass10 = ft.getPass10();
|
|
|
|
- String pass11 = ft.getPass11();
|
|
|
|
- String pass12 = ft.getPass12();
|
|
|
|
- String pass13 = ft.getPass13();
|
|
|
|
- String pass14 = ft.getPass14();
|
|
|
|
- String pass15 = ft.getPass15();
|
|
|
|
- String pass16 = ft.getPass16();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)
|
|
|
|
- || "".equals(pass9) || StringUtils.isNull(pass9)
|
|
|
|
- || "".equals(pass10) || StringUtils.isNull(pass10)
|
|
|
|
- || "".equals(pass11) || StringUtils.isNull(pass11)
|
|
|
|
- || "".equals(pass12) || StringUtils.isNull(pass12)
|
|
|
|
- || "".equals(pass13) || StringUtils.isNull(pass13)
|
|
|
|
- || "".equals(pass14) || StringUtils.isNull(pass14)
|
|
|
|
- || "".equals(pass15) || StringUtils.isNull(pass15)
|
|
|
|
- || "".equals(pass16) || StringUtils.isNull(pass16)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ String pass9 = this.checkNull(ft.getPass9());
|
|
|
|
+ String pass10 = this.checkNull(ft.getPass10());
|
|
|
|
+ String pass11 = this.checkNull(ft.getPass11());
|
|
|
|
+ String pass12 = this.checkNull(ft.getPass12());
|
|
|
|
+ String pass13 = this.checkNull(ft.getPass13());
|
|
|
|
+ String pass14 = this.checkNull(ft.getPass14());
|
|
|
|
+ String pass15 = this.checkNull(ft.getPass15());
|
|
|
|
+ String pass16 = this.checkNull(ft.getPass16());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)
|
|
|
|
+ || "".equals(pass9) || "".equals(pass10) || "".equals(pass11) || "".equals(pass12)
|
|
|
|
+ || "".equals(pass13) || "".equals(pass14) || "".equals(pass15) || "".equals(pass16)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coil.setH109Out(this.getMaxValue(ft.getPass1() + "," + ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3() + "," + ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5() + "," + ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7() + "," + ft.getPass8()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass9() + "," + ft.getPass10()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass11() + "," + ft.getPass12()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass13() + "," + ft.getPass14()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass15() + "," + ft.getPass16()));
|
|
|
|
|
|
+ coil.setH109Out(this.getMaxValue(pass1 + "," + pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3 + "," + pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5 + "," + pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7 + "," + pass8) + ","
|
|
|
|
+ + this.getMaxValue(pass9 + "," + pass10) + ","
|
|
|
|
+ + this.getMaxValue(pass11 + "," + pass12) + ","
|
|
|
|
+ + this.getMaxValue(pass13 + "," + pass14) + ","
|
|
|
|
+ + this.getMaxValue(pass15 + "," + pass16));
|
|
coilList.add(coil);
|
|
coilList.add(coil);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list110.size() != 0) {
|
|
if (list110.size() != 0) {
|
|
for (int i = 0; i < list110.size(); i++) {
|
|
for (int i = 0; i < list110.size(); i++) {
|
|
TFurnanceTemperature ft = list110.get(i);
|
|
TFurnanceTemperature ft = list110.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH110Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH110Out(this.getMaxValue(pass1 + "," + pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3 + "," + pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5 + "," + pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7 + "," + pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list111.size() != 0) {
|
|
if (list111.size() != 0) {
|
|
for (int i = 0; i < list111.size(); i++) {
|
|
for (int i = 0; i < list111.size(); i++) {
|
|
TFurnanceTemperature ft = list111.get(i);
|
|
TFurnanceTemperature ft = list111.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH111Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH111Out(this.getMaxValue(pass1 + "," + pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3 + "," + pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5 + "," + pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7 + "," + pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list112.size() != 0) {
|
|
if (list112.size() != 0) {
|
|
for (int i = 0; i < list112.size(); i++) {
|
|
for (int i = 0; i < list112.size(); i++) {
|
|
TFurnanceTemperature ft = list112.get(i);
|
|
TFurnanceTemperature ft = list112.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH112Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH112Out(this.getMaxValue(pass1 + "," + pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3 + "," + pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5 + "," + pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7 + "," + pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list113.size() != 0) {
|
|
if (list113.size() != 0) {
|
|
for (int i = 0; i < list113.size(); i++) {
|
|
for (int i = 0; i < list113.size(); i++) {
|
|
TFurnanceTemperature ft = list113.get(i);
|
|
TFurnanceTemperature ft = list113.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH113Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH113Out(this.getMaxValue(pass1 + "," + pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3 + "," + pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5 + "," + pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7 + "," + pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list114.size() != 0) {
|
|
if (list114.size() != 0) {
|
|
for (int i = 0; i < list114.size(); i++) {
|
|
for (int i = 0; i < list114.size(); i++) {
|
|
TFurnanceTemperature ft = list114.get(i);
|
|
TFurnanceTemperature ft = list114.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH114Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH114Out(this.getMaxValue(pass1 + "," + pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3 + "," + pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5 + "," + pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7 + "," + pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list115.size() != 0) {
|
|
if (list115.size() != 0) {
|
|
for (int i = 0; i < list115.size(); i++) {
|
|
for (int i = 0; i < list115.size(); i++) {
|
|
TFurnanceTemperature ft = list115.get(i);
|
|
TFurnanceTemperature ft = list115.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH115Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH115Out(this.getMaxValue(pass1 + "," + pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3 + "," + pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5 + "," + pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7 + "," + pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list116.size() != 0) {
|
|
if (list116.size() != 0) {
|
|
for (int i = 0; i < list116.size(); i++) {
|
|
for (int i = 0; i < list116.size(); i++) {
|
|
TFurnanceTemperature ft = list116.get(i);
|
|
TFurnanceTemperature ft = list116.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH116Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH116Out(this.getMaxValue(pass1 + "," + pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3 + "," + pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5 + "," + pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7 + "," + pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list117.size() != 0) {
|
|
if (list117.size() != 0) {
|
|
for (int i = 0; i < list117.size(); i++) {
|
|
for (int i = 0; i < list117.size(); i++) {
|
|
TFurnanceTemperature ft = list117.get(i);
|
|
TFurnanceTemperature ft = list117.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH117Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH117Out(this.getMaxValue(pass1 + "," + pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3 + "," + pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5 + "," + pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7 + "," + pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list118.size() != 0) {
|
|
if (list118.size() != 0) {
|
|
for (int i = 0; i < list118.size(); i++) {
|
|
for (int i = 0; i < list118.size(); i++) {
|
|
TFurnanceTemperature ft = list118.get(i);
|
|
TFurnanceTemperature ft = list118.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH118Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH118Out(this.getMaxValue(pass1 + "," + pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3 + "," + pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5 + "," + pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7 + "," + pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list130.size() != 0) {
|
|
if (list130.size() != 0) {
|
|
for (int i = 0; i < list130.size(); i++) {
|
|
for (int i = 0; i < list130.size(); i++) {
|
|
TFurnanceTemperature ft = list130.get(i);
|
|
TFurnanceTemperature ft = list130.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- String pass9 = ft.getPass9();
|
|
|
|
- String pass10 = ft.getPass10();
|
|
|
|
- String pass11 = ft.getPass11();
|
|
|
|
- String pass12 = ft.getPass12();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)
|
|
|
|
- || "".equals(pass9) || StringUtils.isNull(pass9)
|
|
|
|
- || "".equals(pass10) || StringUtils.isNull(pass10)
|
|
|
|
- || "".equals(pass11) || StringUtils.isNull(pass11)
|
|
|
|
- || "".equals(pass12) || StringUtils.isNull(pass12)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ String pass9 = this.checkNull(ft.getPass9());
|
|
|
|
+ String pass10 = this.checkNull(ft.getPass10());
|
|
|
|
+ String pass11 = this.checkNull(ft.getPass11());
|
|
|
|
+ String pass12 = this.checkNull(ft.getPass12());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)
|
|
|
|
+ || "".equals(pass9) || "".equals(pass10) || "".equals(pass11) || "".equals(pass12)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH130Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass9()) + "," + this.getMaxValue(ft.getPass10()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass11()) + "," + this.getMaxValue(ft.getPass12()));
|
|
|
|
|
|
+ coilList.get(i).setH130Out(this.getMaxValue(pass1 + "," + pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3 + "," + pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5 + "," + pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7 + "," + pass8) + ","
|
|
|
|
+ + this.getMaxValue(pass9) + "," + this.getMaxValue(pass10) + ","
|
|
|
|
+ + this.getMaxValue(pass11) + "," + this.getMaxValue(pass12));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
for (FurnanceTemperatureVO vo : coilList) {
|
|
for (FurnanceTemperatureVO vo : coilList) {
|
|
@@ -1013,6 +937,14 @@ public class TFurnanceTemperatureController extends BaseController
|
|
return AjaxResult.success(coilList);
|
|
return AjaxResult.success(coilList);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public String checkNull(String pass) {
|
|
|
|
+ if (StringUtils.isNull(pass)) {
|
|
|
|
+ return "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0";
|
|
|
|
+ } else {
|
|
|
|
+ return pass;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 查询裂解炉炉管测温COIL
|
|
* 查询裂解炉炉管测温COIL
|
|
*/
|
|
*/
|
|
@@ -1055,329 +987,254 @@ public class TFurnanceTemperatureController extends BaseController
|
|
TFurnanceTemperature ft = list109.get(i);
|
|
TFurnanceTemperature ft = list109.get(i);
|
|
FurnanceTemperatureVO coil = new FurnanceTemperatureVO();
|
|
FurnanceTemperatureVO coil = new FurnanceTemperatureVO();
|
|
coil.setRecordTime(ft.getRecordTime());
|
|
coil.setRecordTime(ft.getRecordTime());
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- String pass9 = ft.getPass9();
|
|
|
|
- String pass10 = ft.getPass10();
|
|
|
|
- String pass11 = ft.getPass11();
|
|
|
|
- String pass12 = ft.getPass12();
|
|
|
|
- String pass13 = ft.getPass13();
|
|
|
|
- String pass14 = ft.getPass14();
|
|
|
|
- String pass15 = ft.getPass15();
|
|
|
|
- String pass16 = ft.getPass16();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)
|
|
|
|
- || "".equals(pass9) || StringUtils.isNull(pass9)
|
|
|
|
- || "".equals(pass10) || StringUtils.isNull(pass10)
|
|
|
|
- || "".equals(pass11) || StringUtils.isNull(pass11)
|
|
|
|
- || "".equals(pass12) || StringUtils.isNull(pass12)
|
|
|
|
- || "".equals(pass13) || StringUtils.isNull(pass13)
|
|
|
|
- || "".equals(pass14) || StringUtils.isNull(pass14)
|
|
|
|
- || "".equals(pass15) || StringUtils.isNull(pass15)
|
|
|
|
- || "".equals(pass16) || StringUtils.isNull(pass16)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ String pass9 = this.checkNull(ft.getPass9());
|
|
|
|
+ String pass10 = this.checkNull(ft.getPass10());
|
|
|
|
+ String pass11 = this.checkNull(ft.getPass11());
|
|
|
|
+ String pass12 = this.checkNull(ft.getPass12());
|
|
|
|
+ String pass13 = this.checkNull(ft.getPass13());
|
|
|
|
+ String pass14 = this.checkNull(ft.getPass14());
|
|
|
|
+ String pass15 = this.checkNull(ft.getPass15());
|
|
|
|
+ String pass16 = this.checkNull(ft.getPass16());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)
|
|
|
|
+ || "".equals(pass9) || "".equals(pass10) || "".equals(pass11) || "".equals(pass12)
|
|
|
|
+ || "".equals(pass13) || "".equals(pass14) || "".equals(pass15) || "".equals(pass16)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coil.setH109Out(this.getMaxValue(ft.getPass1() + "," + ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3() + "," + ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5() + "," + ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7() + "," + ft.getPass8()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass9() + "," + ft.getPass10()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass11() + "," + ft.getPass12()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass13() + "," + ft.getPass14()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass15() + "," + ft.getPass16()));
|
|
|
|
|
|
+ coil.setH109Out(this.getMaxValue(pass1 + "," + pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3 + "," + pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5 + "," + pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7 + "," + pass8) + ","
|
|
|
|
+ + this.getMaxValue(pass9 + "," + pass10) + ","
|
|
|
|
+ + this.getMaxValue(pass11 + "," + pass12) + ","
|
|
|
|
+ + this.getMaxValue(pass13 + "," + pass14) + ","
|
|
|
|
+ + this.getMaxValue(pass15 + "," + pass16));
|
|
coilList.add(coil);
|
|
coilList.add(coil);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list110.size() != 0) {
|
|
if (list110.size() != 0) {
|
|
for (int i = 0; i < list110.size(); i++) {
|
|
for (int i = 0; i < list110.size(); i++) {
|
|
TFurnanceTemperature ft = list110.get(i);
|
|
TFurnanceTemperature ft = list110.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH110Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH110Out(this.getMaxValue(pass1) + "," + this.getMaxValue(pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3) + "," + this.getMaxValue(pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5) + "," + this.getMaxValue(pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7) + "," + this.getMaxValue(pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list111.size() != 0) {
|
|
if (list111.size() != 0) {
|
|
for (int i = 0; i < list111.size(); i++) {
|
|
for (int i = 0; i < list111.size(); i++) {
|
|
TFurnanceTemperature ft = list111.get(i);
|
|
TFurnanceTemperature ft = list111.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH111Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH111Out(this.getMaxValue(pass1) + "," + this.getMaxValue(pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3) + "," + this.getMaxValue(pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5) + "," + this.getMaxValue(pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7) + "," + this.getMaxValue(pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list112.size() != 0) {
|
|
if (list112.size() != 0) {
|
|
for (int i = 0; i < list112.size(); i++) {
|
|
for (int i = 0; i < list112.size(); i++) {
|
|
TFurnanceTemperature ft = list112.get(i);
|
|
TFurnanceTemperature ft = list112.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH112Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH112Out(this.getMaxValue(pass1) + "," + this.getMaxValue(pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3) + "," + this.getMaxValue(pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5) + "," + this.getMaxValue(pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7) + "," + this.getMaxValue(pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list113.size() != 0) {
|
|
if (list113.size() != 0) {
|
|
for (int i = 0; i < list113.size(); i++) {
|
|
for (int i = 0; i < list113.size(); i++) {
|
|
TFurnanceTemperature ft = list113.get(i);
|
|
TFurnanceTemperature ft = list113.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH113Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH113Out(this.getMaxValue(pass1) + "," + this.getMaxValue(pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3) + "," + this.getMaxValue(pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5) + "," + this.getMaxValue(pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7) + "," + this.getMaxValue(pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list114.size() != 0) {
|
|
if (list114.size() != 0) {
|
|
for (int i = 0; i < list114.size(); i++) {
|
|
for (int i = 0; i < list114.size(); i++) {
|
|
TFurnanceTemperature ft = list114.get(i);
|
|
TFurnanceTemperature ft = list114.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH114Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH114Out(this.getMaxValue(pass1) + "," + this.getMaxValue(pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3) + "," + this.getMaxValue(pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5) + "," + this.getMaxValue(pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7) + "," + this.getMaxValue(pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list115.size() != 0) {
|
|
if (list115.size() != 0) {
|
|
for (int i = 0; i < list115.size(); i++) {
|
|
for (int i = 0; i < list115.size(); i++) {
|
|
TFurnanceTemperature ft = list115.get(i);
|
|
TFurnanceTemperature ft = list115.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH115Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH115Out(this.getMaxValue(pass1) + "," + this.getMaxValue(pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3) + "," + this.getMaxValue(pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5) + "," + this.getMaxValue(pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7) + "," + this.getMaxValue(pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list116.size() != 0) {
|
|
if (list116.size() != 0) {
|
|
for (int i = 0; i < list116.size(); i++) {
|
|
for (int i = 0; i < list116.size(); i++) {
|
|
TFurnanceTemperature ft = list116.get(i);
|
|
TFurnanceTemperature ft = list116.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH116Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH116Out(this.getMaxValue(pass1) + "," + this.getMaxValue(pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3) + "," + this.getMaxValue(pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5) + "," + this.getMaxValue(pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7) + "," + this.getMaxValue(pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list117.size() != 0) {
|
|
if (list117.size() != 0) {
|
|
for (int i = 0; i < list117.size(); i++) {
|
|
for (int i = 0; i < list117.size(); i++) {
|
|
TFurnanceTemperature ft = list117.get(i);
|
|
TFurnanceTemperature ft = list117.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH117Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH117Out(this.getMaxValue(pass1) + "," + this.getMaxValue(pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3) + "," + this.getMaxValue(pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5) + "," + this.getMaxValue(pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7) + "," + this.getMaxValue(pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list118.size() != 0) {
|
|
if (list118.size() != 0) {
|
|
for (int i = 0; i < list118.size(); i++) {
|
|
for (int i = 0; i < list118.size(); i++) {
|
|
TFurnanceTemperature ft = list118.get(i);
|
|
TFurnanceTemperature ft = list118.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH118Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()));
|
|
|
|
|
|
+ coilList.get(i).setH118Out(this.getMaxValue(pass1) + "," + this.getMaxValue(pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3) + "," + this.getMaxValue(pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5) + "," + this.getMaxValue(pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7) + "," + this.getMaxValue(pass8));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (list130.size() != 0) {
|
|
if (list130.size() != 0) {
|
|
for (int i = 0; i < list130.size(); i++) {
|
|
for (int i = 0; i < list130.size(); i++) {
|
|
TFurnanceTemperature ft = list130.get(i);
|
|
TFurnanceTemperature ft = list130.get(i);
|
|
- String pass1 = ft.getPass1();
|
|
|
|
- String pass2 = ft.getPass2();
|
|
|
|
- String pass3 = ft.getPass3();
|
|
|
|
- String pass4 = ft.getPass4();
|
|
|
|
- String pass5 = ft.getPass5();
|
|
|
|
- String pass6 = ft.getPass6();
|
|
|
|
- String pass7 = ft.getPass7();
|
|
|
|
- String pass8 = ft.getPass8();
|
|
|
|
- String pass9 = ft.getPass9();
|
|
|
|
- String pass10 = ft.getPass10();
|
|
|
|
- String pass11 = ft.getPass11();
|
|
|
|
- String pass12 = ft.getPass12();
|
|
|
|
- if ("".equals(pass1) || StringUtils.isNull(pass1)
|
|
|
|
- || "".equals(pass2) || StringUtils.isNull(pass2)
|
|
|
|
- || "".equals(pass3) || StringUtils.isNull(pass3)
|
|
|
|
- || "".equals(pass4) || StringUtils.isNull(pass4)
|
|
|
|
- || "".equals(pass5) || StringUtils.isNull(pass5)
|
|
|
|
- || "".equals(pass6) || StringUtils.isNull(pass6)
|
|
|
|
- || "".equals(pass7) || StringUtils.isNull(pass7)
|
|
|
|
- || "".equals(pass8) || StringUtils.isNull(pass8)
|
|
|
|
- || "".equals(pass9) || StringUtils.isNull(pass9)
|
|
|
|
- || "".equals(pass10) || StringUtils.isNull(pass10)
|
|
|
|
- || "".equals(pass11) || StringUtils.isNull(pass11)
|
|
|
|
- || "".equals(pass12) || StringUtils.isNull(pass12)) {
|
|
|
|
|
|
+ String pass1 = this.checkNull(ft.getPass1());
|
|
|
|
+ String pass2 = this.checkNull(ft.getPass2());
|
|
|
|
+ String pass3 = this.checkNull(ft.getPass3());
|
|
|
|
+ String pass4 = this.checkNull(ft.getPass4());
|
|
|
|
+ String pass5 = this.checkNull(ft.getPass5());
|
|
|
|
+ String pass6 = this.checkNull(ft.getPass6());
|
|
|
|
+ String pass7 = this.checkNull(ft.getPass7());
|
|
|
|
+ String pass8 = this.checkNull(ft.getPass8());
|
|
|
|
+ String pass9 = this.checkNull(ft.getPass9());
|
|
|
|
+ String pass10 = this.checkNull(ft.getPass10());
|
|
|
|
+ String pass11 = this.checkNull(ft.getPass11());
|
|
|
|
+ String pass12 = this.checkNull(ft.getPass12());
|
|
|
|
+ if ("".equals(pass1) || "".equals(pass2) || "".equals(pass3) || "".equals(pass4)
|
|
|
|
+ || "".equals(pass5) || "".equals(pass6) || "".equals(pass7) || "".equals(pass8)
|
|
|
|
+ || "".equals(pass9) || "".equals(pass10) || "".equals(pass11) || "".equals(pass12)) {
|
|
return AjaxResult.success("incompleteData");
|
|
return AjaxResult.success("incompleteData");
|
|
}
|
|
}
|
|
- coilList.get(i).setH130Out(this.getMaxValue(ft.getPass1()) + "," + this.getMaxValue(ft.getPass2()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass3()) + "," + this.getMaxValue(ft.getPass4()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass5()) + "," + this.getMaxValue(ft.getPass6()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass7()) + "," + this.getMaxValue(ft.getPass8()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass9()) + "," + this.getMaxValue(ft.getPass10()) + ","
|
|
|
|
- + this.getMaxValue(ft.getPass11()) + "," + this.getMaxValue(ft.getPass12()));
|
|
|
|
|
|
+ coilList.get(i).setH130Out(this.getMaxValue(pass1) + "," + this.getMaxValue(pass2) + ","
|
|
|
|
+ + this.getMaxValue(pass3) + "," + this.getMaxValue(pass4) + ","
|
|
|
|
+ + this.getMaxValue(pass5) + "," + this.getMaxValue(pass6) + ","
|
|
|
|
+ + this.getMaxValue(pass7) + "," + this.getMaxValue(pass8) + ","
|
|
|
|
+ + this.getMaxValue(pass9) + "," + this.getMaxValue(pass10) + ","
|
|
|
|
+ + this.getMaxValue(pass11) + "," + this.getMaxValue(pass12));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return AjaxResult.success(coilList);
|
|
return AjaxResult.success(coilList);
|