Merge remote-tracking branch 'origin/master'

2 years ago · a9d521c7fb
parent 9d2373cb9c daa3eabcb7
commit a9d521c7fb
23 changed files with 135 additions and 103 deletions
--- a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar
+++ b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar
--- a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original
+++ b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original
--- a/deviceboard/target/maven-archiver/pom.properties
+++ b/deviceboard/target/maven-archiver/pom.properties
@ -0,0 +1,3 @@
+artifactId=deviceboard
+groupId=com.scada
+version=0.0.1-SNAPSHOT
--- a/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@ -1,2 +1,2 @@
-E:\桌面\澳柯玛看板修改\scada-visual-board\deviceboard\src\main\java\com\deviceboard\controller\TestController.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\deviceboard\src\main\java\com\deviceboard\DeviceBoardApplication.java
+C:\Users\ADMIN\Desktop\visualboard\deviceboard\src\main\java\com\deviceboard\DeviceBoardApplication.java
+C:\Users\ADMIN\Desktop\visualboard\deviceboard\src\main\java\com\deviceboard\controller\TestController.java
--- a/deviceboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ b/deviceboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
--- a/deviceboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/deviceboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
--- a/productionboard/src/main/resources/static/js/common/echarts.common.js
+++ b/productionboard/src/main/resources/static/js/common/echarts.common.js
@ -1529,12 +1529,9 @@ const multipleThreeDimensionalCylindrical = (res, ids) => {

 //设备OEE统计
 const OEEStatistics = (res, ids) => {
-    console.log(res);
    let mycharts = echarts.init(ids);
    let xAxisData = res.map(val => val.yValue);
    let yAxisData = res.map(val => val.xValue);
-    console.log(xAxisData);
-    console.log(yAxisData);

    let option = {
        tooltip: {},
--- a/productionboard/src/main/resources/static/js/tankShell/device.js
+++ b/productionboard/src/main/resources/static/js/tankShell/device.js
@ -57,27 +57,36 @@ $(() => {

    /*数据信息*/
    const statusArray = [0, 0, 0, 0, 0];
-    dataInformationFunction(statusArray);
-
-    energyProductionStatisticsFunction(statusArray);
-
-    runParamStatisticsFunction(statusArray);
-
-    $("#lossParam").text(123.87);
-
-    $("#meterParam").text(123.65);
+    // var a = () => {
+        $.getJSON('/tankShellDevice/getDataInformation', function (result) {
+            dataInformationFunction(result)
+        });
+        $.getJSON('/tankShellDevice/getRunParameters', function (result) {
+            console.log(result);
+            energyProductionStatisticsFunction(result)
+            runParamStatisticsFunction(result)
+            $("#lossParam").text(result[8]);
+        
+            $("#meterParam").text(result[9]);
+        });
+        $.getJSON('/tankShellDevice/getRunParameters', function (result) {
+            runParamStatisticsFunction(result)
+        });
+    // }
 })

 /*数据信息*/
 const dataInformationFunction = (statusArray) => {
+    let res = statusArray[0]
+    console.log(res);
    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%;"><i ${statusArray[0] == 1 ? 'style="color:green;"' : 'style="color: red;"'}  class="fa-regular ${statusArray[0] == 1 ? "fa-circle-check" : "fa-circle-xmark"}"></i>${statusArray[0] == 1 ? `<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>
+                <td style="border:0px solid red;text-align:center;width: 50%;"><i ${res.deviceStatus == 1 ? 'style="color:green;"' : 'style="color: red;"'}  class="fa-regular ${res.deviceStatus == 1 ? "fa-circle-check" : "fa-circle-xmark"}"></i>${res.deviceStatus == 1 ? `<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;"> ${res.devicePower}kW</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: white;"> ${res.deviceEnergy}kW·h</td>
                <td style="border:0px solid red;text-align:center;width: 50%;color: #D18DA2;">2</td>
            </tr>
        </table>`;
@ -89,10 +98,10 @@ const dataInformationFunction = (statusArray) => {
 const energyProductionStatisticsFunction = (statusArray) => {
    let info = `<table style="position: absolute;top: 8%;width: 100%;height:100%;">
            <tr style="width: 100%; height: 100%;">
-                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #76BBE8;">68</td>
-                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #8AE9A0;">675</td>
-                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #76BBE8;">68</td>
-                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #8AE9A0;">675</td>
+                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #76BBE8;">${statusArray[0]}</td>
+                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #8AE9A0;">${statusArray[1]}</td>
+                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #76BBE8;">${statusArray[2]}</td>
+                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #8AE9A0;">${statusArray[3]}</td>
            </tr>
        </table>`;

@ -101,10 +110,10 @@ const energyProductionStatisticsFunction = (statusArray) => {

 const runParamStatisticsFunction = (statusArray) => {
    let info = `
-        <div style="font-size:175%;left: 9%;color:#76BBE8">68</div>
-        <div style="font-size:175%;left: 35%;color:#C0818B">685</div>
-        <div style="font-size:175%;left: 61%;color: #8AE9A0">685</div>
-        <div style="font-size:175%;left: 87%;color:#D5D2AA">685</div>
+        <div style="font-size:175%;left: 9%;color:#76BBE8">${statusArray[4]}</div>
+        <div style="font-size:175%;left: 35%;color:#C0818B">${statusArray[5]}</div>
+        <div style="font-size:175%;left: 61%;color: #8AE9A0">${statusArray[6]}</div>
+        <div style="font-size:175%;left: 87%;color:#D5D2AA">${statusArray[7]}</div>
    `;

    $("#runParamStatistics").append(info);
--- a/productionboard/src/main/resources/templates/tankShell/device.html
+++ b/productionboard/src/main/resources/templates/tankShell/device.html
@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
    <meta charset="UTF-8">
    <title>箱壳成型数据监控平台</title>
@ -13,6 +14,7 @@
    <script src="../../../js/common/scrollTable.js"></script>
    <script src="../../../js/common/date-time-common.js"></script>
 </head>
+
 <body>
    <!--数据信息-->
    <div class="dataInformation" id="dataInformation"></div>
@ -20,31 +22,32 @@
    <div class="energyProductionStatistics" id="energyProductionStatistics"></div>
    <!--运行参数统计-->
    <div class="runParamStatistics" id="runParamStatistics"></div>
-<div style="font-size: 16px">
-    <!--loss参数-->
-    <span class="lossParam" id="lossParam"></span>
+    <div style="font-size: 16px">
+        <!--loss参数-->
+        <span class="lossParam" id="lossParam"></span>
+
+        <!--节拍参数-->
+        <span class="meterParam" id="meterParam"></span>
+    </div>

-    <!--节拍参数-->
-    <span class="meterParam" id="meterParam"></span>
-</div>


-    
    <!--设备OEE统计-->
    <div class="OEEStatistics" id="OEEStatistics"></div>
-    
+
    <!--设备故障排名-->
    <div class="equipmentFailure" id="equipmentFailure"></div>
-    
+
    <!--loss-->
    <div class="loss" id="loss"></div>
-    
+
    <!--设备信息-->
    <div class="productionPlan" id="productionPlan"></div>
-    
+
    <!--设备产量能耗对比-->
    <div class="energyConsumption" id="energyConsumption"></div>

 </body>
 <script src="../../../js/tankShell/device.js"></script>
+
 </html>
--- a/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.class
+++ b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.class
--- a/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellThisMonthEnergy.class
+++ b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellThisMonthEnergy.class
--- a/productionboard/target/classes/com/productionboard/mapper/TankShellDeviceDataInformationMapper.class
+++ b/productionboard/target/classes/com/productionboard/mapper/TankShellDeviceDataInformationMapper.class
--- a/productionboard/target/classes/com/productionboard/mapper/TankShellThisMonthEnergyMapper.class
+++ b/productionboard/target/classes/com/productionboard/mapper/TankShellThisMonthEnergyMapper.class
--- a/productionboard/target/classes/static/js/common/echarts.common.js
+++ b/productionboard/target/classes/static/js/common/echarts.common.js
@ -1529,12 +1529,9 @@ const multipleThreeDimensionalCylindrical = (res, ids) => {

 //设备OEE统计
 const OEEStatistics = (res, ids) => {
-    console.log(res);
    let mycharts = echarts.init(ids);
    let xAxisData = res.map(val => val.yValue);
    let yAxisData = res.map(val => val.xValue);
-    console.log(xAxisData);
-    console.log(yAxisData);

    let option = {
        tooltip: {},
--- a/productionboard/target/classes/static/js/tankShell/device.js
+++ b/productionboard/target/classes/static/js/tankShell/device.js
@ -57,27 +57,36 @@ $(() => {

    /*数据信息*/
    const statusArray = [0, 0, 0, 0, 0];
-    dataInformationFunction(statusArray);
-
-    energyProductionStatisticsFunction(statusArray);
-
-    runParamStatisticsFunction(statusArray);
-
-    $("#lossParam").text(123.87);
-
-    $("#meterParam").text(123.65);
+    // var a = () => {
+        $.getJSON('/tankShellDevice/getDataInformation', function (result) {
+            dataInformationFunction(result)
+        });
+        $.getJSON('/tankShellDevice/getRunParameters', function (result) {
+            console.log(result);
+            energyProductionStatisticsFunction(result)
+            runParamStatisticsFunction(result)
+            $("#lossParam").text(result[8]);
+        
+            $("#meterParam").text(result[9]);
+        });
+        $.getJSON('/tankShellDevice/getRunParameters', function (result) {
+            runParamStatisticsFunction(result)
+        });
+    // }
 })

 /*数据信息*/
 const dataInformationFunction = (statusArray) => {
+    let res = statusArray[0]
+    console.log(res);
    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%;"><i ${statusArray[0] == 1 ? 'style="color:green;"' : 'style="color: red;"'}  class="fa-regular ${statusArray[0] == 1 ? "fa-circle-check" : "fa-circle-xmark"}"></i>${statusArray[0] == 1 ? `<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>
+                <td style="border:0px solid red;text-align:center;width: 50%;"><i ${res.deviceStatus == 1 ? 'style="color:green;"' : 'style="color: red;"'}  class="fa-regular ${res.deviceStatus == 1 ? "fa-circle-check" : "fa-circle-xmark"}"></i>${res.deviceStatus == 1 ? `<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;"> ${res.devicePower}kW</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: white;"> ${res.deviceEnergy}kW·h</td>
                <td style="border:0px solid red;text-align:center;width: 50%;color: #D18DA2;">2</td>
            </tr>
        </table>`;
@ -89,10 +98,10 @@ const dataInformationFunction = (statusArray) => {
 const energyProductionStatisticsFunction = (statusArray) => {
    let info = `<table style="position: absolute;top: 8%;width: 100%;height:100%;">
            <tr style="width: 100%; height: 100%;">
-                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #76BBE8;">68</td>
-                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #8AE9A0;">675</td>
-                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #76BBE8;">68</td>
-                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #8AE9A0;">675</td>
+                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #76BBE8;">${statusArray[0]}</td>
+                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #8AE9A0;">${statusArray[1]}</td>
+                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #76BBE8;">${statusArray[2]}</td>
+                <td style="font-size:175%;border:0px solid red;width: 25%;text-align:center;color: #8AE9A0;">${statusArray[3]}</td>
            </tr>
        </table>`;

@ -101,10 +110,10 @@ const energyProductionStatisticsFunction = (statusArray) => {

 const runParamStatisticsFunction = (statusArray) => {
    let info = `
-        <div style="font-size:175%;left: 9%;color:#76BBE8">68</div>
-        <div style="font-size:175%;left: 35%;color:#C0818B">685</div>
-        <div style="font-size:175%;left: 61%;color: #8AE9A0">685</div>
-        <div style="font-size:175%;left: 87%;color:#D5D2AA">685</div>
+        <div style="font-size:175%;left: 9%;color:#76BBE8">${statusArray[4]}</div>
+        <div style="font-size:175%;left: 35%;color:#C0818B">${statusArray[5]}</div>
+        <div style="font-size:175%;left: 61%;color: #8AE9A0">${statusArray[6]}</div>
+        <div style="font-size:175%;left: 87%;color:#D5D2AA">${statusArray[7]}</div>
    `;

    $("#runParamStatistics").append(info);
--- a/productionboard/target/classes/templates/tankShell/device.html
+++ b/productionboard/target/classes/templates/tankShell/device.html
@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
    <meta charset="UTF-8">
    <title>箱壳成型数据监控平台</title>
@ -13,6 +14,7 @@
    <script src="../../../js/common/scrollTable.js"></script>
    <script src="../../../js/common/date-time-common.js"></script>
 </head>
+
 <body>
    <!--数据信息-->
    <div class="dataInformation" id="dataInformation"></div>
@ -20,31 +22,32 @@
    <div class="energyProductionStatistics" id="energyProductionStatistics"></div>
    <!--运行参数统计-->
    <div class="runParamStatistics" id="runParamStatistics"></div>
-<div style="font-size: 16px">
-    <!--loss参数-->
-    <span class="lossParam" id="lossParam"></span>
+    <div style="font-size: 16px">
+        <!--loss参数-->
+        <span class="lossParam" id="lossParam"></span>
+
+        <!--节拍参数-->
+        <span class="meterParam" id="meterParam"></span>
+    </div>

-    <!--节拍参数-->
-    <span class="meterParam" id="meterParam"></span>
-</div>


-    
    <!--设备OEE统计-->
    <div class="OEEStatistics" id="OEEStatistics"></div>
-    
+
    <!--设备故障排名-->
    <div class="equipmentFailure" id="equipmentFailure"></div>
-    
+
    <!--loss-->
    <div class="loss" id="loss"></div>
-    
+
    <!--设备信息-->
    <div class="productionPlan" id="productionPlan"></div>
-    
+
    <!--设备产量能耗对比-->
    <div class="energyConsumption" id="energyConsumption"></div>

 </body>
 <script src="../../../js/tankShell/device.js"></script>
+
 </html>
--- a/productionboard/target/maven-archiver/pom.properties
+++ b/productionboard/target/maven-archiver/pom.properties
@ -0,0 +1,3 @@
+artifactId=productionboard
+groupId=com.scada
+version=0.0.1-SNAPSHOT
--- a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@ -4,6 +4,7 @@ com\productionboard\common\CodeGenerator$1.class
 com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.class
 com\productionboard\entity\BasicScadaDeviceinfo.class
 com\productionboard\controller\FoamBoxController.class
+com\productionboard\mapper\TankShellDeviceDataInformationMapper.class
 com\productionboard\service\IAluminumDeviceInfoService.class
 com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.class
 com\productionboard\controller\StorageController.class
@ -22,6 +23,7 @@ com\productionboard\mapper\TankShellEnergyConsumptionMapper.class
 com\productionboard\controller\AluminumLinerkController.class
 com\productionboard\controller\PreassembleController.class
 com\productionboard\service\BasicScadaDeviceinfoService.class
+com\productionboard\entity\TankShellDevice\TankShellDeviceDataInformation.class
 com\productionboard\mapper\AluminumDeviceDataInformationMapper.class
 com\productionboard\ProductionBoardApplication.class
 com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.class
@ -29,7 +31,9 @@ com\productionboard\mapper\AluminumThisMonthEnergyMapper.class
 com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.class
 com\productionboard\mapper\AluminumOeeStatisticsMapper.class
 com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.class
+com\productionboard\mapper\TankShellThisMonthEnergyMapper.class
 com\productionboard\controller\TankShellController.class
+com\productionboard\entity\TankShellDevice\TankShellThisMonthEnergy.class
 com\productionboard\entity\AluminumDevice\AluminumLossStatistics.class
 com\productionboard\controller\AluminumTtankController.class
 com\productionboard\controller\AdsorptionTankController.class
--- a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@ -1,33 +1,37 @@
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellEnergyConsumptionMapper.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumLossStatistics.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\StorageController.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellController.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumYesterdayEnergyMapper.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellOeeStatisticsMapper.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\service\ITankShellDeviceInfoService.java
-E:\桌面\澳柯玛看板修改\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDeviceDataInformation.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\TankShellDeviceDataInformationMapper.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumYesterdayEnergyMapper.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\TankShellController.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\StorageController.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumLossStatistics.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\TankShellThisMonthEnergyMapper.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellThisMonthEnergy.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\TankShellOeeStatisticsMapper.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\ITankShellDeviceInfoService.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.java
+C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\TankShellEnergyConsumptionMapper.java
--- a/productionboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ b/productionboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
--- a/productionboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/productionboard/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
--- a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar
+++ b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar
--- a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original
+++ b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original