diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar index 42f6c91..c2c6d77 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 f160a8a..8cd47a7 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/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 index 47c90f8..e69de29 100644 --- 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 @@ -1,2 +0,0 @@ -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 index 9778fcf..e482c70 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 @@ -C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\deviceboard\src\main\java\com\deviceboard\DeviceBoardApplication.java -C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\deviceboard\src\main\java\com\deviceboard\controller\TestController.java +E:\桌面\scada-visual-board\deviceboard\src\main\java\com\deviceboard\DeviceBoardApplication.java +E:\桌面\scada-visual-board\deviceboard\src\main\java\com\deviceboard\controller\TestController.java diff --git a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java index b660db7..b0170dc 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java @@ -48,6 +48,14 @@ public class AluminumLinerkController { @ResponseBody public String getDataInformation(){ List dataInformationList = aluminumDeviceInfoService.getDataInformationList(); + if(dataInformationList.size() > 0 && dataInformationList.get(0) == null){ + dataInformationList.remove(0); + AluminumDeviceDataInformation aluminumDeviceDataInformation = new AluminumDeviceDataInformation(); + aluminumDeviceDataInformation.setDeviceStatus("0"); + aluminumDeviceDataInformation.setDevicePower("0"); + aluminumDeviceDataInformation.setDeviceEnergy("0"); + dataInformationList.add(aluminumDeviceDataInformation); + } String s = JSONArray.toJSONString(dataInformationList); return s; } diff --git a/productionboard/src/main/java/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.java b/productionboard/src/main/java/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.java index 4b9df84..7808f35 100644 --- a/productionboard/src/main/java/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.java +++ b/productionboard/src/main/java/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.java @@ -20,6 +20,13 @@ import java.util.Date; @TableName("SCADA_LCB_DEVICEINFO_1") public class AluminumDeviceDataInformation implements Serializable { + public AluminumDeviceDataInformation() { + } + + public AluminumDeviceDataInformation(String deviceStatus) { + this.deviceStatus = deviceStatus; + } + /** 璁惧缂栧彿 */ @TableField("DEVICEID") private String deviceId; diff --git a/productionboard/src/main/java/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.java index 31e287b..5059b2f 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.java +++ b/productionboard/src/main/java/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.java @@ -65,12 +65,21 @@ public class AluminumDeviceInfoServiceImpl implements IAluminumDeviceInfoService List aluminumDeviceDataInformations = dataInformationMapper.selectList(null); if(aluminumDeviceDataInformations.size() > 0){ AluminumDeviceDataInformation aluminumDeviceDataInformation = aluminumDeviceDataInformations.get(0); - result[4] = aluminumDeviceDataInformation.getRunTime(); - result[5] = aluminumDeviceDataInformation.getStopTime(); - result[6] = aluminumDeviceDataInformation.getDeviceOee(); - result[7] = "0"; - result[8] = aluminumDeviceDataInformation.getRunTime(); - result[9] = aluminumDeviceDataInformation.getDeviceTakt(); + if(aluminumDeviceDataInformation != null){ + result[4] = aluminumDeviceDataInformation.getRunTime(); + result[5] = aluminumDeviceDataInformation.getStopTime(); + result[6] = aluminumDeviceDataInformation.getDeviceOee(); + result[7] = "0"; + result[8] = aluminumDeviceDataInformation.getRunTime(); + result[9] = aluminumDeviceDataInformation.getDeviceTakt(); + }else{ + result[4] = "0"; + result[5] = "0"; + result[6] = "0"; + result[7] = "0"; + result[8] = "0"; + result[9] = "0"; + } } }catch (Exception e){ diff --git a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java index 9b04982..d7f9874 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java +++ b/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java @@ -11,6 +11,7 @@ import com.productionboard.mapper.*; import com.productionboard.service.ITankShellDeviceInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.thymeleaf.util.StringUtils; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -49,6 +50,16 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi @Override public String getDataInformationJson() { List tankShellDeviceDataInformations = tankShellDeviceDataInformationMapper.selectList(null); + + if(tankShellDeviceDataInformations.size() > 0 && tankShellDeviceDataInformations.get(0) == null){ + tankShellDeviceDataInformations.remove(0); + TankShellDeviceDataInformation tankShellDeviceDataInformation = new TankShellDeviceDataInformation(); + tankShellDeviceDataInformation.setDeviceStatus("0"); + tankShellDeviceDataInformation.setDevicePower("0"); + tankShellDeviceDataInformation.setDeviceEnergy("0"); + tankShellDeviceDataInformations.add(tankShellDeviceDataInformation); + } + return JSONArray.toJSONString(tankShellDeviceDataInformations); } @@ -75,12 +86,22 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi List deviceDataInformations = tankShellDeviceDataInformationMapper.selectList(null); if(deviceDataInformations.size() > 0){ TankShellDeviceDataInformation tankShellDeviceDataInformation = deviceDataInformations.get(0); - result[4] = tankShellDeviceDataInformation.getRunTime(); - result[5] = tankShellDeviceDataInformation.getStopTime(); - result[6] = tankShellDeviceDataInformation.getDeviceOee(); - result[7] = "0"; - result[8] = tankShellDeviceDataInformation.getRunTime(); - result[9] = tankShellDeviceDataInformation.getDeviceTakt(); + if(tankShellDeviceDataInformation != null){ + result[4] = tankShellDeviceDataInformation.getRunTime(); + result[5] = tankShellDeviceDataInformation.getStopTime(); + result[6] = tankShellDeviceDataInformation.getDeviceOee(); + result[7] = "0"; + result[8] = tankShellDeviceDataInformation.getStopTime(); + result[9] = tankShellDeviceDataInformation.getDeviceTakt(); + }else { + result[4] = "0"; + result[5] = "0"; + result[6] = "0"; + result[7] = "0"; + result[8] = "0"; + result[9] = "0"; + } + } }catch (Exception e){ diff --git a/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class b/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class index b2c9cc1..a14f7f6 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class and b/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class b/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class index a1458b2..bac8d13 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/controller/AluminumTtankController.class b/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class index a5e04f0..85f4c74 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class and b/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class b/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class index 6c7a0fa..5ce13a4 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class and b/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/PreassembleController.class b/productionboard/target/classes/com/productionboard/controller/PreassembleController.class index 226c541..cd4196e 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/PreassembleController.class and b/productionboard/target/classes/com/productionboard/controller/PreassembleController.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/TankShellController.class b/productionboard/target/classes/com/productionboard/controller/TankShellController.class index 5aa04e7..b237e27 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/TankShellController.class and b/productionboard/target/classes/com/productionboard/controller/TankShellController.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesHourProdutionStatistics.class b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesHourProdutionStatistics.class index 4cb9880..7241034 100644 Binary files a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesHourProdutionStatistics.class and b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesHourProdutionStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.class b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.class index f970c2b..1f0f6e8 100644 Binary files a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.class and b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.class b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.class index 44615c4..87db1b4 100644 Binary files a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.class and b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesTeamStatistics.class b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesTeamStatistics.class index 815c989..ef8ad20 100644 Binary files a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesTeamStatistics.class and b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesTeamStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class index 8839703..7b483c7 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.class index f680f05..aeba075 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class index 5b711b2..35b6a30 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class index b266a07..e96c840 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class b/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class index e42f6cf..200ce87 100644 Binary files a/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class and b/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.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 29d86e9..7f3d9b6 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/com/productionboard/service/impl/MesProductionDataServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class index 75d074d..cc3c077 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.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 7498b34..6039980 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/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 95c425b..18c3a13 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,41 +1,51 @@ -com\productionboard\mapper\AluminumLossStatisticsMapper.class com\productionboard\common\CodeGenerator.class +com\productionboard\entity\MesProduction\MesMaterialStoreStatistics.class +com\productionboard\mapper\MesHourProdutionStatisticsMapper.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\service\IMesProductionDataService.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\MesMaterialProductionStatisticsMapper.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\service\impl\MesProductionDataServiceImpl.class com\productionboard\controller\AluminumTtankController.class +com\productionboard\mapper\AluminumLossStatisticsMapper.class +com\productionboard\mapper\MesMaterialStoreStatisticsMapper.class +com\productionboard\entity\BasicScadaDeviceinfo.class +com\productionboard\entity\MesProduction\MesHourProdutionStatistics.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\entity\TankShellDevice\TankShellDevicePrameterValue.class +com\productionboard\mapper\MesTeamStatisticsMapper.class +com\productionboard\mapper\TankShellOeeStatisticsMapper.class +com\productionboard\entity\MesProduction\MesMaterialProductionStatistics.class +com\productionboard\entity\MesProduction\MesTeamStatistics.class +com\productionboard\mapper\TankShellEnergyConsumptionMapper.class +com\productionboard\service\BasicScadaDeviceinfoService.class +com\productionboard\entity\TankShellDevice\TankShellDeviceDataInformation.class +com\productionboard\mapper\AluminumDeviceDataInformationMapper.class +com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.class +com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.class +com\productionboard\controller\TankShellController.class +com\productionboard\entity\AluminumDevice\AluminumLossStatistics.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 8359d6e..8875510 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,39 +1,49 @@ -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 +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellThisMonthEnergy.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellThisMonthEnergyMapper.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\mapper\TankShellDevicePrameterValueMapper.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\TankShellDeviceDataInformationMapper.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellOeeStatisticsMapper.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDeviceDataInformation.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.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\service\impl\BasicScadaDeviceinfoServiceImpl.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\service\impl\AluminumDeviceInfoServiceImpl.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\mapper\MesHourProdutionStatisticsMapper.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesTeamStatistics.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesMaterialStoreStatisticsMapper.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\controller\AluminumLinerkController.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesMaterialProductionStatistics.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesTeamStatisticsMapper.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\service\ITankShellDeviceInfoService.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellEnergyConsumptionMapper.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\MesProduction\MesMaterialStoreStatistics.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesHourProdutionStatistics.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\MesProductionDataServiceImpl.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\IMesProductionDataService.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\entity\TankShellDevice\TankShellOeeStatistics.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\controller\TankShellController.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java +E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesMaterialProductionStatisticsMapper.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 diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar index d583c9b..2a04e87 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 5e860e2..404ace6 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