xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #4845 - Fix hydro query result processing

Browse source 
Change-Id: If40a575d1f42a3065fe97aefeed8ea14087c5c93

Former-commit-id: 89b40f883c3d611efdf8abcb20394e65bbd8d02c
This commit is contained in:
Richard Peter 2015-09-03 16:49:02 -05:00
parent 5cacc8ba5c
commit 36b68aac36
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationreporting/StationReportingData.java
View file

@ -33,7 +33,7 @@ import java.util.TimeZone;
* ------------ ---------- ----------- --------------------------
* OCT 8, 2007 1580 askripsky Initial creation.
* 21 Feb 2010 2915 mpduff Fixed Time Zone problem.
*
* Sep 03, 2015 4845 rjpeter Fix NPE.
* </pre>
*
* @author askripsky
@ -245,8 +245,8 @@ public class StationReportingData implements Comparable<StationReportingData> {
return qualityCode;
}
public void setQualityCode(Integer qualityCode) {
this.qualityCode = (qualityCode != null) ? qualityCode : 0;
public void setQualityCode(Number qualityCode) {
this.qualityCode = (qualityCode != null) ? qualityCode.intValue() : 0;
}
public String getProductId() {

5
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationreporting/StationReportingDataManager.java
View file

@ -50,6 +50,7 @@ import com.raytheon.viz.hydrocommon.HydroDataCache;
* 13Oct2008 1580 askripsky Refactored
* 21 Feb 2010 2915 mpduff Fixed Time Zone problem.
* Jul 21, 2015 4500 rjpeter Use Number in blind cast.
* Sep 03, 2015 4845 rjpeter Fix NPE.
* </pre>
*
* @author ebabin
@ -252,7 +253,7 @@ public class StationReportingDataManager {
srd.setValue((Double) oa[6]);
srd.setRevision(((Number) oa[7]).shortValue());
srd.setShefQualCode((String) oa[8]);
srd.setQualityCode(((Number) oa[9]).intValue());
srd.setQualityCode((Number) oa[9]);
srd.setProductId((String) oa[10]);
srd.setProducttime(currentTimeFormat
.format((Date) oa[11]));
@ -303,7 +304,7 @@ public class StationReportingDataManager {
retVal.setShefQualCode(dataRow[7].toString());
if (dataRow[8] != null) {
retVal.setQualityCode(((Number) dataRow[8]).intValue());
retVal.setQualityCode((Number) dataRow[8]);
}
if (dataRow[9] != null) {

3
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/RiverDataManager.java
View file

@ -58,6 +58,7 @@ import com.raytheon.viz.hydrocommon.data.RiverDataPoint;
* 14 feb 2011 #4383 lbousaidi changed getRiverDataPoint: added crestQuery,
* set riverName using locationquery instead of
* riverInfoQuery, added rb field in locationQuery
* Sep 03, 2015 4845 rjpeter Remove use of duplicate alias.
* </pre>
*
* @author dhladky
@ -109,7 +110,7 @@ public class RiverDataManager {
+ "rmg.group_name, "
+ "r.stream, r.mile, r.zd AS zero, r.tide, r.bf AS bankfull, r.wstg AS action_stage, r.fs AS flood_stage, r.fq AS flood_flow, r.action_flow, r.primary_pe, "
+ "d.proximity, d.reach, "
+ "f.minor_stage AS minor, f.moderate_stage AS moderate, f.major_stage AS major, f.minor_flow AS minor, f.moderate_flow AS moderate, f.major_flow AS major "
+ "f.minor_stage, f.moderate_stage, f.major_stage, f.minor_flow, f.moderate_flow, f.major_flow "
+ "FROM location l "
+ "LEFT JOIN floodcat f ON l.lid::text = f.lid::text "
+ "LEFT JOIN descrip d ON l.lid::text = d.lid::text, riverstat r, rivermonlocation rml "