From 82ddb529c12427f308addaefd3a9b9b488b01236 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Sun, 11 Dec 2022 22:23:53 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=AE=BE=E5=A4=87=E6=95=85?=
 =?UTF-8?q?=E9=9A=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TankShellDeviceDataInformation.java       |   2 +-
 .../AluminumDeviceDataInformationMapper.java  |   5 ++++-
 .../TankShellDeviceDataInformationMapper.java |   4 ++--
 .../impl/AluminumDeviceInfoServiceImpl.java   |   2 +-
 .../impl/TankShellDeviceInfoServiceImpl.java  |   8 ++++----
 .../src/main/resources/application.yml        |   4 ++--
 .../static/js/aluminumLiner/index.js          |   2 +-
 .../resources/static/js/tankShell/device.js   |   2 +-
 .../target/classes/application.yml            |   4 ++--
 .../TankShellDeviceDataInformation.class      | Bin 7495 -> 7475 bytes
 .../AluminumDeviceDataInformationMapper.class | Bin 952 -> 1116 bytes
 ...TankShellDeviceDataInformationMapper.class | Bin 1051 -> 1119 bytes
 .../impl/AluminumDeviceInfoServiceImpl.class  | Bin 5405 -> 5448 bytes
 .../impl/TankShellDeviceInfoServiceImpl.class | Bin 10262 -> 10258 bytes
 .../classes/static/js/aluminumLiner/index.js  |   2 +-
 .../classes/static/js/tankShell/device.js     |   4 ++--
 16 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.java b/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.java
index af55211..cebc662 100644
--- a/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.java
+++ b/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.java
@@ -60,7 +60,7 @@ public class TankShellDeviceDataInformation implements Serializable {
     private Date collectTime;
 
     @TableField("COUNT")
-    private int alarmCount;
+    private int count;
 
     @TableField("lossTime")
     private String lossTime;
diff --git a/productionboard/src/main/java/com/productionboard/mapper/AluminumDeviceDataInformationMapper.java b/productionboard/src/main/java/com/productionboard/mapper/AluminumDeviceDataInformationMapper.java
index d0c3a4a..2fc6c75 100644
--- a/productionboard/src/main/java/com/productionboard/mapper/AluminumDeviceDataInformationMapper.java
+++ b/productionboard/src/main/java/com/productionboard/mapper/AluminumDeviceDataInformationMapper.java
@@ -19,6 +19,9 @@ public interface AluminumDeviceDataInformationMapper extends BaseMapper<Aluminum
      * @param in_id
      * @return
      */
-    @Select("select * from table ( scada_aluminum_device_t_new(#{in_id}) )")
+    @Select("select * from table ( scada_aluminum_dataInfo_t_new(#{in_id}) )")
     List<AluminumDeviceDataInformation> getAluminumDeviceDataInformations(@Param("in_id") Integer in_id);
+
+    @Select("select * from table ( scada_aluminum_device_t_new(#{in_id}) )")
+    List<AluminumDeviceDataInformation> getAluminumDeviceRunParameters(@Param("in_id") Integer in_id);
 }
diff --git a/productionboard/src/main/java/com/productionboard/mapper/TankShellDeviceDataInformationMapper.java b/productionboard/src/main/java/com/productionboard/mapper/TankShellDeviceDataInformationMapper.java
index 4d28d6e..f731b2b 100644
--- a/productionboard/src/main/java/com/productionboard/mapper/TankShellDeviceDataInformationMapper.java
+++ b/productionboard/src/main/java/com/productionboard/mapper/TankShellDeviceDataInformationMapper.java
@@ -28,6 +28,6 @@ public interface TankShellDeviceDataInformationMapper extends BaseMapper<TankShe
      * @param in_id
      * @return
      */
-    @Select("select * from table ( scada_device_data_info_new(#{in_id}) )")
-    List<TankShellDeviceDataInformation> getDeviceDataInformations(@Param("in_id") Integer in_id);
+    @Select("select * from table ( scada_device_run_info_new(#{in_id}) )")
+    List<TankShellDeviceDataInformation> getTankShellDeviceRunParameters(@Param("in_id") Integer in_id);
 }
