diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar index 11ac708..d1fc322 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 96702ef..bfd1a96 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/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js index a0b3795..675bb57 100644 --- a/productionboard/src/main/resources/static/js/tankShell/device.js +++ b/productionboard/src/main/resources/static/js/tankShell/device.js @@ -1,7 +1,7 @@ $(() => { //设备OEE统计 - $.getJSON('/tankShell/getOeeStatistics', function (result) { + $.getJSON('/tankShellDevice/getOeeStatistics', function (result) { OEEStatistics(result, document.getElementById("OEEStatistics")); }); diff --git a/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellEnergyConsumption.class b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellEnergyConsumption.class index 6f985f4..5ea448d 100644 Binary files a/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellEnergyConsumption.class and b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellEnergyConsumption.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellOeeStatistics.class b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellOeeStatistics.class new file mode 100644 index 0000000..13188c0 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellOeeStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/TankShellOeeStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/TankShellOeeStatisticsMapper.class new file mode 100644 index 0000000..dcc842b Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/TankShellOeeStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class b/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class index 41df1b4..62ecda9 100644 Binary files a/productionboard/target/classes/com/productionboard/service/ITankShellDeviceInfoService.class 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 index 8cf0834..d1624b9 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class differ diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js index 532b253..675bb57 100644 --- a/productionboard/target/classes/static/js/tankShell/device.js +++ b/productionboard/target/classes/static/js/tankShell/device.js @@ -1,7 +1,7 @@ $(() => { //设备OEE统计 - $.getJSON('/aluminumLiner/getOeeStatistics', function (result) { + $.getJSON('/tankShellDevice/getOeeStatistics', function (result) { OEEStatistics(result, document.getElementById("OEEStatistics")); }); 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 c65a36f..fd6b9bb 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 @@ -16,6 +16,7 @@ com\productionboard\mapper\BasicScadaDeviceinfoMapper.class com\productionboard\controller\TankShellDeviceController.class com\productionboard\service\ITankShellDeviceInfoService.class com\productionboard\config\MybatisPlusConfig.class +com\productionboard\mapper\TankShellOeeStatisticsMapper.class com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.class com\productionboard\mapper\TankShellEnergyConsumptionMapper.class com\productionboard\controller\AluminumLinerkController.class @@ -23,6 +24,7 @@ com\productionboard\controller\PreassembleController.class com\productionboard\service\BasicScadaDeviceinfoService.class com\productionboard\mapper\AluminumDeviceDataInformationMapper.class com\productionboard\ProductionBoardApplication.class +com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.class com\productionboard\mapper\AluminumThisMonthEnergyMapper.class com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.class com\productionboard\mapper\AluminumOeeStatisticsMapper.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 95db1ee..530e466 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,4 +1,5 @@ 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 @@ -24,6 +25,7 @@ C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionb 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\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 diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar index d696c10..4f4dc1c 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 6ae1f5b..e4d1319 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