Merge remote-tracking branch 'origin/master'

master/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -133,6 +133,11 @@ 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()

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

@@ -514,7 +514,8 @@ public class TFurnancePressureController extends BaseController
     @PostMapping("/info")
     public AjaxResult getPressureInfo(@RequestBody TFurnancePressure tFurnancePressure) throws ParseException {
         String furnanceName = tFurnancePressure.getFurnanceName();
-        Date recordTime = tFurnancePressure.getRecordTime();
+//        Date recordTime = tFurnancePressure.getRecordTime();
+        Date recordTime = new Date();
         if ("".equals(furnanceName) || recordTime == null) {
             return AjaxResult.success();
         }
@@ -1136,6 +1137,40 @@ public class TFurnancePressureController extends BaseController
                 TFurnancePressure ft = list109.get(i);
                 FurnancePressureVO coil = new FurnancePressureVO();
                 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)) {
+                    return AjaxResult.success("incompleteData");
+                }
                 coil.setH109Out(this.getMaxValue(ft.getPass1() + "," + ft.getPass2()) + ","
                         + this.getMaxValue(ft.getPass3() + "," + ft.getPass4()) + ","
                         + this.getMaxValue(ft.getPass5() + "," + ft.getPass6()) + ","
@@ -1150,6 +1185,24 @@ public class TFurnancePressureController extends BaseController
         if (list110.size() != 0) {
             for (int i = 0; i < list110.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1159,6 +1212,24 @@ public class TFurnancePressureController extends BaseController
         if (list111.size() != 0) {
             for (int i = 0; i < list111.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1168,6 +1239,24 @@ public class TFurnancePressureController extends BaseController
         if (list112.size() != 0) {
             for (int i = 0; i < list112.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1177,6 +1266,24 @@ public class TFurnancePressureController extends BaseController
         if (list113.size() != 0) {
             for (int i = 0; i < list113.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1186,6 +1293,24 @@ public class TFurnancePressureController extends BaseController
         if (list114.size() != 0) {
             for (int i = 0; i < list114.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1195,6 +1320,24 @@ public class TFurnancePressureController extends BaseController
         if (list115.size() != 0) {
             for (int i = 0; i < list115.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1204,6 +1347,24 @@ public class TFurnancePressureController extends BaseController
         if (list116.size() != 0) {
             for (int i = 0; i < list116.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1213,6 +1374,24 @@ public class TFurnancePressureController extends BaseController
         if (list117.size() != 0) {
             for (int i = 0; i < list117.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1222,6 +1401,24 @@ public class TFurnancePressureController extends BaseController
         if (list118.size() != 0) {
             for (int i = 0; i < list118.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1231,6 +1428,32 @@ public class TFurnancePressureController extends BaseController
         if (list130.size() != 0) {
             for (int i = 0; i < list130.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1296,6 +1519,40 @@ public class TFurnancePressureController extends BaseController
                 TFurnancePressure ft = list109.get(i);
                 FurnancePressureVO coil = new FurnancePressureVO();
                 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)) {
+                    return AjaxResult.success("incompleteData");
+                }
                 coil.setH109Out(this.getMaxValue(ft.getPass1() + "," + ft.getPass2()) + ","
                         + this.getMaxValue(ft.getPass3() + "," + ft.getPass4()) + ","
                         + this.getMaxValue(ft.getPass5() + "," + ft.getPass6()) + ","
@@ -1310,6 +1567,24 @@ public class TFurnancePressureController extends BaseController
         if (list110.size() != 0) {
             for (int i = 0; i < list110.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1319,6 +1594,24 @@ public class TFurnancePressureController extends BaseController
         if (list111.size() != 0) {
             for (int i = 0; i < list111.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1328,6 +1621,24 @@ public class TFurnancePressureController extends BaseController
         if (list112.size() != 0) {
             for (int i = 0; i < list112.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1337,6 +1648,24 @@ public class TFurnancePressureController extends BaseController
         if (list113.size() != 0) {
             for (int i = 0; i < list113.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1346,6 +1675,24 @@ public class TFurnancePressureController extends BaseController
         if (list114.size() != 0) {
             for (int i = 0; i < list114.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1355,6 +1702,24 @@ public class TFurnancePressureController extends BaseController
         if (list115.size() != 0) {
             for (int i = 0; i < list115.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1364,6 +1729,24 @@ public class TFurnancePressureController extends BaseController
         if (list116.size() != 0) {
             for (int i = 0; i < list116.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1373,6 +1756,24 @@ public class TFurnancePressureController extends BaseController
         if (list117.size() != 0) {
             for (int i = 0; i < list117.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1382,6 +1783,24 @@ public class TFurnancePressureController extends BaseController
         if (list118.size() != 0) {
             for (int i = 0; i < list118.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","
@@ -1391,6 +1810,32 @@ public class TFurnancePressureController extends BaseController
         if (list130.size() != 0) {
             for (int i = 0; i < list130.size(); i++) {
                 TFurnancePressure 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)) {
+                    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()) + ","

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

@@ -46,7 +46,8 @@ public class TFurnanceTemperatureController extends BaseController
     @PostMapping("/info")
     public AjaxResult getTemperatureInfo(@RequestBody TFurnanceTemperature tFurnanceTemperature) throws ParseException {
         String furnanceName = tFurnanceTemperature.getFurnanceName();
-        Date recordTime = tFurnanceTemperature.getRecordTime();
+//        Date recordTime = tFurnanceTemperature.getRecordTime();
+        Date recordTime = new Date();
         if ("".equals(furnanceName) || recordTime == null) {
             return AjaxResult.success();
         }
@@ -106,6 +107,40 @@ public class TFurnanceTemperatureController extends BaseController
                 TFurnanceTemperature ft = list109.get(i);
                 FurnanceTemperatureVO coil = new FurnanceTemperatureVO();
                 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)) {
+                    return AjaxResult.success("incompleteData");
+                }
                 coil.setH109Out(this.getMaxValue(ft.getPass1() + "," + ft.getPass2()) + ","
                         + this.getMaxValue(ft.getPass3() + "," + ft.getPass4()) + ","
                         + this.getMaxValue(ft.getPass5() + "," + ft.getPass6()) + ","
@@ -120,6 +155,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list110.size() != 0) {
             for (int i = 0; i < list110.size(); 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)) {
+                    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()) + ","
@@ -129,6 +182,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list111.size() != 0) {
             for (int i = 0; i < list111.size(); 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)) {
+                    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()) + ","
@@ -138,6 +209,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list112.size() != 0) {
             for (int i = 0; i < list112.size(); 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)) {
+                    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()) + ","
@@ -147,6 +236,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list113.size() != 0) {
             for (int i = 0; i < list113.size(); 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)) {
+                    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()) + ","
@@ -156,6 +263,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list114.size() != 0) {
             for (int i = 0; i < list114.size(); 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)) {
+                    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()) + ","
@@ -165,6 +290,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list115.size() != 0) {
             for (int i = 0; i < list115.size(); 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)) {
+                    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()) + ","
@@ -174,6 +317,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list116.size() != 0) {
             for (int i = 0; i < list116.size(); 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)) {
+                    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()) + ","
@@ -183,6 +344,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list117.size() != 0) {
             for (int i = 0; i < list117.size(); 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)) {
+                    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()) + ","
@@ -192,6 +371,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list118.size() != 0) {
             for (int i = 0; i < list118.size(); 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)) {
+                    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()) + ","
@@ -201,6 +398,32 @@ public class TFurnanceTemperatureController extends BaseController
         if (list130.size() != 0) {
             for (int i = 0; i < list130.size(); 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)) {
+                    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()) + ","
@@ -266,6 +489,40 @@ public class TFurnanceTemperatureController extends BaseController
                 TFurnanceTemperature ft = list109.get(i);
                 FurnanceTemperatureVO coil = new FurnanceTemperatureVO();
                 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)) {
+                    return AjaxResult.success("incompleteData");
+                }
                 coil.setH109Out(this.getMaxValue(ft.getPass1() + "," + ft.getPass2()) + ","
                         + this.getMaxValue(ft.getPass3() + "," + ft.getPass4()) + ","
                         + this.getMaxValue(ft.getPass5() + "," + ft.getPass6()) + ","
@@ -280,6 +537,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list110.size() != 0) {
             for (int i = 0; i < list110.size(); 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)) {
+                    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()) + ","
@@ -289,6 +564,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list111.size() != 0) {
             for (int i = 0; i < list111.size(); 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)) {
+                    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()) + ","
@@ -298,6 +591,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list112.size() != 0) {
             for (int i = 0; i < list112.size(); 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)) {
+                    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()) + ","
@@ -307,6 +618,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list113.size() != 0) {
             for (int i = 0; i < list113.size(); 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)) {
+                    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()) + ","
@@ -316,6 +645,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list114.size() != 0) {
             for (int i = 0; i < list114.size(); 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)) {
+                    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()) + ","
@@ -325,6 +672,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list115.size() != 0) {
             for (int i = 0; i < list115.size(); 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)) {
+                    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()) + ","
@@ -334,6 +699,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list116.size() != 0) {
             for (int i = 0; i < list116.size(); 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)) {
+                    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()) + ","
@@ -343,6 +726,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list117.size() != 0) {
             for (int i = 0; i < list117.size(); 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)) {
+                    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()) + ","
@@ -352,6 +753,24 @@ public class TFurnanceTemperatureController extends BaseController
         if (list118.size() != 0) {
             for (int i = 0; i < list118.size(); 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)) {
+                    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()) + ","
@@ -361,6 +780,32 @@ public class TFurnanceTemperatureController extends BaseController
         if (list130.size() != 0) {
             for (int i = 0; i < list130.size(); 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)) {
+                    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()) + ","

ui/src/main.js

@@ -41,6 +41,10 @@ import '@/assets/iconfont/iconfont.js'
 // 适配flex
 import { UTable, UTableColumn } from 'umy-ui';
 
+// 函数节流
+import throttle from "@/utils/throttle";
+Vue.prototype.$throttle = throttle;
+
 
 // 全局注册图标
 Vue.component('icon', Icon);

ui/src/utils/throttle.js

@@ -0,0 +1,23 @@
+// 节流函数: 连续不断地触发某事件（如点击），只在单位时间内只触发一次
+// throttle和debounce均是通过减少实际逻辑处理过程的执行来提高事件处理函数运行性能的手段，并没有实质上减少事件的触发次数。
+
+export default function throttle(fun, delay=2000) {
+  let last, deferTimer
+  return function (args) {
+      let that = this;
+      let _args = arguments;
+
+      let now = +new Date();
+
+      if(last && now < last + delay) {
+          clearTimeout(deferTimer);
+          deferTimer = setTimeout(function () {
+              last = now;
+              fun.apply(that, _args);
+          },delay)
+      } else {
+          last = now;
+          fun.apply(that,_args);
+      }
+  }
+}

ui/src/views/monitor/pfd/index.vue

@@ -7,67 +7,78 @@
       <i class="el-icon-zoom-in" @click="resizeImage(1)"></i>
     </div>
 
-    <!-- 点击区域 -->
-    <div class="pfdDivBox" >
-      <!-- 底图 -->
-      <img src="../../../assets/pfdImg/indexImg/index.jpg" alt="Responsive image" :style="imageStyle" class="indexImg" ref="indexImg">
+    <div class="abutton">
+      <div ref="firstDom" v-move class="mode">
+        <!-- 点击区域 -->
+        <div class="pfdDivBox">
+          <!-- 底图 -->
+          <img src="../../../assets/pfdImg/indexImg/index.jpg" alt="Responsive image" :style="imageStyle" class="indexImg" ref="indexImg">
 
-      <!-- 裂解炉 -->
-      <div class="area-LJL" :style="LJLStyle">
+          <!-- 裂解炉 -->
+          <div class="area-LJL" :style="LJLStyle">
 
-      </div>
-      <!-- 急冷区 -->
-      <div class="area-JLQ" :style="JLQStyle">
-      </div>
-      <!-- 中间区域 -->
-      <div class="area-ZJQ" :style="ZJQStyle">
-          <!-- 压缩 -->
-          <div class="area-YS">压缩</div>
-          <!-- 脱丙烷 -->
-          <div class="area-TBP">脱丙烷</div>
-          <!-- 热区 -->
-          <div class="area-RQ">热区-1</div>
-      </div>
-      <!-- 冷区+热区-2 -->
-      <div class="area-LQ_RQ" :style="LQ_RQStyle">
-          <!-- 冷区 -->
-          <div class="area-LQ-1">冷区</div>
-          <!-- 热区-2 -->
-          <div class="area-RQ-2">热区-2</div>
-      </div>
+          </div>
+          <!-- 急冷区 -->
+          <div class="area-JLQ" :style="JLQStyle">
+          </div>
+          <!-- 中间区域 -->
+          <div class="area-ZJQ" :style="ZJQStyle">
+              <!-- 压缩 -->
+              <div class="area-YS">压缩</div>
+              <!-- 脱丙烷 -->
+              <div class="area-TBP">脱丙烷</div>
+              <!-- 热区 -->
+              <div class="area-RQ">热区-1</div>
+          </div>
+          <!-- 冷区+热区-2 -->
+          <div class="area-LQ_RQ" :style="LQ_RQStyle">
+              <!-- 冷区 -->
+              <div class="area-LQ-1">冷区</div>
+              <!-- 热区-2 -->
+              <div class="area-RQ-2">热区-2</div>
+          </div>
 
-   </div>
+        </div>
+      </div>
+    </div>
   </div>
 
 </template>
 
 <script>
+import throttle from "@/utils/throttle";
 export default {
     data() {
         return {
             dialogVisible: false,
+            // 拖拽移动相关
+            dragging: false,
+            mouseX: 0,
+            mouseY: 0,
+            offsetX: 0,
+            offsetY: 0,
             // 缩放比例
             scaleNum: 200,
             // 底图初始化宽度
-            imageWidth:15548,
+            imageWidth:2148,
 
             // 裂解炉初始化宽度
-            areaLJLWidth: 1898,
+            areaLJLWidth: 290,
             // 裂解炉区域缩放比例
             areaLJLScaleNum: 0,
 
             // 急冷区初始化宽度
-            areaJLQWidth: 2930,
+            areaJLQWidth: 284,
             // 裂解炉区域缩放比例
             areaJLQScaleNum: 0,
 
             // 中间区域初始化宽度
-            areaZJQWidth: 5760,
+            areaZJQWidth: 802,
             // 中间区域缩放比例
             areaZJQScaleNum: 0,
 
             // 冷区+热区-2初始化宽度
-            areaLQ_RQWidth: 4920,
+            areaLQ_RQWidth: 699,
             // 冷区+热区-2缩放比例
             areaLQ_RQScaleNum: 0,
 
@@ -82,6 +93,13 @@ export default {
         });
     },
     computed: {
+      styleObject() {
+          return {
+            position: 'absolute',
+            left: this.mouseX + 'px',
+            top: this.mouseY + 'px'
+          };
+      },
       imageStyle() {
         return {
           width: `${this.imageWidth}px`, // 动态设置图片宽度
@@ -114,9 +132,34 @@ export default {
     },
     components: {},
     //在vue自定义指令中添加该指令
-    directives: {},
+    directives: {
+      move(el) {
+        el.onmousedown = function (e) {
+          //获取鼠标点击处分别与div左边和div上边的距离：鼠标位置-div位置
+          let startX = e.clientX - el.offsetLeft,
+            startY = e.clientY - el.offsetTop;
+
+          throttle(
+            (document.onmousemove = function (ev) {
+              let event = ev || window.event;
+              let moveX = event.clientX - startX,
+                moveY = event.clientY - startY;
+              el.style.left = moveX + "px";
+              el.style.top = moveY + "px";
+            }),
+            500
+          );
+
+          // 鼠标弹起时不再移动
+          document.onmouseup = function () {
+            document.onmousemove = null;
+          };
+        };
+      },
+    },
     created() {},
     methods: {
+      // 图片缩放函数
       resizeImage(type){
         if(type === -1){ //缩小
           // 底图宽度
@@ -142,6 +185,21 @@ export default {
           this.areaLQ_RQWidth = +this.areaLQ_RQWidth + +this.areaLQ_RQScaleNum;
         }
       },
+      // 拖拽相关函数
+      startDrag(event) {
+        this.dragging = true;
+        this.mouseX = event.clientX - this.offsetX;
+        this.mouseY = event.clientY - this.offsetY;
+      },
+      endDrag() {
+        this.dragging = false;
+      },
+      doDrag(event) {
+        if (this.dragging) {
+          this.mouseX = event.clientX - this.offsetX;
+          this.mouseY = event.clientY - this.offsetY;
+        }
+      }
     },
 
 };
@@ -161,6 +219,9 @@ body{
     height: 100%;
     position: relative;
     overflow: scroll;
+    cursor: move;
+    margin-top: -77px;
+
 }
 .indexImg{
   width: 100%;
@@ -221,6 +282,14 @@ body{
   cursor: pointer;
   color: #409eff;
 }
+
+/* 拖拽 */
+.mode{
+  position: absolute;
+  left: "calc(100% - 1300px)";
+  bottom: "calc(100% - 500px)";
+  z-index: 99;
+}
 </style>
 
 

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

@@ -222,6 +222,7 @@
         listCoil(this.queryParams).then(response => {
           if (response.msg == "incompleteData") {
             this.msgInfo("巡检数据录入不完整，暂时无法生成此表格。");
+            this.pressureList = [];
           } else {
             for (let i = 0; i < response.data.length; i++) {
               if (response.data[i].h109Out == null) {

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

@@ -156,6 +156,7 @@
         listMax(this.queryParams).then(response => {
           if (response.msg == "incompleteData") {
             this.msgInfo("巡检数据录入不完整，暂时无法生成此表格。");
+            this.pressureList = [];
           } else {
             this.pressureList = response.data;
           }

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

@@ -233,6 +233,7 @@
         listCoil(this.queryParams).then(response => {
           if (response.msg == "incompleteData") {
             this.msgInfo("巡检数据录入不完整，暂时无法生成此表格。");
+            this.temperatureList = [];
           } else {
             for (let i = 0; i< response.data.length; i++) {
               if (response.data[i].h109Out == null) { response.data[i].h109Out = []; } else { response.data[i].h109Out = response.data[i].h109Out.split(','); }

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

@@ -156,6 +156,7 @@
         listMax(this.queryParams).then(response => {
           if (response.msg == "incompleteData") {
             this.msgInfo("巡检数据录入不完整，暂时无法生成此表格。");
+            this.temperatureList = [];
           } else {
             this.temperatureList = response.data;
           }