From 36b68aac3605ed53d05b1b4633b6cff5634b0665 Mon Sep 17 00:00:00 2001 From: Richard Peter Date: Thu, 3 Sep 2015 16:49:02 -0500 Subject: [PATCH] Omaha #4845 - Fix hydro query result processing Change-Id: If40a575d1f42a3065fe97aefeed8ea14087c5c93 Former-commit-id: 89b40f883c3d611efdf8abcb20394e65bbd8d02c --- .../viz/hydro/stationreporting/StationReportingData.java | 6 +++--- .../hydro/stationreporting/StationReportingDataManager.java | 5 +++-- .../viz/hydrocommon/datamanager/RiverDataManager.java | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationreporting/StationReportingData.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationreporting/StationReportingData.java index da225e30af..89997b808a 100644 --- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationreporting/StationReportingData.java +++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationreporting/StationReportingData.java @@ -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. * * * @author askripsky @@ -245,8 +245,8 @@ public class StationReportingData implements Comparable { 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() { diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationreporting/StationReportingDataManager.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationreporting/StationReportingDataManager.java index b7809ca702..ddba0ca232 100644 --- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationreporting/StationReportingDataManager.java +++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationreporting/StationReportingDataManager.java @@ -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. * * * @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) { diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/RiverDataManager.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/RiverDataManager.java index 691aa82a6f..ff308b14b6 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/RiverDataManager.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/RiverDataManager.java @@ -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. * * * @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 "