diff --git a/productionboard/src/main/java/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.java
index 89f875c..85a6c01 100644
--- a/productionboard/src/main/java/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.java
+++ b/productionboard/src/main/java/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.java
@@ -66,7 +66,7 @@ public class AluminumDeviceInfoServiceImpl implements IAluminumDeviceInfoService
             result[1] = aluminumYesterdayEnergies.size() > 0 ? aluminumYesterdayEnergies.get(0).getEnergy():"0";
             result[2] = aluminumThisMonthEnergies.size() > 0 ? aluminumThisMonthEnergies.get(0).getProduction():"0";
             result[3] = aluminumThisMonthEnergies.size() > 0 ? aluminumThisMonthEnergies.get(0).getEnergy():"0";
-            List<AluminumDeviceDataInformation> aluminumDeviceDataInformations = dataInformationMapper.getAluminumDeviceDataInformations(in_id);
+            List<AluminumDeviceDataInformation> aluminumDeviceDataInformations = dataInformationMapper.getAluminumDeviceRunParameters(in_id);
 //            List<AluminumDeviceDataInformation> aluminumDeviceDataInformations = dataInformationMapper.selectList(null);
             if(aluminumDeviceDataInformations.size() > 0){
                 AluminumDeviceDataInformation aluminumDeviceDataInformation = aluminumDeviceDataInformations.get(0);
diff --git a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java
index 2034f5e..d6216a8 100644
--- a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java
+++ b/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java
@@ -63,7 +63,7 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi
             tankShellDeviceDataInformation.setDeviceStatus("0");
             tankShellDeviceDataInformation.setDevicePower("0");
             tankShellDeviceDataInformation.setDeviceEnergy("0");
-            tankShellDeviceDataInformation.setAlarmCount(0);
+            tankShellDeviceDataInformation.setCount(0);
             tankShellDeviceDataInformations.add(tankShellDeviceDataInformation);
         }else{
             if(tankShellDeviceDataInformations.get(0) == null){
@@ -71,7 +71,7 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi
                 tankShellDeviceDataInformation.setDeviceStatus("0");
                 tankShellDeviceDataInformation.setDevicePower("0");
                 tankShellDeviceDataInformation.setDeviceEnergy("0");
-                tankShellDeviceDataInformation.setAlarmCount(0);
+                tankShellDeviceDataInformation.setCount(0);
                 tankShellDeviceDataInformations.add(tankShellDeviceDataInformation);
             }else{
                 for(TankShellDeviceDataInformation item : tankShellDeviceDataInformations){
@@ -121,14 +121,14 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi
             result[3] = tankShellThisMonthEnergies.size() > 0 ? tankShellThisMonthEnergies.get(0).getEnergy():"0";
 
 //            List<TankShellDeviceDataInformation> deviceDataInformations = tankShellDeviceDataInformationMapper.selectList(null);
-            List<TankShellDeviceDataInformation> deviceDataInformations = tankShellDeviceDataInformationMapper.getDeviceDataInformations(in_id);
+            List<TankShellDeviceDataInformation> deviceDataInformations = tankShellDeviceDataInformationMapper.getTankShellDeviceRunParameters(in_id);
             if(deviceDataInformations.size() > 0){
                 TankShellDeviceDataInformation tankShellDeviceDataInformation = deviceDataInformations.get(0);
                 if(tankShellDeviceDataInformation != null){
                     result[4] = tankShellDeviceDataInformation.getRunTime();
                     result[5] = tankShellDeviceDataInformation.getStopTime();
                     result[6] = tankShellDeviceDataInformation.getDeviceOee();
-                    result[7] = tankShellDeviceDataInformation.getAlarmCount()+"";
+                    result[7] = tankShellDeviceDataInformation.getCount()+"";
                     result[8] = tankShellDeviceDataInformation.getLossTime();
                     result[9] = tankShellDeviceDataInformation.getDeviceTakt();
 
diff --git a/productionboard/src/main/resources/application.yml b/productionboard/src/main/resources/application.yml
index bea2bcb..142f6dd 100644
--- a/productionboard/src/main/resources/application.yml
+++ b/productionboard/src/main/resources/application.yml
@@ -12,6 +12,6 @@ mybatis-plus:
   mapper-locations: classpath*:/mapper/**Mapper.xml
 
 server:
-  port: 6069
+  port: 6070
 
-in_id: 1
\ No newline at end of file
+in_id: 2
\ No newline at end of file
diff --git a/productionboard/src/main/resources/static/js/aluminumLiner/index.js b/productionboard/src/main/resources/static/js/aluminumLiner/index.js
index 2ee8c56..52f425b 100644
--- a/productionboard/src/main/resources/static/js/aluminumLiner/index.js
+++ b/productionboard/src/main/resources/static/js/aluminumLiner/index.js
@@ -8,7 +8,7 @@ $(() => {
                 statusArray[0] = result[0].deviceStatus == "正常" ? "1" : "0";
                 statusArray[1] = test(result[0].devicePower,100);
                 statusArray[2] = test(result[0].deviceEnergy,1000);
-                //statusArray[3] = result[0].count;
+                statusArray[3] = result[0].count;
             }
             dataInformationFunction(statusArray);
         });
diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js
index 8d4cc3d..af7c1ba 100644
--- a/productionboard/src/main/resources/static/js/tankShell/device.js
+++ b/productionboard/src/main/resources/static/js/tankShell/device.js
@@ -88,7 +88,7 @@ const dataInformationFunction = (statusArray) => {
             <tr style="width: 100%; height: 50%;">
             
                 <td style="border:0px solid red;text-align:center;width: 50%;color: #59B2F6;"> ${test(res.deviceEnergy,100)}kW·h</td>
-                <td style="border:0px solid red;text-align:center;width: 50%;color: red;">0</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: red;">${res.count}</td>
             </tr>
         </table>`;
 
diff --git a/productionboard/target/classes/application.yml b/productionboard/target/classes/application.yml
index bea2bcb..142f6dd 100644
--- a/productionboard/target/classes/application.yml
+++ b/productionboard/target/classes/application.yml
@@ -12,6 +12,6 @@ mybatis-plus:
   mapper-locations: classpath*:/mapper/**Mapper.xml
 
 server:
-  port: 6069
+  port: 6070
 
-in_id: 1
\ No newline at end of file
+in_id: 2
\ No newline at end of file
diff --git a/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.class b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.class
index e2c1358c0509ef85e1dc073eaa21f0ccfe0ffa99..43590e27e393f022329d28c500413549a8435e9c 100644
GIT binary patch
delta 45
ycmX?Zwb^PzBoh;B^5z7laz+-8^wg5g514y^tYRRml=Th^3x|$E^5!V6w?Y6{3l5e5

delta 65
zcmdmNb=+!0BojMVVoqXFuJh(-rgBD3-t^QGM-YGWHRc{5w;0AvW4*(|$*ZFPRqV#~
GRtNy%;}$>w

diff --git a/productionboard/target/classes/com/productionboard/mapper/AluminumDeviceDataInformationMapper.class b/productionboard/target/classes/com/productionboard/mapper/AluminumDeviceDataInformationMapper.class
index 63530bf5eb01edca3ae41bce7168a62ec8f1ebd6..2dc932de12db9ec4bb6636d237142c98559b060d 100644
GIT binary patch
delta 152
zcmdnNeuqQ&)W2Q(7#J8#7$n&l#Ml|c*%>4@3Y#)A+E4amRAWypN%YK1%b#4rm?$ro
zo?7CVQ<|HZSDNdRT9%od8dRDWkXV$Mn_7}uR6N;@(P{Hl#%4xFrpb}ajw~#U3<8s5
vnY9cB8Tfz}@GvqkGVlX2PcZ{K12Y2$P>hK|h(Q=ki!g8jX*Qs=C<6lk3+f+V

delta 81
zcmcb^v4dUs)W2Q(7#J8#7{u8bMA#Wb*%`z(3Y#)c{=w)lxr@<vvjtN#BP$~dBLmB1
jMi#Bfub71=+p%zp3NQ!)bulprF>nECHU>rpVFm^OA$Shx

diff --git a/productionboard/target/classes/com/productionboard/mapper/TankShellDeviceDataInformationMapper.class b/productionboard/target/classes/com/productionboard/mapper/TankShellDeviceDataInformationMapper.class
index 2ac69e23821b479865404f987530af382e5a4aa5..2df741f09276e8ccc2fec5d7a6c2c799b4a238d9 100644
GIT binary patch
delta 135
zcmbQuai2r-)W2Q(7#J8#7$n&l#Ml|c*%>4l8I;mfOD5iy+i1RkQCS|y4oS?*4$er;
z$#F?7%S=uUD$NT>EK1BxElDjZW@NCQ?8B%mQB;~2pP84IAD@?6uAy9=3FM{JYAR@M
j{>b=~kx_8+Yi4OtAqHWfT}%uj3|v5(je(Itlz{;N31B6C

delta 88
zcmcc5F`Gm3)W2Q(7#J8#7$n#kMA;d{*crqb8I;mfOD5iy+i1Rkkwp^7p8SwWl(BfT
mDbr8J$#0p3<rtV5IDnd%7z7!Fz_c&}7m#LSU}O+sU;qH-nh{$7

diff --git a/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class
index 33ada1a9fe931ed186c1fab658707176f855f57f..1f7cac049dc6db407ca899264eb35df941e406bc 100644
GIT binary patch
delta 1632
zcmbu8`CC+F6vsbzhM9M`^YS<YB9MtfR>nXW*`le%QkqGEv_X<iFd@oJHZagWYKv)E
z;cYM5S6T$I0kpK$)Rtd*o__Bi=!g2b=)5yX<>W8*JTu?(eb0OD`JQv`xqB;)RU}XR
zaquv(h#zduCzeYUw;R}Ea|dxhz4R#(#?$X-fIAJl%g^21<L6%PGjP8mX_LoRAKQ%G
zu6V#E$W{Z}O^OE<57`v*uz?*09#QPHDPdjAoOT)dsE@~t-EH7;<9@=xlZwGy_Tcz<
z%BGyBZJyy-AJ5r5&kLrU7yZ1%Uc+AY^9rvjUQ@iTcw^+JJa0gFtKv;*LW+=FqrZ9Q
zxY}x|(=6ly%~F;r-qO6yJBoKT?=fT%*c9#$SNDWtUDYjp@$Oic=28|b-q(D<kmh18
zQGBTRh#|?X*~hSEg#8w^&Y-Gsj(BGTHKR0JSPL}=49VR5k~_nv`Phi8Frj-qg{w3v
znl)nv#!YC^sq%G+?w-y_Tr**W4syr>V?WV+YMwf5;0Vpmpk3_!O!GNkIQ#7KMPJga
z_)7CNN2QV~#W$K`9M|%`FH)S)d~3Q{!exr@G~b)5mP=JLov7dE47<xm>;0v!xuso^
zzS^Edv^$oFHbnZnJ0fcnv8Hf59F6ov;=QBm^J-klDp?<kYP`72V1?JnUU|h{DAr{Z
zvwSkfET7Cd%O?e9`Q*J#`TSy+Hwj$c%N2Np$lDdH7u{;HGAle4V^|~ULK*~3Sx~^0
zf;tnxRjiPc#Y(Q0a_gN9f%$7ptSu*`xu7I7@w3wBf~okRoK|s-JhxizOs<TlQP{QO
zaj`~N6U~D4&X0i!Yo@b1Sln2+#8cuq%Ic6R@uZm567m^a)DjAK4Jj6)4pGuN#u?^3
zJH?s#b5fM1m@8N5;CVuF&1ISMYp}BBtf}z)`4U!{;_OUxigQBl{Bv7E<184KBD~gO
zYpHxkIW#y;`2$JQ(n=J^*}_^{WPU|fIoC-`E*4lpt{3KJKReQG=2*)p;|6Y&Tda<$
zA$YBJZlYDPn<31T_)Lzr=^Qst=V%n=brSV6dQx6dGDp#_xJ9vEez=5MlalD4ZntqO
zHcT@6l$-ziK=P#Wf0p>2fpqcVNtuk4W4eJl#jR!1M@MFxq~UfMhS{WoiUXV{fA=^!
z6C^8KvIN88ck|b_ZI&(SInB0pW^G$15mCx)+ik+S{#7$Hty%du$u?2WY<OHWdrzae
YF-vnJ-P4+zq_54A$0aqN{OF_bC+QLdfdBvi

delta 1591
zcmbu8`FB%Q5XV37Wx37E<(M{Is8FO81)E}_f=Z<>EmhP4)u>RgN^DCklz?faRMdbQ
zD!4v(E$&(uv{(!cXayHU{44kyJf7n(Qs*`yE|FjKoMh&EXXed!X71b*wZpZklcx_)
z0E_t9VLqD!)R8b^i^Ep#36i8=F<>nB2HD1-LED22abJ)f+;7AKiU%F0kt$-R(Yq86
zITVvJLJki*l=6rXj~elqVz<L|Hk-q`#|?a<h$oHSW5ix#f69ob70(2CmgkCi-k}=T
z;RRkS;w6WddBs%nYLM4>-Jmyu46{%1rs6Hd+ZJWrZnaf<;Fn*0A+fDdyd!-`F_Lra
zH-DAA`f9Gx)U!Zy1xpq0YTo00#Rr-X8L<d$jBSh6_r((N`shHiHxbud#^s8SG#@jf
zS<I!1Pc)x0BDppD`AqXUqwYjtaaBi8|3FW&J2ups=t;(hGzVz6u!QRi+9hI{$KpEo
zSfIfj_LZHZ8KYfu(1<U^zuuYIls4%OF>Zm;8O>qiK4QdICRzB;`dYVl^=uvJ-I7pz
zt(o8(H{;YSJW9LbnC4r)6YBYj?=?SgTyqJF6hCTCm^PNssQ5{9k`eb*u)^K%sU2Gp
zoMn&gowmSE)yYm+T#O&vj7soASr)(O2GO=jRbZ3B6xd{P1vX(Wu*ps2Y(ddYVG&pM
za}_=Ta$h2w-Iby8xh=UWAj~qsT0BTpE7yva*|J=!Yj*d9=BzTYj+~G_ilqw^Up{pX
z=i-aybUio7cQ=a9<jPvw1g#K@%}PP5XcyV+o(^R;_-q=zmEH_Ni+${@^m;OAo1>IA
z`YL_LX^W^zUz)OLq{!&<Xe8t}phAE;!t{<qRGRa-X=aqnOjDI+mbj*Z&l3<Z&e?8N
zNnJxtF1+M?39CypCmWsSf{3T&!f0fixua5--&$fVl{ez0#obXdm@-{1N3K?$@lD(;
zv#GFZh)S0>^Q>ZS5#*6=+&$H~*J_e)Z{;@eVs+)_;<q|k%^JyW<}zF2vpG8QIo9TL
zv<dS%i8_Uzq=l4Mal4{Zafke{1zMAm=<jBaF)QwzWX3-{|M!E`8Rq{?@jHW4#jl@~
z$w)b-8)#O<s-=&+vI`~+cgir#a)oOTGEe@Vabz!27um7|qhj~SG|nvGCRwb$vn*g&
z!2)*CElk-3>=Cr#UpZ^@oRPm!uFZ2Mg|q)GobdwAICtkcd!?_9lE-FK{@M4zAF1K_
A5C8xG

diff --git a/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class
index 5e3c188aa5e40dbd34ba6e00b1dd3216de22c4a4..e129e63bb7061f9d4f1e4ac69f32ab8fc4ad1e15 100644
GIT binary patch
delta 82
zcmbOhFezX|rZ7K8acYTkera9_BZHrYr{?5~T-K8>unBBFAzaKXFQ1-T5|Wsg9h{Mx
lljD+FmYJLyRGJr%Sd^HXT9R5cIYeBSg#)N&bC-CJ006F_9RUCU

delta 50
zcmbOfFfCw1rZ6XOacYTUPGV8+=3L>E%q)`WsU?#g*d!)Lh--230yz-5Ht`+-0J?M#
A>;M1&

diff --git a/productionboard/target/classes/static/js/aluminumLiner/index.js b/productionboard/target/classes/static/js/aluminumLiner/index.js
index 2ee8c56..52f425b 100644
--- a/productionboard/target/classes/static/js/aluminumLiner/index.js
+++ b/productionboard/target/classes/static/js/aluminumLiner/index.js
@@ -8,7 +8,7 @@ $(() => {
                 statusArray[0] = result[0].deviceStatus == "正常" ? "1" : "0";
                 statusArray[1] = test(result[0].devicePower,100);
                 statusArray[2] = test(result[0].deviceEnergy,1000);
-                //statusArray[3] = result[0].count;
+                statusArray[3] = result[0].count;
             }
             dataInformationFunction(statusArray);
         });
diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js
index cc159da..af7c1ba 100644
--- a/productionboard/target/classes/static/js/tankShell/device.js
+++ b/productionboard/target/classes/static/js/tankShell/device.js
@@ -88,7 +88,7 @@ const dataInformationFunction = (statusArray) => {
             <tr style="width: 100%; height: 50%;">
             
                 <td style="border:0px solid red;text-align:center;width: 50%;color: #59B2F6;"> ${test(res.deviceEnergy,100)}kW·h</td>
-                <td style="border:0px solid red;text-align:center;width: 50%;color: red;">0</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: red;">${res.count}</td>
             </tr>
         </table>`;
 
@@ -124,5 +124,5 @@ const runParamStatisticsFunction = (statusArray) => {
         <div style="font-size:175%;left: 87%;color:#FF696A">${statusArray[7]}</div>
     `;
 
-    $("#runParamStatistics").append(info);
+    $("#runParamStatistics").html(info);
 }
\ No newline at end of file