diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar index aec7051..42f6c91 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 a7385f2..f160a8a 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/synthetic.js b/productionboard/src/main/resources/static/js/common/synthetic.js index 034e361..452727b 100644 --- a/productionboard/src/main/resources/static/js/common/synthetic.js +++ b/productionboard/src/main/resources/static/js/common/synthetic.js @@ -16,23 +16,23 @@ const synthetic = (statusArray) => { console.log(statusArray); let info = ` - - - - + + + +
${statusArray[0] || 0}${statusArray[1] || 0}${statusArray[2] || 0}${statusArray[3] || 0}${statusArray[0] || 0}${statusArray[1] || 0}${statusArray[2] || 0}${statusArray[3] || 0}
- + - + - + - +
${statusArray[4] || 0}${statusArray[4] || 0} ${statusArray[5] || 0}${statusArray[5] || 0} ${statusArray[6] || 0}${statusArray[6] || 0} ${statusArray[7] || 0}${statusArray[7] || 0}
diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js index 0f9b694..4d73d1a 100644 --- a/productionboard/src/main/resources/static/js/tankShell/device.js +++ b/productionboard/src/main/resources/static/js/tankShell/device.js @@ -54,10 +54,10 @@ $(() => { dataType: 'JSON', success: function (res) { if (res.length === tableRes.data?.length) return - console.log(res.map(val => [val.prameterValue]) == tableRes.data); + console.log(res.length +'+'+ tableRes.data?.length); $('#productionPlan').remove() $('.scrollTable').html('
') - tableRes.data = res.map(val => [val.deviceId,val.prameterName,val.prameterValue,val.createTime,]) + tableRes.data = res.map(val => [val.deviceId, val.prameterName, val.prameterValue, val.createTime,]) tableRes.header = ['设备名称', '参数名称', '当前值', '时间',] dynamicTable({ el: '#productionPlan', @@ -107,12 +107,12 @@ const dataInformationFunction = (statusArray) => { console.log(res); let info = ` - - + + - +
${res.deviceStatus == 1 ? `运行正常` : `运行异常`} ${res.devicePower}kW${res.deviceStatus == 1 ? `运行正常` : `运行异常`} ${res.devicePower}kW
${res.deviceEnergy}kW·h ${res.deviceEnergy}kW·h 2
`; @@ -124,10 +124,10 @@ const dataInformationFunction = (statusArray) => { const energyProductionStatisticsFunction = (statusArray) => { let info = ` - - - - + + + +
${statusArray[0]}${statusArray[1]}${statusArray[2]}${statusArray[3]}${statusArray[0]}${statusArray[1]}${statusArray[2]}${statusArray[3]}
`; @@ -136,10 +136,10 @@ const energyProductionStatisticsFunction = (statusArray) => { const runParamStatisticsFunction = (statusArray) => { let info = ` -
${statusArray[4]}
-
${statusArray[5]}
-
${statusArray[6]}
-
${statusArray[7]}
+
${statusArray[4]}
+
${statusArray[5]}
+
${statusArray[6]}
+
${statusArray[7]}
`; $("#runParamStatistics").append(info); diff --git a/productionboard/target/classes/static/js/common/synthetic.js b/productionboard/target/classes/static/js/common/synthetic.js index 034e361..452727b 100644 --- a/productionboard/target/classes/static/js/common/synthetic.js +++ b/productionboard/target/classes/static/js/common/synthetic.js @@ -16,23 +16,23 @@ const synthetic = (statusArray) => { console.log(statusArray); let info = ` - - - - + + + +
${statusArray[0] || 0}${statusArray[1] || 0}${statusArray[2] || 0}${statusArray[3] || 0}${statusArray[0] || 0}${statusArray[1] || 0}${statusArray[2] || 0}${statusArray[3] || 0}
- + - + - + - +
${statusArray[4] || 0}${statusArray[4] || 0} ${statusArray[5] || 0}${statusArray[5] || 0} ${statusArray[6] || 0}${statusArray[6] || 0} ${statusArray[7] || 0}${statusArray[7] || 0}
diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js index 0f9b694..4d73d1a 100644 --- a/productionboard/target/classes/static/js/tankShell/device.js +++ b/productionboard/target/classes/static/js/tankShell/device.js @@ -54,10 +54,10 @@ $(() => { dataType: 'JSON', success: function (res) { if (res.length === tableRes.data?.length) return - console.log(res.map(val => [val.prameterValue]) == tableRes.data); + console.log(res.length +'+'+ tableRes.data?.length); $('#productionPlan').remove() $('.scrollTable').html('
') - tableRes.data = res.map(val => [val.deviceId,val.prameterName,val.prameterValue,val.createTime,]) + tableRes.data = res.map(val => [val.deviceId, val.prameterName, val.prameterValue, val.createTime,]) tableRes.header = ['设备名称', '参数名称', '当前值', '时间',] dynamicTable({ el: '#productionPlan', @@ -107,12 +107,12 @@ const dataInformationFunction = (statusArray) => { console.log(res); let info = ` - - + + - +
${res.deviceStatus == 1 ? `运行正常` : `运行异常`} ${res.devicePower}kW${res.deviceStatus == 1 ? `运行正常` : `运行异常`} ${res.devicePower}kW
${res.deviceEnergy}kW·h ${res.deviceEnergy}kW·h 2
`; @@ -124,10 +124,10 @@ const dataInformationFunction = (statusArray) => { const energyProductionStatisticsFunction = (statusArray) => { let info = ` - - - - + + + +
${statusArray[0]}${statusArray[1]}${statusArray[2]}${statusArray[3]}${statusArray[0]}${statusArray[1]}${statusArray[2]}${statusArray[3]}
`; @@ -136,10 +136,10 @@ const energyProductionStatisticsFunction = (statusArray) => { const runParamStatisticsFunction = (statusArray) => { let info = ` -
${statusArray[4]}
-
${statusArray[5]}
-
${statusArray[6]}
-
${statusArray[7]}
+
${statusArray[4]}
+
${statusArray[5]}
+
${statusArray[6]}
+
${statusArray[7]}
`; $("#runParamStatistics").append(info); 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 new file mode 100644 index 0000000..95c425b --- /dev/null +++ b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,41 @@ +com\productionboard\mapper\AluminumLossStatisticsMapper.class +com\productionboard\common\CodeGenerator.class +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 +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\TankShellDevice\TankShellDevicePrameterValue.class +com\productionboard\mapper\TankShellOeeStatisticsMapper.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\entity\TankShellDevice\TankShellDeviceDataInformation.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 +com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.class +com\productionboard\mapper\TankShellDevicePrameterValueMapper.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 new file mode 100644 index 0000000..8359d6e --- /dev/null +++ b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,39 @@ +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellEnergyConsumptionMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellThisMonthEnergyMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumLossStatistics.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellThisMonthEnergy.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumYesterdayEnergyMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellDevicePrameterValueMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellDeviceDataInformationMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDeviceDataInformation.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\ITankShellDeviceInfoService.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellController.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\StorageController.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellOeeStatisticsMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.java 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..d583c9b 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..5e860e2 Binary files /dev/null and b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original differ