From a8e83fffb1b4c976e5a41765a8540c1444a18456 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Fri, 30 Sep 2022 14:01:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=93=9D=E5=86=85?= =?UTF-8?q?=E8=83=86=E8=AE=BE=E5=A4=87=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TankShellController.java | 5 ++++- .../controller/TankShellController.class | Bin 3389 -> 3603 bytes 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/productionboard/src/main/java/com/productionboard/controller/TankShellController.java b/productionboard/src/main/java/com/productionboard/controller/TankShellController.java index e26f58f..c07a676 100644 --- a/productionboard/src/main/java/com/productionboard/controller/TankShellController.java +++ b/productionboard/src/main/java/com/productionboard/controller/TankShellController.java @@ -90,7 +90,10 @@ public class TankShellController { @GetMapping("/getMaterialStoreJson") @ResponseBody public String getMesMaterialStoreStatisticsJson(){ - List mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("1002"); + List list=new ArrayList(2); + list.add("L001"); + list.add("U001"); + List mesMaterialStoreStatisticsList= iMesProductionDataService.getMesMaterialStoreStatisticsListByList(list); return JSONArray.toJSONString(mesMaterialStoreStatisticsList); } diff --git a/productionboard/target/classes/com/productionboard/controller/TankShellController.class b/productionboard/target/classes/com/productionboard/controller/TankShellController.class index 13c2d4a469a426a89ec3de06576cef67ac10b1f2..a68172058af14b353acd127853f352aea1c1b9ef 100644 GIT binary patch delta 1253 zcmZuwOHUI~6#nk?F`af&Lxob_E%In7+SUgurA1Itw19|Ec@!9Eg+i$c)o7w2tc?pZ zapA(1acdwoQ8c)8;mV!A!1y1GF`he9N~;q8uXkHN-{fViAf;}aUG6MWG8%A~ zUW)~TAsP2@pX^c1Ud3Aehxx70V)XX=#uyArGRaWkEs;Jnx0IUCg?$qYt?ELF;3S}gJ+P?&-j(2`ID@bF&@)1E zQgzuHVvXu+Yh{9ioto2M0P|k9!B4<;ig8uC=Qvp>$YTNf1Gh-3IE{m_UWx=K!PXGM zN%AqA(kaz4TZdMwgQ^4~^imWR=%zmPXtH(Y<|1}UJj&g1xPBS$6w^1Qrp#38xK2C!+PA5!cCm>;(x;jIQv$O+>rqivzThJ*{ zewU`Rg)kAa1Z`Hln|drtiuG7G`D)hb;r)ZUP!Qi!6dxf7-wl()8T0QgnZBh@i2r#> l$95OZK#*SA@Wc9ZQKJxW3G`PGaJksRK4Q5-5PfB?{sUSPo#_Ao delta 1050 zcmZ{iOHUI~7>3`O=`ihdLeg?=t+k5v(iYnyR#A&qtD;sa-lZ0pdIN(l08Lo2a-+-h z2iUmRVB#gwAHeU?jWNde%nW1Enn}*(yS>jh=M#x9aeMRE=dS=pF>j&|)gaD=(2MhO zxe&xe7#DFVjLWFW<%)?()D2uUVanJk>Aq&*x`}R7<>f{YH|2gSh}#D47`XfHSwmH( zH#XHDikf^X>UvDHw5s?P8W8jPcP)XPVy>$<7sn0@{TNUXC>9DO0}TuJ&@?b@VFt4n z=3pCWS-6h}V!dl3^AJr1Jx}ZxcK-Rw!eYL%v}CW=7M52mJd!S1X2il{G&hEfH>y|< zBumnb-E6IoEvx(}2nB<@b#ae5R+4Zxcqbdzq*yc)YrAMOnE^%zXixEE(F=rGaSwL| zL)goRB+q%?q)*ShhxV2S6|#U70mD;V-DKTM-a<&zqhOz3=ruE?s4&7shapOJV3_HL z*hQYDicYzHCoJogvnaP82UzN$C*@i)v}9=sLivf5ft=HOl(}hoh8s|pSvSuJ1qC1C zr3)cGgmY~SWipJD;S}Piv@xW8h8WqlGf2xwJ43uP!(oqM)MuFW7+Th#!_W;)&IN=eT^a;w0laH@QdurJ~Q)IiUt7Lf9rn)ss8gt5=;Z9wSI~pqA TOpfGf|36fCKf?@n0?z&hB12>< From e128512aa6a988cde8ddeeef3c69c71947eb526d Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Fri, 30 Sep 2022 14:09:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=AE=B1=E5=A3=B3?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TankShellDeviceController.java | 52 ++++++++++++------ .../resources/static/js/tankShell/device.js | 2 +- .../TankShellDeviceController.class | Bin 4036 -> 4585 bytes .../classes/static/js/tankShell/device.js | 2 +- 4 files changed, 38 insertions(+), 18 deletions(-) diff --git a/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java b/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java index 202dd3e..9430096 100644 --- a/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java +++ b/productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java @@ -3,7 +3,9 @@ package com.productionboard.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.productionboard.entity.AluminumDevice.AluminumLossStatistics; +import com.productionboard.entity.MesProduction.DeviceFault; import com.productionboard.entity.TankShellDevice.TankShellLossStatistics; +import com.productionboard.service.IMesProductionDataService; import com.productionboard.service.ITankShellDeviceInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -16,13 +18,15 @@ import java.util.List; /** * 箱壳自动成型线设备看板 + * * @author WenJY * @date 2022年06月06日 10:41 */ @Controller @RequestMapping("/tankShellDevice") public class TankShellDeviceController { - + @Autowired + private IMesProductionDataService iMesProductionDataService; @Autowired private ITankShellDeviceInfoService iTankShellDeviceInfoService; @@ -35,27 +39,28 @@ public class TankShellDeviceController { @GetMapping("/getDataInformation") @ResponseBody - public String getDataInformation(){ + public String getDataInformation() { return iTankShellDeviceInfoService.getDataInformationJson(); } /** * loss统计 + * + * @return java.lang.String * @author WenJY * @date 2022-06-10 11:28 - * @return java.lang.String */ @GetMapping("/getLossStatistics") @ResponseBody - public String lossStatistics(){ + public String lossStatistics() { List lossStatisticsList = iTankShellDeviceInfoService.getLossStatisticsList(); List jsonObjectList = new ArrayList<>(); - if(lossStatisticsList.size() > 0){ - lossStatisticsList.forEach(x->{ + if (lossStatisticsList.size() > 0) { + lossStatisticsList.forEach(x -> { JSONObject jsonObject = new JSONObject(); - jsonObject.put("name",x.getXValue()); - jsonObject.put("value",x.getYValue()); + jsonObject.put("name", x.getXValue()); + jsonObject.put("value", x.getYValue()); jsonObjectList.add(jsonObject); }); } @@ -65,51 +70,66 @@ public class TankShellDeviceController { /** * 设备产量能耗对比 + * + * @return java.lang.String * @author WenJY * @date 2022-06-08 18:01 - * @return java.lang.String */ @GetMapping("/getEnergyConsumption") @ResponseBody - public String getEnergyConsumption(){ + public String getEnergyConsumption() { String energyConsumptionJson = iTankShellDeviceInfoService.getEnergyConsumptionJson(); return energyConsumptionJson; } /** * 获取运行参数,整合产量能耗、运行参数、loss、标准节拍参数 + * + * @return java.lang.String * @author WenJY * @date 2022-06-08 15:53 - * @return java.lang.String */ @GetMapping("/getRunParameters") @ResponseBody - public String getRunParameters(){ + public String getRunParameters() { return iTankShellDeviceInfoService.getRunParameters(); } /** * 获取设备参数值 + * + * @return java.lang.String * @author WenJY * @date 2022-06-09 10:52 - * @return java.lang.String */ @GetMapping("/getDeviceParameterValue") @ResponseBody - public String getDeviceParameterValue(){ + public String getDeviceParameterValue() { return iTankShellDeviceInfoService.getDeviceParameterValue(); } /** * 获取OEE统计数据 + * + * @return java.lang.String * @author WenJY * @date 2022-06-08 18:23 - * @return java.lang.String */ @GetMapping("/getOeeStatistics") @ResponseBody - public String getOeeStatisticsJson(){ + public String getOeeStatisticsJson() { String oeeStatisticsJson = iTankShellDeviceInfoService.getOeeStatisticsJson(); return oeeStatisticsJson; } + + /** + * 设备故障排名 + * @return + */ + @GetMapping("/getStatisticalOutputByModel") + @ResponseBody + public String getStatisticalOutputByModel() { + List list = iMesProductionDataService.selectDeviceFaultByType("箱壳自动成型线"); + return JSONArray.toJSONString(list); + } } diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js index 7bc3fb6..979066f 100644 --- a/productionboard/src/main/resources/static/js/tankShell/device.js +++ b/productionboard/src/main/resources/static/js/tankShell/device.js @@ -9,7 +9,7 @@ $(() => { }, 1000); //设备故障排名 - $.getJSON('/tankShell/getStatisticalOutputByModel', function (result) { + $.getJSON('/tankShellDevice/getStatisticalOutputByModel', function (result) { equipmentFailure(result, document.getElementById("equipmentFailure")); }); diff --git a/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class b/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class index c5db8d5116ebff0316a071785cfb371ed98f3c33..17d8a13a59b32e3e63f0313538762dd0d144fa99 100644 GIT binary patch delta 1768 zcma)5OK=or5dLQJ*v;$!nH+32FU zpdc6&vyLx(KoqsqgG$9hgH?L*k0|h9zy}RO0osp>TTHh>3B^}Gy|i#~?w3=a zEKGm&^XZv|^JlJJ`PPFO6&buNp*k8r9MX)~kTzuflwVbBsdz;=zlzsXye@8U;G9+H z`L*UvyhXUWo-u7o3mMw@NT_#cOplu3`h5yp`u1G4w@#8;GqaTkmTy4zrVCQOcT}9mdnzKh&swRp zO7C0U$~EZ&tI5~XRl$)3av%#HAfbk@e4aP)lm-7c=-3$kQ>bU_DC?|`eHFoaTPIVN zBbVL{ys7*P_z*-RPYIjQM9eztH($wSVK3r))v1A%$0meCXZ3aZFC$IjUacY=(bL|P1?LvW!>u!=m~V>ewiSPZkH zx%Xcw?-3dJ6|rQZCVC_pCWmM3*C-nJ62+0mKuPd2)?CKg{>DHluVv!e&^V8BIgS2H zv~|cVVPtStylBU2bZ|AdbJ=#-oYXj&_7KvDL)(kp%*e~R+QUJS(MN58j5fa?y?$_x s_fjF_0gj$CdHZ`) zIkDS?xu{oSj~jcjPl^3HLI!l~a^nCFdU*e+(vBGjqe)$8R-#3Th!V$jv>KS9;MxqF zK)W(dI^k1BhjKloqf;tUE+bR#Ak^~_+GiL>aTQy?0Rb;r(xyMmEeTePJ+Jr(CH zoafSO;ev^axMboo`gFuiT)|Zn{R(HT5;aP!N1^3GEWB6 zvg3=nXV3%4#58&=p=R$E`)R2&hxav7UQ*GZ08|hVcEZ__bRJ8= z%X5LEaiG;nAo(@Ts+oYup9En{g77eqmoB~rh;9^PSpv>)!^zU=HHkX1moS=7a;zY#huvC9P2)|C{<%ouOamFT>{}({x7Kj4lxJ>; zpUBry#y{H@2T>;HSf0$WV!Y&y#87=U*}G{YNE4_lnrNZT!FI;0OXR9zD<;Nr)lkX2 zY)=1-RHY&rJmL`2DNpvL&r7t!X63+twX`~!E@xO_F!UHhhMjJ@z(le(a?8}n@kwm0 zOG5KyB%%N6g!QjZbg`tNS4935#N*yb(U17u$ugLm~rq8JVBplX3;Qa z4P$o5=gFWtN2y-l2r@NiV2O$$PLxtLAY#{+o zeqm~{l?e6Qxb4!g(z3AG0_Sc!H#Bmq9)#jA$aM#O?1|oqLE4JMhmd&0_kW1CdWQ{+ Jbr?s`_#0ksrr7`h diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js index 7bc3fb6..979066f 100644 --- a/productionboard/target/classes/static/js/tankShell/device.js +++ b/productionboard/target/classes/static/js/tankShell/device.js @@ -9,7 +9,7 @@ $(() => { }, 1000); //设备故障排名 - $.getJSON('/tankShell/getStatisticalOutputByModel', function (result) { + $.getJSON('/tankShellDevice/getStatisticalOutputByModel', function (result) { equipmentFailure(result, document.getElementById("equipmentFailure")); });