From 3bce452a2b991e1114b50d348adc268d797e3b9e Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Fri, 10 Jun 2022 16:25:33 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=8F=91=E6=B3=A1=E6=9C=BAISO?=
 =?UTF-8?q?=E3=80=81POL=E6=B8=A9=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FoamBoxDeviceInfoServiceImpl.java    |  51 ++++++++++++------
 .../impl/FoamBoxDeviceInfoServiceImpl.class   | Bin 5116 -> 6153 bytes
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/productionboard/src/main/java/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.java
index f20b50c..1a96b48 100644
--- a/productionboard/src/main/java/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.java
+++ b/productionboard/src/main/java/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.java
@@ -108,29 +108,46 @@ public class FoamBoxDeviceInfoServiceImpl implements IFoamBoxDeviceInfoService {
         break;
     }
 
-    List<FoamBoxParamTemperature> foamBoxParamTemperatures = foamBoxParamTemperatureMapper.selectList(wrapper);
+    //List<FoamBoxParamTemperature> foamBoxParamTemperatures = foamBoxParamTemperatureMapper.selectList(wrapper);
+    List<FoamBoxParamTemperature> foamBoxParamTemperatures = new ArrayList<>();
     String[] legendArray = new String[]{"1#pol","2#pol","1#piol","2#pol"};
     result.put("legendArray",legendArray);
     if(foamBoxParamTemperatures.size() > 0) {
+      String[] xAxisArray = new String[foamBoxParamTemperatures.size()];
+      String[] isoArray1 = new String[foamBoxParamTemperatures.size()];
+      String[] isoArray2 = new String[foamBoxParamTemperatures.size()];
+      String[] polArray1 = new String[foamBoxParamTemperatures.size()];
+      String[] polArray2 = new String[foamBoxParamTemperatures.size()];
       for (int i = 0;i<foamBoxParamTemperatures.size();i++){
-        String[] xAxisArray = new String[foamBoxParamTemperatures.size()];
-        String[] isoArray1 = new String[foamBoxParamTemperatures.size()];
-        String[] isoArray2 = new String[foamBoxParamTemperatures.size()];
-        String[] polArray1 = new String[foamBoxParamTemperatures.size()];
-        String[] polArray2 = new String[foamBoxParamTemperatures.size()];
-
         xAxisArray[i] = simpleDateFormat.format(foamBoxParamTemperatures.get(0).getCollectTime());
-        isoArray1[i] = foamBoxParamTemperatures.get(i).getIso1();
-        isoArray2[i] = foamBoxParamTemperatures.get(i).getIso2();
-        polArray1[i] = foamBoxParamTemperatures.get(i).getPol1();
-        polArray2[i] = foamBoxParamTemperatures.get(i).getPol2();
-
-        result.put("xAxisArray",xAxisArray);
-        result.put("isoArray1",isoArray1);
-        result.put("isoArray2",isoArray2);
-        result.put("polArray1",polArray1);
-        result.put("polArray2",polArray2);
+        isoArray1[i] = foamBoxParamTemperatures.get(i).getIso1() == null ? "0" :foamBoxParamTemperatures.get(i).getIso1();
+        isoArray2[i] = foamBoxParamTemperatures.get(i).getIso2() == null ? "0" : foamBoxParamTemperatures.get(i).getIso2();
+        polArray1[i] = foamBoxParamTemperatures.get(i).getPol1() == null ? "0" : foamBoxParamTemperatures.get(i).getPol1();
+        polArray2[i] = foamBoxParamTemperatures.get(i).getPol2() == null ? "0" : foamBoxParamTemperatures.get(i).getPol2();
+      }
+      result.put("xAxisArray",xAxisArray);
+      result.put("isoArray1",isoArray1);
+      result.put("isoArray2",isoArray2);
+      result.put("polArray1",polArray1);
+      result.put("polArray2",polArray2);
+    }else {
+      String[] xAxisArray = new String[15];
+      String[] isoArray1 = new String[15];
+      String[] isoArray2 = new String[15];
+      String[] polArray1 = new String[15];
+      String[] polArray2 = new String[15];
+      for (int i = 0;i<15;i++){
+        xAxisArray[i] = 0+i+"";
+        isoArray1[i]  = 1+i+"";
+        isoArray2[i]  = 2+i+"";
+        polArray1[i]  = 1+i+"";
+        polArray2[i]  = 2+i+"";
       }
+      result.put("xAxisArray",xAxisArray);
+      result.put("isoArray1",isoArray1);
+      result.put("isoArray2",isoArray2);
+      result.put("polArray1",polArray1);
+      result.put("polArray2",polArray2);
     }
 
     return JSONArray.toJSONString(result);
