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/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/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/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/inputFiles.lst b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index a9e68ce..71a1419 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,3 +1,4 @@ +<<<<<<< HEAD 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\AluminumLossStatisticsMapper.java C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java @@ -47,3 +48,54 @@ C:\Users\ADMIN\Desktop\ C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesHourProdutionStatisticsMapper.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\entity\TankShellDevice\TankShellDevicePrameterValue.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 +>>>>>>> 2bb997d92805e65fc0012bfff017d7bab3d3b3fa