diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar index 2dbb725..11ac708 100644 Binary files a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar and b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar differ diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original index 5fcb0d2..96702ef 100644 Binary files a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original and b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original differ diff --git a/productionboard/src/main/resources/static/js/common/echarts.common.js b/productionboard/src/main/resources/static/js/common/echarts.common.js index 0961ddb..987ad86 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/productionboard/src/main/resources/static/js/common/echarts.common.js @@ -2307,16 +2307,11 @@ const equipmentFailure = (res, ids) => { // 设备产量能耗对比 const energyConsumption = (res, ids) => { + console.log(res); let mycharts = echarts.init(ids); - - - let stationData = []; - let values = []; - - res.datas.forEach(function (it, index) { - stationData.push(it.station); - values.push(it.value); - }); + let xAxisData = res.xValueArray;// x + let yAxisDataOne = res.productionArray;// 产量 + let yAxisDataTwo = res.energyArray;// 能耗 let option = { grid: { top: '25%', @@ -2329,7 +2324,7 @@ const energyConsumption = (res, ids) => { { interval: 0, type: 'category', - data: ['6-13', '6-14', '6-15', '6-16', '6-17'], + data: xAxisData, axisPointer: { type: 'shadow' } @@ -2381,7 +2376,7 @@ const energyConsumption = (res, ids) => { ], series: [ { - name: 'Evaporation', + name: '产量', type: 'bar', itemStyle: { normal: { @@ -2405,12 +2400,10 @@ const energyConsumption = (res, ids) => { } }, barWidth: 20, - data: [ - 2.0, 4.9, 7.0, 23.2, 25.6 - ] + data: yAxisDataOne, }, { - name: 'Temperature', + name: '能耗', type: 'line', yAxisIndex: 1, tooltip: { @@ -2418,7 +2411,7 @@ const energyConsumption = (res, ids) => { return value + ' °C'; } }, - data: [2.0, 12.2, 3.3, 14.5, 6.3] + data: yAxisDataTwo, }, { name: "柱顶部", @@ -2441,7 +2434,7 @@ const energyConsumption = (res, ids) => { }, }, symbolPosition: "end", - data: [2.0, 4.9, 7.0, 23.2, 25.6], + data:yAxisDataOne, }, ] }; diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js index a3cd122..532b253 100644 --- a/productionboard/src/main/resources/static/js/tankShell/device.js +++ b/productionboard/src/main/resources/static/js/tankShell/device.js @@ -1,6 +1,5 @@ $(() => { - //设备OEE统计 //设备OEE统计 $.getJSON('/aluminumLiner/getOeeStatistics', function (result) { OEEStatistics(result, document.getElementById("OEEStatistics")); @@ -17,7 +16,7 @@ $(() => { }); //设备产量能耗对比 - $.getJSON('/tankShell/getInventoryStatistics', function (result) { + $.getJSON('/tankShellDevice/getEnergyConsumption', function (result) { energyConsumption(result, document.getElementById("energyConsumption")); }); diff --git a/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellEnergyConsumption.class b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellEnergyConsumption.class new file mode 100644 index 0000000..6f985f4 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellEnergyConsumption.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/TankShellEnergyConsumptionMapper.class b/productionboard/target/classes/com/productionboard/mapper/TankShellEnergyConsumptionMapper.class new file mode 100644 index 0000000..8614d3f Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/TankShellEnergyConsumptionMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class b/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class new file mode 100644 index 0000000..41df1b4 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class new file mode 100644 index 0000000..8cf0834 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class differ diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js index 0961ddb..987ad86 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/productionboard/target/classes/static/js/common/echarts.common.js @@ -2307,16 +2307,11 @@ const equipmentFailure = (res, ids) => { // 设备产量能耗对比 const energyConsumption = (res, ids) => { + console.log(res); let mycharts = echarts.init(ids); - - - let stationData = []; - let values = []; - - res.datas.forEach(function (it, index) { - stationData.push(it.station); - values.push(it.value); - }); + let xAxisData = res.xValueArray;// x + let yAxisDataOne = res.productionArray;// 产量 + let yAxisDataTwo = res.energyArray;// 能耗 let option = { grid: { top: '25%', @@ -2329,7 +2324,7 @@ const energyConsumption = (res, ids) => { { interval: 0, type: 'category', - data: ['6-13', '6-14', '6-15', '6-16', '6-17'], + data: xAxisData, axisPointer: { type: 'shadow' } @@ -2381,7 +2376,7 @@ const energyConsumption = (res, ids) => { ], series: [ { - name: 'Evaporation', + name: '产量', type: 'bar', itemStyle: { normal: { @@ -2405,12 +2400,10 @@ const energyConsumption = (res, ids) => { } }, barWidth: 20, - data: [ - 2.0, 4.9, 7.0, 23.2, 25.6 - ] + data: yAxisDataOne, }, { - name: 'Temperature', + name: '能耗', type: 'line', yAxisIndex: 1, tooltip: { @@ -2418,7 +2411,7 @@ const energyConsumption = (res, ids) => { return value + ' °C'; } }, - data: [2.0, 12.2, 3.3, 14.5, 6.3] + data: yAxisDataTwo, }, { name: "柱顶部", @@ -2441,7 +2434,7 @@ const energyConsumption = (res, ids) => { }, }, symbolPosition: "end", - data: [2.0, 4.9, 7.0, 23.2, 25.6], + data:yAxisDataOne, }, ] }; diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js index a3cd122..532b253 100644 --- a/productionboard/target/classes/static/js/tankShell/device.js +++ b/productionboard/target/classes/static/js/tankShell/device.js @@ -1,6 +1,5 @@ $(() => { - //设备OEE统计 //设备OEE统计 $.getJSON('/aluminumLiner/getOeeStatistics', function (result) { OEEStatistics(result, document.getElementById("OEEStatistics")); @@ -17,7 +16,7 @@ $(() => { }); //设备产量能耗对比 - $.getJSON('/tankShell/getInventoryStatistics', function (result) { + $.getJSON('/tankShellDevice/getEnergyConsumption', function (result) { energyConsumption(result, document.getElementById("energyConsumption")); }); diff --git 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 index c3baf4b..c65a36f 100644 --- 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 @@ -10,17 +10,21 @@ com\productionboard\controller\StorageController.class com\productionboard\mapper\AluminumYesterdayEnergyMapper.class com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.class com\productionboard\common\CodeGenerator$2.class +com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.class com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.class com\productionboard\mapper\BasicScadaDeviceinfoMapper.class com\productionboard\controller\TankShellDeviceController.class +com\productionboard\service\ITankShellDeviceInfoService.class com\productionboard\config\MybatisPlusConfig.class com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.class +com\productionboard\mapper\TankShellEnergyConsumptionMapper.class com\productionboard\controller\AluminumLinerkController.class com\productionboard\controller\PreassembleController.class com\productionboard\service\BasicScadaDeviceinfoService.class com\productionboard\mapper\AluminumDeviceDataInformationMapper.class com\productionboard\ProductionBoardApplication.class com\productionboard\mapper\AluminumThisMonthEnergyMapper.class +com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.class com\productionboard\mapper\AluminumOeeStatisticsMapper.class com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.class com\productionboard\controller\TankShellController.class diff --git 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 index f404acb..95db1ee 100644 --- 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,27 +1,31 @@ -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.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\FoamBoxController.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumYesterdayEnergyMapper.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.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\controller\TankShellDeviceController.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.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\controller\AluminumTtankController.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\service\impl\AluminumDeviceInfoServiceImpl.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\AluminumYesterdayEnergy.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\StorageController.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\entity\AluminumDevice\AluminumDeviceDataInformation.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.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\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\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\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\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\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 diff --git 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 new file mode 100644 index 0000000..e69de29 diff --git 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 new file mode 100644 index 0000000..e69de29 diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar index d3cfbe2..d696c10 100644 Binary files a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar and b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar differ diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original index 05b1e57..6ae1f5b 100644 Binary files a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original and b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original differ