diff --git a/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.class
index 9e2a213317c6942b4e8b72ed5071a4439abdd244..c508f5e104f92bbbe4b066ae4f7d9d0b2269a078 100644
GIT binary patch
delta 2378
zcmbtVX>e3U5dLO1*_nO&Ae)UL?h+&c0WrZu!V$nDK@$SviGp~9EFs`RNS0+oK!T4;
z<&?lv?kEBpL{T8R9LphyfS@AyOUgn^OMj&NXK57(S$p<{B?1<dR=w)(neP6kXQsb-
z7kezsHBPkbJpiB&PH7m3T7l^jGc<6#=)eHX6sS{rmJ=_*5SXpOfm#iA%#oO@^gN0A
z5-&@<qFk>^EKu<aomd3JiN#o=#8QFRG^AmfK)nVJmMgJBz|;)9jyD8WYPd};zDh#|
zY9&@ntdUqN5m1hG0_!#OK!d95O=Z2M#0DkaR$`-sUt*%fB#BCi$pV`+<f%gQuvy|A
zrQcPeQDBR}djeY-yyL5VlXv{OF2O}pbpj&=-lrW>RZYti>ls^Vb`hoaVho{Bvy^+y
z4WeCEF+R}oAc`1V6MfTsIhDSu2{|J|L4VZ*9rxf~fo(cI#77K+%u}{O?R9L&4hEL1
zV<(!-Oxd~n$M}T7SyJ3Pw|8#tfc(DwbrhgbAWZA)*o7TBc4Lou(2-^qB&M5dWRh(!
zB4(*0&papHJ@+A^V?QDcDOV~enqFQJ2>Gk41P<sph))?hn|~#C?r=G(CgiWoDGUaE
zGlu)8hRgy-N82GBCeWgi&u~P?=Qyh4n1Vj8#1~4OP>ZBpS;X4r;2MABxQd{TllYPW
zN`Ix}Yebq3I`(m43)F-d^37yhiusMcDT~4G3j`{v#xbPdF|_CKe}Nms(2H`q8LjX%
zmZ55EMPyP(4Fnx25~u;_l*zu2n$}MGe$reW;5BoD@xV26baNDMqj|blk|i`MAXM52
z+;{E*Gk<88k~Ne@s?`85`MP2lS-KU2hcKK*3=iWGiYRI7)P4+OL(N%9)rJZiPl;P7
z<xxCF<(-DxvRF>5C0I66@i?9!FIaIaoU%sXNrJVr0z8G01f9(KVicaHV!f0z8qZKE
z>#-Hj(p(~*qqQ=~XGJ})qKsHrX*_HUg_TiQ5nNH)q!924j1?#s7$;CcHtjk|_v+{2
zxP)72mR&#>ei58>@&LzRf$^7+K$4wDGA0mIBBL_Z?q9HWPgk&%R?+DSnj>bjYqp3W
zWArX$nxW)g$!wUdpFP#?N!Wu_hK(%W+?ni`#~|H$BiyF$?s{dA(RR?M?V!Y6XtW$|
zM6)YtKkNhTmJ*hdmU381v-NYPI$cQ{QSY&*IwQ!VTKd>hon>M4b@vOSe;D~AJR<H&
zxY{M-uEaJjBbMff`>sjT;;y!7Dr>%zHAbtm-FJEHVRRpr?auKC%gFUe%edR)u#Daw
zEoSUSr|opg2~d3)MlYBRZm$ub7j+6YBZzI7O3y?HM^S?_n1*wxMKh-3Pt0H(Gg&(7
z*bvNOLA=BoV6fwu%}!$uJBzvOXUt>2VLtl<A=ZKgJP`}Ijzv5Li@6s|cqW$eEG*;2
zsOLT`=XF@YSHa{v4RY+pN`45d_zA4$-(n5_9&7n8Xo&G6Obvd9b%mdrSKu5=!$h(q
znwb-m$Z}A5QB;zpQIWr6GFeXSWrY?&`0ex~P^58ENk7I=>{QryF%&`N8E0ZJlBzrz
zgK<!;M`AFVYQM`&BFkcu<UbLUs)$K0em2G*8|||U)x@6!Y^EIss052i9pX__h)Gsd
zkfO?{*Dv9gDE%G{`(^%2ZA%{KdB_&z$0$|KqNs!Z&p4u5Ig62wc-Q)YtH~(Z-&C+I
zhG1Z96di9W;Xk0?7~J?Dwci;1#^A<vj?p?9g`S72u16g^wM7)&u6Jbdo3IRe2QR>k
aBK!I%P)}ca>)XePc<PT+6aNEE1O5gcG0NKj

