xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

查询用户关注台站数据信息接口xml查询返回字段修改

Browse Source 
增加查询台站监测数据信息返回值
关注台站查询接口返回海拔信息没有时，返回--
关注台站查询接口增加状态信息返回
This commit is contained in:
qiaoqinzheng 2023-06-20 16:54:18 +08:00
parent ebbce5c359
commit ef6d114f23
7 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java
View File

@ -54,8 +54,8 @@ public class StationOperationController {
@GetMapping("getDataReceivingStatus")
@ApiOperation(value = "查询台站监测数据信息", notes = "查询台站监测数据信息")
public void getDataReceivingStatus(String userId){
stationOperationService.getDataReceivingStatus(userId);
public Result getDataReceivingStatus(String userId){
return stationOperationService.getDataReceivingStatus(userId);
}
}

6
jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java
View File

@ -80,4 +80,10 @@ public class SysUserFocusStation implements Serializable {
@TableField(exist = false)
private String altitude;
/**
* 状态
*/
@TableField(exist = false)
private String status;
}

1
jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/stationMetDataMapper.xml
View File

@ -4,6 +4,7 @@
<select id="findMetDataList" resultType="org.jeecg.modules.base.entity.GardsMetData">
select
STATION_ID,
START_TIME,
END_TIME
from ORIGINAL.GARDS_MET_DATA

1
jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/stationSampleDataMapper.xml
View File

@ -4,6 +4,7 @@
<select id="findSampleDataList" resultType="org.jeecg.modules.base.entity.GardsSampleData">
select
DETECTOR_ID,
DATA_TYPE,
SPECTRAL_QUALIFIE,
COLLECT_START,

1
jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/stationSohDataMapper.xml
View File

@ -4,6 +4,7 @@
<select id="findSohDataList" resultType="org.jeecg.modules.base.entity.GardsSohData">
select
DETECTOR_ID,
START_TIME,
TIME
FROM ORIGINAL.GARDS_SOH_DATA

6
jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java
View File

@ -67,7 +67,7 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
stationOperation.setStationName(gardsStation.getStationCode());
String stationType = StationTypeUtil.getStationType(gardsStation.getStationId());
stationOperation.setStationType(stationType);
stationOperation.setAltitude(Objects.isNull(gardsStation.getElevation())?"":gardsStation.getElevation()+"m");
stationOperation.setAltitude(Objects.isNull(gardsStation.getElevation())?"--":gardsStation.getElevation()+"m");
stationOperation.setLon(String.valueOf(gardsStation.getLon()));
stationOperation.setLat(String.valueOf(gardsStation.getLat()));
stationOperation.setStatus(gardsStation.getStatus());
@ -449,7 +449,7 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
}
detectorData.setDataList(dataInfoList);
if (CollectionUtils.isNotEmpty(detectorInfoMap)){
if (detectorInfoMap.containsKey(detectorId)){
if (StringUtils.isNotBlank(detectorInfoMap.get(detectorId))){
detectorData.setDetectorCode(detectorInfoMap.get(detectorId));
}
}
@ -459,7 +459,7 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
stationMap.put(stationId, detectorDataList);
stationData.setStationId(stationId);
if (CollectionUtils.isNotEmpty(stationInfoMap)){
if (stationInfoMap.containsKey(stationId)){
if (StringUtils.isNotBlank(stationInfoMap.get(stationId))){
stationData.setStationCode(stationInfoMap.get(stationId));
}
}

1
jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java
View File

@ -56,6 +56,7 @@ public class SysUserFocusStationServiceImpl extends ServiceImpl<SysUserFocusStat
item.setStationType(stationType);
item.setLon(stations.getLon());
item.setLat(stations.getLat());
item.setStatus(stations.getStatus());
item.setAltitude(Objects.isNull(stations.getElevation())?"":stations.getElevation()+"m");
}
}