diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar new file mode 100644 index 0000000..a72f920 Binary files /dev/null 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 new file mode 100644 index 0000000..b84d2bd Binary files /dev/null and b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original differ diff --git a/deviceboard/target/maven-archiver/pom.properties b/deviceboard/target/maven-archiver/pom.properties new file mode 100644 index 0000000..b6bd977 --- /dev/null +++ b/deviceboard/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=deviceboard +groupId=com.scada +version=0.0.1-SNAPSHOT diff --git 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 index c252bf4..94004ba 100644 --- 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 diff --git 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 new file mode 100644 index 0000000..e69de29 diff --git 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 new file mode 100644 index 0000000..e69de29 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 987ad86..78fe7e1 100644 --- 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: {}, diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js index c1fa3f1..22f447e 100644 --- a/productionboard/src/main/resources/static/js/tankShell/device.js +++ b/productionboard/src/main/resources/static/js/tankShell/device.js @@ -57,17 +57,19 @@ $(() => { /*鏁版嵁淇℃伅*/ const statusArray = [0, 0, 0, 0, 0]; - $.getJSON('/tankShellDevice/getDataInformation', function (result) { - console.log(result); - dataInformationFunction(result) - }); - $.getJSON('/tankShellDevice/getRunParameters', function (result) { - console.log(result); - energyProductionStatisticsFunction(result) - }); - $.getJSON('/tankShellDevice/getRunParameters', function (result) { - runParamStatisticsFunction(result) - }); + var a = () => { + $.getJSON('/tankShellDevice/getDataInformation', function (result) { + console.log(result); + dataInformationFunction(result) + }); + $.getJSON('/tankShellDevice/getRunParameters', function (result) { + console.log(result); + energyProductionStatisticsFunction(result) + }); + $.getJSON('/tankShellDevice/getRunParameters', function (result) { + runParamStatisticsFunction(result) + }); + } dataInformationFunction(statusArray); energyProductionStatisticsFunction(statusArray); diff --git a/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.class b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.class new file mode 100644 index 0000000..eac9780 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellDeviceDataInformation.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellThisMonthEnergy.class b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellThisMonthEnergy.class new file mode 100644 index 0000000..26b2715 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellThisMonthEnergy.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/TankShellDeviceDataInformationMapper.class b/productionboard/target/classes/com/productionboard/mapper/TankShellDeviceDataInformationMapper.class new file mode 100644 index 0000000..bb45aae Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/TankShellDeviceDataInformationMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/TankShellThisMonthEnergyMapper.class b/productionboard/target/classes/com/productionboard/mapper/TankShellThisMonthEnergyMapper.class new file mode 100644 index 0000000..8669652 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/TankShellThisMonthEnergyMapper.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 987ad86..78fe7e1 100644 --- 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: {}, diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js index c1fa3f1..22f447e 100644 --- a/productionboard/target/classes/static/js/tankShell/device.js +++ b/productionboard/target/classes/static/js/tankShell/device.js @@ -57,17 +57,19 @@ $(() => { /*鏁版嵁淇℃伅*/ const statusArray = [0, 0, 0, 0, 0]; - $.getJSON('/tankShellDevice/getDataInformation', function (result) { - console.log(result); - dataInformationFunction(result) - }); - $.getJSON('/tankShellDevice/getRunParameters', function (result) { - console.log(result); - energyProductionStatisticsFunction(result) - }); - $.getJSON('/tankShellDevice/getRunParameters', function (result) { - runParamStatisticsFunction(result) - }); + var a = () => { + $.getJSON('/tankShellDevice/getDataInformation', function (result) { + console.log(result); + dataInformationFunction(result) + }); + $.getJSON('/tankShellDevice/getRunParameters', function (result) { + console.log(result); + energyProductionStatisticsFunction(result) + }); + $.getJSON('/tankShellDevice/getRunParameters', function (result) { + runParamStatisticsFunction(result) + }); + } dataInformationFunction(statusArray); energyProductionStatisticsFunction(statusArray); diff --git a/productionboard/target/maven-archiver/pom.properties b/productionboard/target/maven-archiver/pom.properties new file mode 100644 index 0000000..b6195d1 --- /dev/null +++ b/productionboard/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=productionboard +groupId=com.scada +version=0.0.1-SNAPSHOT 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 fd6b9bb..8da1017 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 @@ -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 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 bae8ee6..9a94b6a 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,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 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 new file mode 100644 index 0000000..527c645 Binary files /dev/null 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 new file mode 100644 index 0000000..1b1a8a2 Binary files /dev/null and b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original differ