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

Merge "ASM #15039 add a fix to be able to post data to hour24 column" into asm_16.1.1

Browse source 
Former-commit-id: bf150af4465826b46b2e9338a8d87dc94bd38dd1
This commit is contained in:
Juliya Dynina 2015-07-01 08:15:57 -05:00 • committed by Gerrit Code Review
commit 1dc5e9dc2d
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
View file

@ -54,8 +54,9 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
* 02 Feb 2012 #15845 lbousaidi added check for data that comes in as -999
* 07 May 2013 #15880 lbousaidi changed pPE parameter because it was inserting to the
* wrong hour field.
* 15 Sep 2014 #17129 lbousaidi add a fix for the top of hour issue for hourlypp.
* 15 Sep 2014 #17129 lbousaidi add a fix for the top of hour issue for hourlypp.
* 18 Sep 2014 #3627 mapeters Updated deprecated {@link TimeTools} usage.
* 15 Jun 2015 #15039 lbousaidi add a fix to be able to post data to hour24.
* </pre>
*
* @author mnash
@ -573,7 +574,8 @@ public class GagePP {
dt.add(Calendar.HOUR_OF_DAY, 1);
rec.setObsTime(dt.getTime());
}
if (hour == 0) {
if (hour == 24 || hour == 0) {
// hour = 24;
dt.add(Calendar.DAY_OF_YEAR, -1);
rec.setObsTime(dt.getTime());

17
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/PrecipUtils.java
View file

@ -21,6 +21,21 @@ import com.raytheon.uf.common.ohd.AppsDefaults;
import com.raytheon.uf.edex.database.dao.CoreDao;
import com.raytheon.uf.edex.database.dao.DaoConfig;
/**
*
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 15 Jun 2015 #15039 lbousaidi add case 24 to be able to post data to hour24.
* </pre>
*
* @author
* @version
*/
public abstract class PrecipUtils {
private static final float MISSING_PRECIP = -9999f;
@ -233,6 +248,7 @@ public abstract class PrecipUtils {
break;
case 0:
case 24:
pHourly.setHour24(precip_value);
break;
default:
@ -323,6 +339,7 @@ public abstract class PrecipUtils {
precip_value = pHourlyPP.getHour23();
break;
case 0:
case 24:
precip_value = pHourlyPP.getHour24();
break;
default: