add - 箱壳可视化看板

.idea/encodings.xml

@@ -3,7 +3,5 @@
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/deviceboard/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/productionboard/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>

productionboard/src/main/java/com/productionboard/controller/TankShellDeviceController.java

@@ -0,0 +1,21 @@
+package com.productionboard.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 箱壳自动成型线设备看板
+ * @author WenJY
+ * @date 2022年06月06日 10:41
+ */
+@Controller
+@RequestMapping("/tankShellDevice")
+public class TankShellDeviceController {
+    private String prefix = "tankShell/device";
+
+    @GetMapping()
+    public String index() {
+        return prefix;
+    }
+}

productionboard/src/main/resources/application.yml

@@ -2,14 +2,14 @@
 spring:
   datasource:
     driver-class-name: oracle.jdbc.driver.OracleDriver
-#    url: jdbc:oracle:thin:@10.100.71.101:1521/orcl
+    url: jdbc:oracle:thin:@10.100.71.101:1521/orcl
-#    username: aucma
-#    password: aucma
-    url: jdbc:oracle:thin:@124.70.0.226:1521/scada
     username: aucma
-    password: 123456
+    password: aucma
+#    url: jdbc:oracle:thin:@124.70.0.226:1521/scada
+#    username: aucma
+#    password: 123456
 mybatis-plus:
   mapper-locations: classpath*:/mapper/**Mapper.xml
 
 server:
-  port: 6069
+  port: 6066

productionboard/src/main/resources/static/css/tankShell/device.css

@@ -0,0 +1,62 @@
+body {
+    background-color: aquamarine;
+    background: url(../../img/tankShell/tankShellDeviceBackground.jpg);
+    background-position: center center;
+    background-repeat: no-repeat;
+    background-attachment: fixed;
+    background-size: 100% 100%;
+}
+
+.dataInformation{
+    border: 1px solid red;
+    position: absolute;
+    width: 24%;
+    height: 22%;
+    top: 14%;
+    left: 3.3%;
+}
+
+.theEnergyConsumptionContrast{
+    border: 1px solid red;
+    position: absolute;
+    width: 24.1%;
+    height: 21%;
+    top: 44%;
+    left: 3.3%;
+}
+
+.lossStatistics{
+    border: 1px solid yellowgreen;
+    position: absolute;
+    width: 24%;
+    height: 21%;
+    top: 44%;
+    right: 3.3%;
+}
+
+.deviceInfoTable{
+    border: 1px solid #6ACBFE;
+    position: absolute;
+    width: 33%;
+    height: 21%;
+    bottom: 5%;
+    left: 3.3%;
+}
+
+.oeeStatistics{
+    border: 1px solid cornflowerblue;
+    position: absolute;
+    width: 33%;
+    height: 21%;
+    bottom: 5%;
+    left: 38%;
+}
+
+.faultRank{
+    border: 1px solid bisque;
+    position: absolute;
+    width: 24%;
+    height: 21%;
+    bottom: 5%;
+    right: 3.3%;
+}

productionboard/src/main/resources/static/js/tankShell/device.js

@@ -0,0 +1,20 @@
+$(() => {
+    const statusArray = [0, 0, 0, 0, 0];
+    dataInformationFunction(statusArray);
+})
+
+const dataInformationFunction = (statusArray) => {
+    let info = `<table style="position: absolute;top: 8%;width: 100%;height:100%;">
+            <tr style="width: 100%; height: 50%;">
+                <td style="border:0px solid red;text-align:center;width: 50%;"><img src="../../img/foamBox/${statusArray[0] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="20%" height="40%"/>${statusArray[0] == 0 ? `<span style="color:green;margin-left: 10px">运行正常</span>` : `<span style="color:red;margin-left: 10px">运行异常</span>`}</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: #E6ECBE;">389kW</td>
+            </tr>
+            <tr style="width: 100%; height: 50%;">
+            
+                <td style="border:0px solid red;text-align:center;width: 50%;color: white;">4563kW·h</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: #D18DA2;">2</td>
+            </tr>
+        </table>`;
+
+    $("#dataInformation").append(info);
+}

productionboard/src/main/resources/templates/index.html

@@ -6,9 +6,12 @@
 </head>
 <body>
     <p> <a href="/adsorptionTank">吸附内胆</a></p>
-    <p> <a href="/aluminumTank">铝内胆</a></p>
+    <p> <a href="/aluminumTank">铝内胆生产数据监控</a></p>
+    <p><a href="/aluminumLiner">铝内胆成型线设备看板</a></p>
     <p> <a href="/preassemble">吸附内胆预装</a></p>
-    <p> <a href="/tankShell">箱壳</a></p>
+    <p> <a href="/tankShell">箱壳自动成型线生产看板</a></p>
+    <p> <a href="/tankShellDevice">箱壳自动成型线设备看板</a></p>
+
     <p> <a href="/foamBox">发泡</a></p>
     <p> <a href="/storage">门体库</a></p>
     <p> <a href="/aluminumLiner">铝内胆成型线</a></p>

productionboard/src/main/resources/templates/tankShell/device.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>箱壳成型数据监控平台</title>
+    <link rel="stylesheet" href="../../../css/tankShell/device.css">
+    <script src="../../../js/common/jquery.min.js"></script>
+    <script src="../../../js/common/echarts.min.js"></script>
+    <script src="../../../js/common/update-split-blocks.js"></script>
+    <script src="../../../js/common/echarts.common.js"></script>
+</head>
+<body>
+    <!--数据信息-->
+    <div class="dataInformation" id="dataInformation"></div>
+    <!--设备能耗产量对比-->
+    <div class="theEnergyConsumptionContrast" id="theEnergyConsumptionContrast"></div>
+    <!--loss统计-->
+    <div class="lossStatistics" id="lossStatistics"></div>
+    <!--设备信息列表-->
+    <div class="deviceInfoTable" id="deviceInfoTable"></div>
+    <!--oee统计-->
+    <div class="oeeStatistics" id="oeeStatistics"></div>
+    <!--故障率统计-->
+    <div class="faultRank" id="faultRank"></div>
+</body>
+<script src="../../../js/tankShell/device.js"></script>
+</html>

productionboard/target/classes/application.yml

@@ -2,12 +2,12 @@
 spring:
   datasource:
     driver-class-name: oracle.jdbc.driver.OracleDriver
-#    url: jdbc:oracle:thin:@10.100.71.101:1521/orcl
+    url: jdbc:oracle:thin:@10.100.71.101:1521/orcl
-#    username: aucma
-#    password: aucma
-    url: jdbc:oracle:thin:@124.70.0.226:1521/scada
     username: aucma
-    password: 123456
+    password: aucma
+#    url: jdbc:oracle:thin:@124.70.0.226:1521/scada
+#    username: aucma
+#    password: 123456
 mybatis-plus:
   mapper-locations: classpath*:/mapper/**Mapper.xml
 

productionboard/target/classes/templates/aluminumLiner/index.html

@@ -25,6 +25,9 @@
 
     <!--生产计划-->
     <div class="productionPlan" id="productionPlan"></div>
+    
+    <!--loss-->
+    <div class="productionPlan" id="productionPlan"></div>
 
 </body>
 <script src="../../../js/aluminumLiner/index.js"></script>

productionboard/target/classes/templates/index.html

@@ -6,9 +6,12 @@
 </head>
 <body>
     <p> <a href="/adsorptionTank">吸附内胆</a></p>
-    <p> <a href="/aluminumTank">铝内胆</a></p>
+    <p> <a href="/aluminumTank">铝内胆生产数据监控</a></p>
+    <p><a href="/aluminumLiner">铝内胆成型线设备看板</a></p>
     <p> <a href="/preassemble">吸附内胆预装</a></p>
-    <p> <a href="/tankShell">箱壳</a></p>
+    <p> <a href="/tankShell">箱壳自动成型线生产看板</a></p>
+    <p> <a href="/tankShellDevice">箱壳自动成型线设备看板</a></p>
+
     <p> <a href="/foamBox">发泡</a></p>
     <p> <a href="/storage">门体库</a></p>
     <p> <a href="/aluminumLiner">铝内胆成型线</a></p>

productionboard/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=productionboard
-groupId=com.scada
-version=0.0.1-SNAPSHOT

productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,16 +0,0 @@
-com\productionboard\common\CodeGenerator.class
-com\productionboard\common\CodeGenerator$1.class
-com\productionboard\entity\BasicScadaDeviceinfo.class
-com\productionboard\controller\FoamBoxController.class
-com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.class
-com\productionboard\controller\StorageController.class
-com\productionboard\common\CodeGenerator$2.class
-com\productionboard\mapper\BasicScadaDeviceinfoMapper.class
-com\productionboard\config\MybatisPlusConfig.class
-com\productionboard\controller\AluminumLinerkController.class
-com\productionboard\controller\PreassembleController.class
-com\productionboard\service\BasicScadaDeviceinfoService.class
-com\productionboard\ProductionBoardApplication.class
-com\productionboard\controller\TankShellController.class
-com\productionboard\controller\AluminumTtankController.class
-com\productionboard\controller\AdsorptionTankController.class

productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,15 +0,0 @@
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\controller\TankShellController.java
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\controller\StorageController.java
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.java
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java
-E:\<5C><><EFBFBD><EFBFBD>\<5C>Ŀ<EFBFBD><C4BF>꿴<EFBFBD><EABFB4><EFBFBD>޸<EFBFBD>\<5C><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>\visualboard\productionboard\src\main\java\com\productionboard\controller\OEEStatisticskController.java
-