From 629b027e9b8833ca2f6d02089172521d4e7cf5aa Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Thu, 9 Jun 2022 10:29:53 +0800
Subject: [PATCH] =?UTF-8?q?add=20-=20=E7=AE=B1=E5=A3=B3=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E7=9C=8B=E6=9D=BF=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AluminumLinerkController.java  |   2 +-
 .../controller/TankShellDeviceController.java |  13 +++-
 .../TankShellThisMonthEnergy.java             |  26 ++++++++
 .../TankShellThisMonthEnergyMapper.java       |  13 ++++
 .../service/ITankShellDeviceInfoService.java  |   8 +++
 .../impl/TankShellDeviceInfoServiceImpl.java  |  58 ++++++++++++++++--
 .../TankShellDeviceController.class           | Bin 1944 -> 1782 bytes
 .../service/ITankShellDeviceInfoService.class | Bin 285 -> 312 bytes
 .../impl/TankShellDeviceInfoServiceImpl.class | Bin 4507 -> 7444 bytes
 9 files changed, 112 insertions(+), 8 deletions(-)
 create mode 100644 productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellThisMonthEnergy.java
 create mode 100644 productionboard/src/main/java/com/productionboard/mapper/TankShellThisMonthEnergyMapper.java

diff --git a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java
index 0aebfc8..b660db7 100644
--- a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java
+++ b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java
@@ -53,7 +53,7 @@ public class AluminumLinerkController {
     }
 
     /**
-     * 获取能耗产量数据
+     * 获取运行参数,整合产量能耗、运行参数、loss、标准节拍参数
      * @author WenJY
      * @date 2022-06-08 15:53
      * @return java.lang.String
diff --git a/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java b/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java
index cd65211..7bf4250 100644
--- a/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java
+++ b/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java
@@ -42,10 +42,21 @@ public class TankShellDeviceController {
     @ResponseBody
     public String getEnergyConsumption(){
         String energyConsumptionJson = iTankShellDeviceInfoService.getEnergyConsumptionJson();
-        System.out.println("打印JSON："+energyConsumptionJson);
         return energyConsumptionJson;
     }
 
+    /**
+     * 获取运行参数,整合产量能耗、运行参数、loss、标准节拍参数
+     * @author WenJY
+     * @date 2022-06-08 15:53
+     * @return java.lang.String
+     */
+    @GetMapping("/getRunParameters")
+    @ResponseBody
+    public String getRunParameters(){
+        return iTankShellDeviceInfoService.getRunParameters();
+    }
+
     /**
      * 获取OEE统计数据
      * @author WenJY
diff --git a/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellThisMonthEnergy.java b/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellThisMonthEnergy.java
new file mode 100644
index 0000000..da23dd7
--- /dev/null
+++ b/productionboard/src/main/java/com/productionboard/entity/TankShellDevice/TankShellThisMonthEnergy.java
@@ -0,0 +1,26 @@
+package com.productionboard.entity.TankShellDevice;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author WenJY
+ * @date 2022年06月09日 10:02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("SCADA_UK_DEVICEINFO_5")
+public class TankShellThisMonthEnergy implements Serializable {
+
+    @TableField("PRODUCTION")
+    public String production;
+
+    @TableField("HOURENERGY")
+    public String energy;
+}
diff --git a/productionboard/src/main/java/com/productionboard/mapper/TankShellThisMonthEnergyMapper.java b/productionboard/src/main/java/com/productionboard/mapper/TankShellThisMonthEnergyMapper.java
new file mode 100644
index 0000000..febfc5b
--- /dev/null
+++ b/productionboard/src/main/java/com/productionboard/mapper/TankShellThisMonthEnergyMapper.java
@@ -0,0 +1,13 @@
+package com.productionboard.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.productionboard.entity.TankShellDevice.TankShellThisMonthEnergy;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author WenJY
+ * @date 2022年06月09日 10:04
+ */
+@Mapper
+public interface TankShellThisMonthEnergyMapper extends BaseMapper<TankShellThisMonthEnergy> {
+}
diff --git a/productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java b/productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java
index ed2ae80..64cd68e 100644
--- a/productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java
+++ b/productionboard/src/main/java/com/productionboard/service/ITankShellDeviceInfoService.java
@@ -15,6 +15,14 @@ public interface ITankShellDeviceInfoService {
      */
     public String getDataInformationJson();
 
+    /**
+     * 获取运行参数,整合产量能耗、运行参数、loss、标准节拍参数
+     * @author WenJY
+     * @date 2022-06-09 10:09
+     * @return java.lang.String
+     */
+    public String getRunParameters();
+
     /**
      * 获取能耗产量对比JSON
      * @author WenJY
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 fae276b..abe5dce 100644
--- a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java
+++ b/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java
@@ -2,17 +2,19 @@ package com.productionboard.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.productionboard.entity.TankShellDevice.TankShellDeviceDataInformation;
-import com.productionboard.entity.TankShellDevice.TankShellEnergyConsumption;
-import com.productionboard.entity.TankShellDevice.TankShellOeeStatistics;
-import com.productionboard.mapper.TankShellDeviceDataInformationMapper;
-import com.productionboard.mapper.TankShellEnergyConsumptionMapper;
-import com.productionboard.mapper.TankShellOeeStatisticsMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.productionboard.entity.AluminumDevice.AluminumDeviceDataInformation;
+import com.productionboard.entity.AluminumDevice.AluminumThisMonthEnergy;
+import com.productionboard.entity.AluminumDevice.AluminumYesterdayEnergy;
+import com.productionboard.entity.TankShellDevice.*;
+import com.productionboard.mapper.*;
 import com.productionboard.service.ITankShellDeviceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -25,6 +27,9 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi
     @Autowired
     private TankShellDeviceDataInformationMapper tankShellDeviceDataInformationMapper;
 
+    @Autowired
+    private TankShellThisMonthEnergyMapper tankShellThisMonthEnergyMapper;
+
     @Autowired
     private TankShellEnergyConsumptionMapper tankShellEnergyConsumptionMapper;
 
@@ -35,12 +40,53 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi
 
     private SimpleDateFormat hourFormat = new SimpleDateFormat("HH");
 
+    private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
     @Override
     public String getDataInformationJson() {
         List<TankShellDeviceDataInformation> tankShellDeviceDataInformations = tankShellDeviceDataInformationMapper.selectList(null);
         return JSONArray.toJSONString(tankShellDeviceDataInformations);
     }
 
+    @Override
+    public String getRunParameters() {
+        String[] result = new String[10];
+        try{
+            List<TankShellThisMonthEnergy> tankShellThisMonthEnergies = tankShellThisMonthEnergyMapper.selectList(null);
+
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(new Date());
+            calendar.add(Calendar.DATE,-1);
+            String lastDate = simpleDateFormat.format(calendar.getTime()).substring(0,10)+" 00:00:00";;
+            //昨日产量、能耗
+            QueryWrapper<TankShellEnergyConsumption> wrapper = new QueryWrapper<TankShellEnergyConsumption>();
+            wrapper.eq("createTime",simpleDateFormat.parse(lastDate));
+            List<TankShellEnergyConsumption> tankShellYesterdayEnergies = tankShellEnergyConsumptionMapper.selectList(wrapper);
+
+            result[0] = tankShellYesterdayEnergies.size() > 0 ? tankShellYesterdayEnergies.get(0).getProduction():"0";
+            result[1] = tankShellYesterdayEnergies.size() > 0 ? tankShellYesterdayEnergies.get(0).getEnergy():"0";
+            result[2] = tankShellThisMonthEnergies.size() > 0 ? tankShellThisMonthEnergies.get(0).getProduction():"0";
+            result[3] = tankShellThisMonthEnergies.size() > 0 ? tankShellThisMonthEnergies.get(0).getEnergy():"0";
+
+            List<TankShellDeviceDataInformation> deviceDataInformations = tankShellDeviceDataInformationMapper.selectList(null);
+            if(deviceDataInformations.size() > 0){
+                TankShellDeviceDataInformation tankShellDeviceDataInformation = deviceDataInformations.get(0);
+                result[4] = tankShellDeviceDataInformation.getRunTime();
+                result[5] = tankShellDeviceDataInformation.getStopTime();
+                result[6] = tankShellDeviceDataInformation.getDeviceOee();
+                result[7] = "0";
+                result[8] = tankShellDeviceDataInformation.getRunTime();
+                result[9] = tankShellDeviceDataInformation.getDeviceTakt();
+            }
+
+        }catch (Exception e){
+            System.out.println("箱壳设备看板getRunParameters方法异常:"+e.getMessage());
+            result[0] = "-";
+        }
+
+        return JSONArray.toJSONString(result);
+    }
+
     @Override
     public String getEnergyConsumptionJson() {
         List<TankShellEnergyConsumption> tankShellEnergyConsumptions = tankShellEnergyConsumptionMapper.selectList(null);
diff --git a/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class b/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class
index c56388aefd09b80a18ac5c53e436492823c3d34c..e2c424cb7b39812bd3117618d27c5972955c838b 100644
GIT binary patch
literal 1782
zcma)6>rWFw5T7kAg;J%IhZGgTCzQwfs6f$}AP<A7VkqH@pSIU+S!i$1y*;r1l_naa
zAN&LSql~k6wY24$G?&cX&f_=po0+{oe}DZ3fE;WlAOXumurdt8uxbPyfyeN~h^Iz8
zGa?s<=W$pga8n#H`>c4vYqcGIE-b!pS7ebZ^GP6Iuw<P&N|rrK3u%`mQ)TJ~X1d=y
z^aX*;p=WDR=f}bor5fL|ZK;_7aS3b`q^eTaQNpfP6sz+Ksm^GLGux#VW@)J!l(hor
zmZ#-~P`r$=gO1`A@tHunaLUdZtuebwi`pO=>q}t^{ffZA!s0Q3=(a2)jnRUz`FpQk
z;_8TDEhbo6tai+lFz2Q+s!s$Kw;4*>lD1Z|R^y6x(cW%Zuz;Ab%N(nlSXd0JFBeMu
zf|qCs1KT;j;rbnOoPbuk%JmM@%nV1>{Vrmvb5`?^%Qy|QuJxVikh=~}g};{N1~QmH
zv|XF4Y6FS6UfnS>BQVLkb#Gl?Z?cE@r%;U>@PV1}YOb)cW5%^hXR;k|UNo!WYGJtn
z>X;1CneYx@0*RvZl*RXi8R~4$!K|89A+QwM6Bn!FQa2n<J4PA4q+zo<<exn5w#_R=
zb?2>0!Wg6pq*`iP_HSDfMj@4i5lF^iJqa6-NkZO;yGGoH4BnNnE7;FAV!F#4a!@+u
zmL{+shStZ0CNPEF@7lp&R?}#>vH->e^Z55k;9n_%4^jjI*YGrm@9Vx6xi`<)9n_BF
zDUZGc-y_){K(gt`cNqBUJ5QiYpb@Z@QJ8{B{4$W}il-a+CNK>d^e`|KPsSF@euIH8
z_z?jEU~&V@v<1hS!T&3pK|B5yTR^!cPy&IXKOsh-8*Q!)EzyRS#+)-4ed{9-7jDC>
zk9?<vyn{AFCmA3Q5-2QPVh2>0k@AX<KNa{k@r`v3yBBn{Gt+!C6Rr??nPzlxh+pN9
x?~B8|CNl126S<4SP#A|@<gnL+!-F0i9{QOg@Cd7qz=FRwhUFrjv#p*k{R7fJrwRZ7

literal 1944
zcma)6*>W326g@3lmMu>bN7zn60GlP?1-n^H65Ao*B?&f)O<5^dQ9QLqZKadZwCL%v
z(I@c06K{M)puj1X;sf{(c+DTAxILrDk}|Gxsnk7v``&ZU-TI&BfBX$#2|GoM;e%m(
zID!lK$Sog_lK2z1Tpz&=+$><Zh+(I*;`UXy+$!Qz+;%#j74UfhYYbP_0}(#1Jd{DO
zDG!w|x55Kmk;Z*8ESG)V;7y}zv2T?Qt6G>EkJ4+tb-L*)!<D@_w5lQZRivtcTnj^O
zg#(EgZkDyF^QdW5SU)hLA&<0q%&Ss_5kC;V)uzQo$AGWJRv#%NYXm#gH1a@w$51Li
z5{H5ZBCPX@bx7{^mI{@<%`h-CyU#GVp=%Vzg|Z6ePTZ(U^FR<6XRLh@><gpZxh)*D
z4;7JH$qd@pp*1=Pq~U#GZ**>mKwgD4N$kdFX0!M$Wd?pEtGr5v-7(*j_P%H~)38c)
zX*Y!xt~jQVWRYAQiXf&~Ug24{*U#)}Pex6uid@&V7DX^lXm>(s>MaT^iW^N=GlmJ-
zFWZh1x$~Z(?_hSNthky-R{2q?eo<%097K;UL$RV`<IB6sRqKsYGrs70fMGr}*vLvF
zwQV&e@2OFC_hl7fPktNAsH+fT-1d%(hfBE3FxC<CS~5l+CNSyYB1#3Ud)UB~hfPcs
zaL2=4++(=Z-@WUx3To0Yocr(lAOHQ~$#!LT=h<IBdH4cb9=4tBmmbQv?_ma0G(%aV
zd6q6EwkN)KtB<5_8E#~uong=!CaHLRy_uH!a#mxcS6u`uEh<xk23E&JV<H_IrTJGh
z(U#^~iiVqO8U-2F7#3z;9;=rpt({9U9JV@r9B59GsC%Iq3hoiIf$Q)r=zY9NkLwsc
zx;gq$IYB^l8lrtXky4#$&(oPYfz~T@S|(ja`{>+Lu(?w1Hw^roD8EW;kuE_{gJgJ>
zzPwZwui<q%QMY4?G#m`4lY`06{fdDn^pS%DaK1rbC&u}<@e5|tbkB(S3!tSoP?3NJ
ze@C97A8on|t=NTDBA?S_{nj^N5#Gi-3G%fLvcNzR&b1VIh@t!o3V&kw>!%ng6^}7G
zPyb_h$2d2C;`BV30q;{T76^1PaXy&>wVfA9_AX^8O?NMi_u4dQ4#>u3YLoO_R=t$Q
sd7{zfEzS4}d0XxB<aIpdFnfxpxx`Zr^MsuvzAnLz%L46-owV@(0Ss5_mH+?%

diff --git a/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class b/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class
index 18e1646f2fb1c0e088580ea1d7bdc16e32a9ab5f..7851bc0619e4bfa57f9a6225748d2914701b00c5 100644
GIT binary patch
delta 89
zcmbQsw1Y|D)W2Q(7#J8#7<kwjxY!xECkhw|3Z$o&1eN9mBo-y+rk11@6;E{7rOm>^
d$iU3N!oUEeS)nu=lx7Ff42%pMK$3}p69A-P4v_!=

delta 44
zcmdnNG?z)>)W2Q(7#J8#7`WLPIN2GvCJGo$4Bf%VJeiMCf{THXfgLEx#J~Xn{*ee(

diff --git a/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class
index dbd2110da94f847067cb346a87dc1362e55a4dfd..98401d18757584a9ef6d1ebf9a042399e950175f 100644
GIT binary patch
literal 7444
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

delta 1535
zcmZWoTU1n482<K|IcFbcHp~SEf;0#MYle#&kP!h2D4-)EDWZ0nWJE|V!er2GGR>~0
zbu=r=Oe^E1Ws8E)RjY>{TD{a-J@?*YZ?#%2?b|a0)N-wvz5o0F@9+Q4*@l_2<WD!Q
zeFvZxvmV@uJreyk_IhAoUlvNR-^RoGencOSdhr-y9z2c%S{?8rj+n$j53;exi$NTc
z7}EE!#1kF_aabQCy4a|VCLK0rqs7KXoj&fx5yVyp+59P;H08mx4xYx-63<9HEAgDu
zB7SfV7=O-<xDE>ES6OG|?sEd}Jjb?&oE>u1!?@=;fkd;Du<J!oJH;+%+-jfugSu6X
z8i68bt*fX}z>G$#1_l(WkyMDFQo!iwP^dzsLK*IoctPP9UX(blZ~`wWtijz9Ck2X~
z9=o`VtrT9yD+2!E*wI+c;n?V4O>bgiXmn8FRlFw9?i{mfokkhxR(Kut3UA<)!kaj)
za0YKF+=H;h+sxlIHkO!7OvJ{c@x-CAfk~eQ$B(l<iF1DRD7=I73h&}QiT4#|@WEVn
z_N;KO`iJtf2IGnL(fGvRv_LlH)`@s55qD1cwmQEB2;7IbAP{nX$;q>Jdx-K!b5p@K
zp>R>*V|=Qx13k`<xwQtaI5%>CH}SbZxpO41z%fGWlO<$;Kq*XajDS!s=XNaK6}%0N
z$1OI#=@uKYO~n&g-X{Ir1JAY8df=u66o(fe!q;K+2VDzre+@J2{2WrrFH@Q8c;>*x
zvw-oX2ymM9)Koeb_mZ%nT!;Eh-MyU8pv@ot3bt58mVs@NZ{WE~n+v+0<{|h3FZZBp
z<)`B_wY;43K5R&`-2HUwMrl(6C4mQ)8i|t(l#KX-jl686*yuX4`xlTCjV!_^Z~<r1
z!ng2mUzQr&E28PDw?bB0zl4q|${}kJ0RzeJ5u8VEZ=rj|wq!Cx7JHgYp(%6TJVL!E
zEOF)LTxBr7Y90lBmBHHz-D#n)&`b##9NZ}!n&9L3)qGwJa=DXLv{n$2bwr{uNl3f+
z*8K!y3>(PnI-EuW&J%%)Xv8d<Qs8wEgJ!a+5f73e6*x|Na|-Awv`})>GlGqjOpVnt
z$d|E+RRtT*pcQRg!3x^imu#nVGgC_8y2)%Qu|=XoqEn(P{Udw+M)zMRWaQSRwcs2}
zX}+u>L`7W7?Rx*2b@(FTYkVdavD$zpMYK}WA`M4=YQk2+(S|(TzXYA+eOKz4CFz>W
z<FCTD)cED>7RC1ejjw&(ndxnae^A1~{f7SJ7^k`4$!eN|fe43`k$K#~?aiaOZ-w;3
zX_jt=A6x#z(m-Yc=3*y$+2tYDF$H$|^*eS^F|d32bM2%43I84jUczU%Ot2=XYgSKk
Khy<R*(SHFz0Or&H