diff --git a/deviceboard/target/classes/application.yml b/deviceboard/target/classes/application.yml new file mode 100644 index 0000000..4f80537 --- /dev/null +++ b/deviceboard/target/classes/application.yml @@ -0,0 +1,2 @@ +server: + port: 6067 \ No newline at end of file diff --git a/deviceboard/target/classes/com/deviceboard/DeviceBoardApplication.class b/deviceboard/target/classes/com/deviceboard/DeviceBoardApplication.class new file mode 100644 index 0000000..04fc076 Binary files /dev/null and b/deviceboard/target/classes/com/deviceboard/DeviceBoardApplication.class differ diff --git a/deviceboard/target/classes/com/deviceboard/controller/TestController.class b/deviceboard/target/classes/com/deviceboard/controller/TestController.class new file mode 100644 index 0000000..c23c3fa Binary files /dev/null and b/deviceboard/target/classes/com/deviceboard/controller/TestController.class differ diff --git a/deviceboard/target/classes/templates/a b/deviceboard/target/classes/templates/a new file mode 100644 index 0000000..e69de29 diff --git a/deviceboard/target/classes/templates/tankShell/test.html b/deviceboard/target/classes/templates/tankShell/test.html new file mode 100644 index 0000000..55b24ff --- /dev/null +++ b/deviceboard/target/classes/templates/tankShell/test.html @@ -0,0 +1,10 @@ + + + + + 箱壳可视化看板 + + + HelloWorld !!! + + \ No newline at end of file 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..9cf4ef5 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..dabdd2e 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/createdFiles.lst b/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..47c90f8 --- /dev/null +++ b/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,2 @@ +com\deviceboard\DeviceBoardApplication.class +com\deviceboard\controller\TestController.class 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 new file mode 100644 index 0000000..94004ba --- /dev/null +++ b/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,2 @@ +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/aluminumLiner/index.js b/productionboard/src/main/resources/static/js/aluminumLiner/index.js index 7d0297c..ba3ad1f 100644 --- a/productionboard/src/main/resources/static/js/aluminumLiner/index.js +++ b/productionboard/src/main/resources/static/js/aluminumLiner/index.js @@ -21,8 +21,10 @@ $(() => { }); - //设备OEE统计 - OEEStatistics(null, document.getElementById("OEEStatistics")); + //设备OEE统计 + $.getJSON('/aluminumLiner/getOeeStatistics', function (result) { + OEEStatistics(result, document.getElementById("OEEStatistics")); + }); //库存情况 $.getJSON('/tankShell/getInventoryStatistics', function (result) { 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 82f1402..8b23bb8 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/productionboard/src/main/resources/static/js/common/echarts.common.js @@ -1529,7 +1529,16 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { //设备OEE统计 const OEEStatistics = (res, ids) => { + console.log(res); let mycharts = echarts.init(ids); + let xAxisData = [] + let yAxisData = [] + res.forEach((item) => { + xAxisData.push(item.yValue); + yAxisData.push(item.xValue); + }); + console.log(xAxisData); + console.log(yAxisData); let option = { tooltip: {}, @@ -1552,14 +1561,7 @@ const OEEStatistics = (res, ids) => { { type: "category", boundaryGap: false, - data: [ - "11.01", - "11.02", - "11.03", - "11.04", - "11.05", - "11.06", - ], + data: xAxisData, min: 0, splitNumber: 4, splitLine: { @@ -1595,8 +1597,6 @@ const OEEStatistics = (res, ids) => { { type: "value", min: 0, - max: 60, - interval: 20, splitLine: { show: true, lineStyle: { @@ -1682,7 +1682,7 @@ const OEEStatistics = (res, ids) => { shadowBlur: 20, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。 }, }, - data: [28, 39, 24, 45, 39, 42], + data:yAxisData, } ], }; diff --git a/productionboard/src/main/resources/static/js/common/synthetic.js b/productionboard/src/main/resources/static/js/common/synthetic.js index c7a27d4..e767a73 100644 --- a/productionboard/src/main/resources/static/js/common/synthetic.js +++ b/productionboard/src/main/resources/static/js/common/synthetic.js @@ -16,28 +16,28 @@ const dataInformationFunction = (statusArray) => { const synthetic = (statusArray) => { let info = ` - - - - + + + +
${statusArray.yesterdayEnergy || 0}${statusArray.thisMonthProuction || 0}${statusArray.yesterdayProuction || 0}${statusArray.thisMonthEnergy || 0}${statusArray[0] || 0}${statusArray[1] || 0}${statusArray[2] || 0}${statusArray[3] || 0}
- + - + - + - +
${statusArray.yesterdayEnergy || 0}${statusArray[0] || 0} ${statusArray.yesterdayEnergy || 0}${statusArray[0] || 0} ${statusArray.yesterdayEnergy || 0}${statusArray[0] || 0} ${statusArray.yesterdayEnergy || 0}${statusArray[0] || 0}
- ${statusArray.yesterdayEnergy || 0} - ${statusArray.yesterdayEnergy || 0} + ${statusArray[0] || 0} + ${statusArray[0] || 0} `; $("#synthetic").append(info); diff --git a/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class b/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class index 69b4cd9..2cb97f3 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class and b/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumEnergyProduction.class b/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumEnergyProduction.class deleted file mode 100644 index ee32d30..0000000 Binary files a/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumEnergyProduction.class and /dev/null differ diff --git a/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumOeeStatistics.class b/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumOeeStatistics.class new file mode 100644 index 0000000..3f0e2bc Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumOeeStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumThisMonthEnergy.class b/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumThisMonthEnergy.class new file mode 100644 index 0000000..6c57e6c Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumThisMonthEnergy.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumYesterdayEnergy.class b/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumYesterdayEnergy.class new file mode 100644 index 0000000..24d584d Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumYesterdayEnergy.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/AluminumOeeStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/AluminumOeeStatisticsMapper.class new file mode 100644 index 0000000..8626205 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/AluminumOeeStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/AluminumThisMonthEnergyMapper.class b/productionboard/target/classes/com/productionboard/mapper/AluminumThisMonthEnergyMapper.class new file mode 100644 index 0000000..415d895 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/AluminumThisMonthEnergyMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/AluminumYesterdayEnergyMapper.class b/productionboard/target/classes/com/productionboard/mapper/AluminumYesterdayEnergyMapper.class new file mode 100644 index 0000000..e7345ca Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/AluminumYesterdayEnergyMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/service/IAluminumDeviceInfoService.class b/productionboard/target/classes/com/productionboard/service/IAluminumDeviceInfoService.class index 78c83cd..8a4c5c1 100644 Binary files a/productionboard/target/classes/com/productionboard/service/IAluminumDeviceInfoService.class and b/productionboard/target/classes/com/productionboard/service/IAluminumDeviceInfoService.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class index 4ac252f..20e9d1e 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class differ diff --git a/productionboard/target/classes/static/js/aluminumLiner/index.js b/productionboard/target/classes/static/js/aluminumLiner/index.js index 0446075..ba3ad1f 100644 --- a/productionboard/target/classes/static/js/aluminumLiner/index.js +++ b/productionboard/target/classes/static/js/aluminumLiner/index.js @@ -10,8 +10,7 @@ $(() => { } dataInformationFunction(statusArray); }); - $.getJSON('10.41.9.111:6069/aluminumLiner/getEnergyProductStatistics', function (result) { - debugger + $.getJSON('/aluminumLiner/getEnergyProductStatistics', function (result) { synthetic(result) }); @@ -22,8 +21,10 @@ $(() => { }); - //设备OEE统计 - OEEStatistics(null, document.getElementById("OEEStatistics")); + //设备OEE统计 + $.getJSON('/aluminumLiner/getOeeStatistics', function (result) { + OEEStatistics(result, document.getElementById("OEEStatistics")); + }); //库存情况 $.getJSON('/tankShell/getInventoryStatistics', function (result) { diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js index 82f1402..8b23bb8 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/productionboard/target/classes/static/js/common/echarts.common.js @@ -1529,7 +1529,16 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { //设备OEE统计 const OEEStatistics = (res, ids) => { + console.log(res); let mycharts = echarts.init(ids); + let xAxisData = [] + let yAxisData = [] + res.forEach((item) => { + xAxisData.push(item.yValue); + yAxisData.push(item.xValue); + }); + console.log(xAxisData); + console.log(yAxisData); let option = { tooltip: {}, @@ -1552,14 +1561,7 @@ const OEEStatistics = (res, ids) => { { type: "category", boundaryGap: false, - data: [ - "11.01", - "11.02", - "11.03", - "11.04", - "11.05", - "11.06", - ], + data: xAxisData, min: 0, splitNumber: 4, splitLine: { @@ -1595,8 +1597,6 @@ const OEEStatistics = (res, ids) => { { type: "value", min: 0, - max: 60, - interval: 20, splitLine: { show: true, lineStyle: { @@ -1682,7 +1682,7 @@ const OEEStatistics = (res, ids) => { shadowBlur: 20, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。 }, }, - data: [28, 39, 24, 45, 39, 42], + data:yAxisData, } ], }; diff --git a/productionboard/target/classes/static/js/common/synthetic.js b/productionboard/target/classes/static/js/common/synthetic.js index c7a27d4..e767a73 100644 --- a/productionboard/target/classes/static/js/common/synthetic.js +++ b/productionboard/target/classes/static/js/common/synthetic.js @@ -16,28 +16,28 @@ const dataInformationFunction = (statusArray) => { const synthetic = (statusArray) => { let info = ` - - - - + + + +
${statusArray.yesterdayEnergy || 0}${statusArray.thisMonthProuction || 0}${statusArray.yesterdayProuction || 0}${statusArray.thisMonthEnergy || 0}${statusArray[0] || 0}${statusArray[1] || 0}${statusArray[2] || 0}${statusArray[3] || 0}
- + - + - + - +
${statusArray.yesterdayEnergy || 0}${statusArray[0] || 0} ${statusArray.yesterdayEnergy || 0}${statusArray[0] || 0} ${statusArray.yesterdayEnergy || 0}${statusArray[0] || 0} ${statusArray.yesterdayEnergy || 0}${statusArray[0] || 0}
- ${statusArray.yesterdayEnergy || 0} - ${statusArray.yesterdayEnergy || 0} + ${statusArray[0] || 0} + ${statusArray[0] || 0} `; $("#synthetic").append(info); 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 1ee4bf2..c3baf4b 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 @@ -1,6 +1,5 @@ com\productionboard\mapper\AluminumLossStatisticsMapper.class com\productionboard\common\CodeGenerator.class -com\productionboard\entity\AluminumDevice\AluminumEnergyProduction.class com\productionboard\common\CodeGenerator$1.class com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.class com\productionboard\entity\BasicScadaDeviceinfo.class @@ -8,16 +7,22 @@ com\productionboard\controller\FoamBoxController.class com\productionboard\service\IAluminumDeviceInfoService.class com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.class 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\AluminumDevice\AluminumDeviceDataInformation.class com\productionboard\mapper\BasicScadaDeviceinfoMapper.class com\productionboard\controller\TankShellDeviceController.class com\productionboard\config\MybatisPlusConfig.class +com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.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\mapper\AluminumOeeStatisticsMapper.class +com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.class com\productionboard\controller\TankShellController.class com\productionboard\entity\AluminumDevice\AluminumLossStatistics.class com\productionboard\controller\AluminumTtankController.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 ced6067..8794b8d 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,22 +1,27 @@ -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.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\service\impl\BasicScadaDeviceinfoServiceImpl.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.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\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\entity\AluminumDevice\AluminumEnergyProduction.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\controller\StorageController.java -E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.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\mapper\AluminumDeviceDataInformationMapper.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\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\service\impl\BasicScadaDeviceinfoServiceImpl.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 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 4a1b09d..8431d22 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 fae4f5a..8ba79ed 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