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 ecac34b..c3177fa 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 @@ -747,6 +747,7 @@ bwi.DEPTID AS deptid, dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, + dg.rsrp AS rsrp, dg.CELL AS cell, 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 ecac34b..c3177fa 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 @@ -747,6 +747,7 @@ bwi.DEPTID AS deptid, dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, + dg.rsrp AS rsrp, dg.CELL AS cell, 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 50bf88e..24db841 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 @@ -52,5 +52,7 @@ private String cell; @ExcelProperty("气体浓度(%VOL)") private String strength; + @ExcelProperty("信号强度") + private String rsrp; private String logtime; } 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 ecac34b..c3177fa 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 @@ -747,6 +747,7 @@ bwi.DEPTID AS deptid, dg.WELL_CODE AS "wellCode", dg.DESCN AS descn, + dg.rsrp AS rsrp, dg.CELL AS cell, 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 50bf88e..24db841 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 @@ -52,5 +52,7 @@ private String cell; @ExcelProperty("气体浓度(%VOL)") private String strength; + @ExcelProperty("信号强度") + private String rsrp; private String logtime; } diff --git a/casic-web/src/main/resources/config/export/gasData.xlsx b/casic-web/src/main/resources/config/export/gasData.xlsx index 708ad3b..60da683 100644 --- a/casic-web/src/main/resources/config/export/gasData.xlsx +++ b/casic-web/src/main/resources/config/export/gasData.xlsx Binary files differ