diff --git a/deviceboard/target/classes/com/deviceboard/DeviceBoardApplication.class b/deviceboard/target/classes/com/deviceboard/DeviceBoardApplication.class index 04fc076..96d2a47 100644 Binary files a/deviceboard/target/classes/com/deviceboard/DeviceBoardApplication.class 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 index c23c3fa..899066d 100644 Binary files a/deviceboard/target/classes/com/deviceboard/controller/TestController.class and b/deviceboard/target/classes/com/deviceboard/controller/TestController.class differ diff --git a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java index 4c6345d..6600bed 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java @@ -63,8 +63,8 @@ public class AluminumLinerkController { if(lossStatisticsList.size() > 0){ lossStatisticsList.forEach(x->{ JSONObject jsonObject = new JSONObject(); - jsonObject.put("name",x.getXValue()); - jsonObject.put("value",x.getYValue()); + jsonObject.put("name",x.getxValue()); + jsonObject.put("value",x.getyValue()); jsonObjectList.add(jsonObject); }); } 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 dd6f536..bdf580b 100644 --- a/productionboard/src/main/java/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.java +++ b/productionboard/src/main/java/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.java @@ -14,7 +14,6 @@ import java.util.Date; * @author WenJY * @date 2022年06月06日 16:06 */ -@Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("SCADA_LCB_DEVICEINFO_1") @@ -51,4 +50,68 @@ public class AluminumDeviceDataInformation implements Serializable { /** 采集时间 */ @TableField("COLLECTTIME") private Date collectTime; + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getDeviceStatus() { + return deviceStatus; + } + + public void setDeviceStatus(String deviceStatus) { + this.deviceStatus = deviceStatus; + } + + public String getDeviceTakt() { + return deviceTakt; + } + + public void setDeviceTakt(String deviceTakt) { + this.deviceTakt = deviceTakt; + } + + public String getOpenTime() { + return openTime; + } + + public void setOpenTime(String openTime) { + this.openTime = openTime; + } + + public String getRunTime() { + return runTime; + } + + public void setRunTime(String runTime) { + this.runTime = runTime; + } + + public String getDevicePower() { + return devicePower; + } + + public void setDevicePower(String devicePower) { + this.devicePower = devicePower; + } + + public String getDeviceEnergy() { + return deviceEnergy; + } + + public void setDeviceEnergy(String deviceEnergy) { + this.deviceEnergy = deviceEnergy; + } + + public Date getCollectTime() { + return collectTime; + } + + public void setCollectTime(Date collectTime) { + this.collectTime = collectTime; + } } diff --git a/productionboard/src/main/java/com/productionboard/entity/AluminumDevice/AluminumLossStatistics.java b/productionboard/src/main/java/com/productionboard/entity/AluminumDevice/AluminumLossStatistics.java index b8656f9..7ed12bb 100644 --- a/productionboard/src/main/java/com/productionboard/entity/AluminumDevice/AluminumLossStatistics.java +++ b/productionboard/src/main/java/com/productionboard/entity/AluminumDevice/AluminumLossStatistics.java @@ -13,7 +13,6 @@ import java.io.Serializable; * @author WenJY * @date 2022年06月07日 10:55 */ -@Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("SCADA_LCB_DEVICEINFO_3") @@ -24,4 +23,20 @@ public class AluminumLossStatistics implements Serializable { @TableField("VALUE") public String yValue; + + public String getxValue() { + return xValue; + } + + public void setxValue(String xValue) { + this.xValue = xValue; + } + + public String getyValue() { + return yValue; + } + + public void setyValue(String yValue) { + this.yValue = yValue; + } } diff --git a/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class b/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class index 55869ba..1628716 100644 Binary files a/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class and b/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class differ diff --git a/productionboard/target/classes/com/productionboard/common/CodeGenerator$1.class b/productionboard/target/classes/com/productionboard/common/CodeGenerator$1.class index 9be2d0f..1a06db5 100644 Binary files a/productionboard/target/classes/com/productionboard/common/CodeGenerator$1.class and b/productionboard/target/classes/com/productionboard/common/CodeGenerator$1.class differ diff --git a/productionboard/target/classes/com/productionboard/common/CodeGenerator$2.class b/productionboard/target/classes/com/productionboard/common/CodeGenerator$2.class index 46506c5..81fe0ea 100644 Binary files a/productionboard/target/classes/com/productionboard/common/CodeGenerator$2.class and b/productionboard/target/classes/com/productionboard/common/CodeGenerator$2.class differ diff --git a/productionboard/target/classes/com/productionboard/common/CodeGenerator.class b/productionboard/target/classes/com/productionboard/common/CodeGenerator.class index e01b95e..0c7b6b1 100644 Binary files a/productionboard/target/classes/com/productionboard/common/CodeGenerator.class and b/productionboard/target/classes/com/productionboard/common/CodeGenerator.class differ diff --git a/productionboard/target/classes/com/productionboard/config/MybatisPlusConfig.class b/productionboard/target/classes/com/productionboard/config/MybatisPlusConfig.class index 1bed637..09ad92a 100644 Binary files a/productionboard/target/classes/com/productionboard/config/MybatisPlusConfig.class and b/productionboard/target/classes/com/productionboard/config/MybatisPlusConfig.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class b/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class index ed2c5a8..1cd24e5 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 4710204..69b4cd9 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 dcb2778..2bdbd27 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 02d576c..7d1850e 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 2b4b644..9583ddf 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/StorageController.class b/productionboard/target/classes/com/productionboard/controller/StorageController.class index 6e63d3b..19b5249 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/StorageController.class and b/productionboard/target/classes/com/productionboard/controller/StorageController.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/TankShellController.class b/productionboard/target/classes/com/productionboard/controller/TankShellController.class index 7829198..b4ac589 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/controller/TankShellDeviceController.class b/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class index 0128a92..60b92d4 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class and b/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/BasicScadaDeviceinfo.class b/productionboard/target/classes/com/productionboard/entity/BasicScadaDeviceinfo.class index 5c0ff56..6b151b5 100644 Binary files a/productionboard/target/classes/com/productionboard/entity/BasicScadaDeviceinfo.class and b/productionboard/target/classes/com/productionboard/entity/BasicScadaDeviceinfo.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/BasicScadaDeviceinfoMapper.class b/productionboard/target/classes/com/productionboard/mapper/BasicScadaDeviceinfoMapper.class index 416ca7e..fec48c6 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/BasicScadaDeviceinfoMapper.class and b/productionboard/target/classes/com/productionboard/mapper/BasicScadaDeviceinfoMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/service/BasicScadaDeviceinfoService.class b/productionboard/target/classes/com/productionboard/service/BasicScadaDeviceinfoService.class index 27cb1e5..f5c014b 100644 Binary files a/productionboard/target/classes/com/productionboard/service/BasicScadaDeviceinfoService.class and b/productionboard/target/classes/com/productionboard/service/BasicScadaDeviceinfoService.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/BasicScadaDeviceinfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/BasicScadaDeviceinfoServiceImpl.class index da7596f..2ec7207 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/BasicScadaDeviceinfoServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/BasicScadaDeviceinfoServiceImpl.class differ