delta 1350
zcmZXTTTqo%6vu!2a5(!r-}wg5LGVI}7iKa@f>0FfMwozIDZ81s2$Ue=a1#M92fUP*
zC~8+!QWjQ-U4*a_@lw4s)%4IzzSToB_2l^6;Hb1VAmfY=-&*Ti`@jEdt^MD7fA-~t
zv0tv9Itwh}M^{X}roo}n#Ya<+#ca_uTfa3#3$2<qmmu{n0k%18w|<AiPKTI7yItyV
z*k$p%L+qh7#9m&u<`vC8mznI>9B`S<L2F*sbh_od#_O6cmsINQ&No85Nvnf#c+25!
zhibd@j;7mXA@ADG-m}sB)*P~?$C?iu${i{kHaTo|sMLI@Ijs3ekzxkol7<r0L4R0s
z&6-lp$1;kPAL@_qQmV@=*BjyrxX&EY8MhYD>v0eFD#F!e&1G3NWwn)AtD73CYAZdK
zvP^Tt;}bqL7j=R68GQ<s?QxWTlkd#E<rtqULM25x**V$S`FXj^JeG5(<_oFm@g;p8
zUvb<-+?l4`pYC`JFsLXn9Zt5H6CZXxzGl#4h(Qw$&I+9H_=a!I?ZE}<9(QrK<~v3F
z9cgvZ8u2+3J|O>9(Hf7F3}55=Ef7xiIK_y^Y0h|@wXEl?`QDlz7#xbYr+q3<Dkqu0
zRDvn-%`m@u=hiV_R9J!{7rz{~Oe}GpT#<nIeDOXz(G59i?uMM4qTu5sFNZ6((5y;G
zyKRN!tc;K%71Fq0B2QK!k(CsQR}@nsh{B=ngpEqAF#k=9#w={JY&<GkR`Gze^Sf*q
zk5txVq}3vld60)>6;(7zXQPLCL}&x5fJZ46>WIqaF&>xZQe@9+o{(00IL4Ebi{~k+
zHBZ(iP)}P_Y#jE?6l{&ao)y?i!ecU?)~wa6)2!EQ&}@`gCYt7@c%uZbFiW!P5(|8n
z@rjS*2MaaNUBNF_jS`_usN$8hX{UdFVtP61OH##?RNsiHh_t&ICzzKx%zPi_LL@W7
zg}9}G<iKqIFv*Hu{xs={Ri-~N$^0STn0y)2bEc1_E;`Aa0b%xI&%S}1&6=c}Vo^G&
zqmO#IgAH<38u^(f&a;KTY33qZ8Kp(V)28OKO)X}-DrSdT%T5)gUA54mI@qNSuv;1S
zs2&<sFZ;&TY?GeP^AqKA)LPg^sF27J&f{#7C@9QFVxnd#t`z8|Qlb!N_;*rS8F)&&
zzDeyIby&1}L9`32?s3K9=u|0GiDG{H45=2D3GHS~p<Wd2CQvnkvVvvejLH2D6kk*9
grR(JijpAIj4^~86FG~G$y)r&(g}_I2>OIuK|MeU86951J