diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index b1258a9..5f73387 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); if (dValue <= 20.0) { - deviceDataExcelDto.setStrength(dValue + "%LEL"); + deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index b1258a9..5f73387 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); if (dValue <= 20.0) { - deviceDataExcelDto.setStrength(dValue + "%LEL"); + deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 20aa346..709ca0f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -282,7 +282,7 @@ AS "UPTIME", - LIQUIDDATA AS strength, + LIQUIDDATA AS liquiddata, CELL, DESCN, DEPTID, diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index b1258a9..5f73387 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); if (dValue <= 20.0) { - deviceDataExcelDto.setStrength(dValue + "%LEL"); + deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 20aa346..709ca0f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -282,7 +282,7 @@ AS "UPTIME", - LIQUIDDATA AS strength, + LIQUIDDATA AS liquiddata, CELL, DESCN, DEPTID, diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 7cef8c4..1aaa281 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); if (liquiddata <= 0) { - deviceDataExcelDto.setStrength("正常水位"); + deviceDataExcelDto.setLiquiddata("正常水位"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index b1258a9..5f73387 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); if (dValue <= 20.0) { - deviceDataExcelDto.setStrength(dValue + "%LEL"); + deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 20aa346..709ca0f 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -282,7 +282,7 @@ AS "UPTIME", - LIQUIDDATA AS strength, + LIQUIDDATA AS liquiddata, CELL, DESCN, DEPTID, diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 7cef8c4..1aaa281 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); if (liquiddata <= 0) { - deviceDataExcelDto.setStrength("正常水位"); + deviceDataExcelDto.setLiquiddata("正常水位"); } } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index c67a350..40d4c87 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -51,6 +51,6 @@ @ExcelProperty("电量") private String cell; @ExcelProperty("设备数据值") - private String strength; + private String liquiddata; private String logtime; }