Omaha #2061 Allow acars to return data through point data requests.

Former-commit-id: fad91d775de63379e0ee3ff47ffeb39730abfe11
This commit is contained in:
Ben Steffensmeier 2014-06-06 14:33:22 -05:00
parent 920e53628b
commit 4ea7f35d7a
6 changed files with 105 additions and 15 deletions

View file

@ -12,5 +12,6 @@ Require-Bundle: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
javax.persistence,
org.hibernate;bundle-version="1.0.0",
javax.measure;bundle-version="1.0.0"
javax.measure;bundle-version="1.0.0",
com.raytheon.uf.common.dataaccess;bundle-version="1.14.0"
Export-Package: com.raytheon.uf.common.dataplugin.acars

View file

@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
.,\
res/

View file

@ -1,20 +1,20 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Acars Plug-in
Bundle-Name: Acars Decoder Plug-in
Bundle-SymbolicName: com.raytheon.uf.edex.plugin.acars
Bundle-Version: 1.14.0.qualifier
Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.raytheon.edex.common,
com.raytheon.uf.common.pointdata,
com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
org.geotools,
javax.persistence,
javax.measure
javax.measure,
com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174"
Export-Package: com.raytheon.uf.edex.plugin.acars,
com.raytheon.uf.edex.plugin.acars.common,
com.raytheon.uf.edex.plugin.acars.dao
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: com.raytheon.uf.common.dataplugin.acars,
com.raytheon.uf.common.status,
com.raytheon.uf.common.wmo

View file

@ -0,0 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<pointDataDescription>
</pointDataDescription>

View file

@ -0,0 +1,50 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<pointDataDbDescription>
<parameter name="latitude" queryName="location.latitude" type="FLOAT" unit="°" />
<parameter name="longitude" queryName="location.longitude" type="FLOAT" unit="°" />
<parameter name="stationId" queryName="location.stationId" type="STRING" />
<parameter name="flightLevel" queryName="location.flightLevel" type="INT" />
<parameter name="timeObs" queryName="timeObs" numDims="1" type="LONG" unit="ms" />
<parameter name="wmoHeader" queryName="wmoHeader" type="STRING" />
<parameter name="tailNumber" queryName="tailNumber" type="STRING" />
<parameter name="receiver" queryName="receiver" type="STRING" />
<parameter name="flightPhase" queryName="flightPhase" type="INT" />
<parameter name="temp" queryName="temp" type="FLOAT" unit="K" />
<parameter name="dwpt" queryName="dwpt" type="FLOAT" unit="K" />
<parameter name="pressure" queryName="pressure" type="FLOAT" unit="Pa" />
<parameter name="humidity" queryName="humidity" type="FLOAT" unit="%"/>
<parameter name="mixingRatio" queryName="mixingRatio" type="FLOAT" unit="kg/kg" />
<parameter name="windDirection" queryName="windDirection" type="INT" unit="°"/>
<parameter name="windSpeed" queryName="windSpeed" type="FLOAT" unit="m/s"/>
<parameter name="iceBaseHgt" queryName="iceBaseHgt" type="INT" unit="m" />
<parameter name="iceTopHgt" queryName="iceTopHgt" type="INT" unit="m" />
<parameter name="icing" queryName="icing" type="INT" />
<parameter name="turbBaseHgt" queryName="turbBaseHgt" type="INT" unit="m" />
<parameter name="turbTopHgt" queryName="turbTopHgt" type="INT" unit="m" />
<parameter name="turbulence" queryName="turbulence" type="INT" unit="m" />
<parameter name="rollAngleQuality" queryName="rollAngleQuality" type="INT" />
<parameter name="dataURI" queryName="dataURI" type="STRING" />
<parameter name="refTime" queryName="dataTime.refTime" numDims="1" type="LONG" unit="ms"/>
<parameter name="forecastHr" queryName="dataTime.fcstTime" numDims="1" type="INT" unit="h" dbunit="s"/>
</pointDataDbDescription>

View file

@ -27,11 +27,11 @@ import org.hibernate.Query;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
import com.raytheon.edex.db.dao.DefaultPluginDao;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.acars.ACARSRecord;
import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
/**
* ACARDS dao.
@ -39,13 +39,14 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jan 21, 2009 1939 jkorman Initial creation
* Oct 10, 2012 1261 djohnson Add some generics wildcarding.
* Nov 02, 2012 1302 djohnson Add Javadoc.
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Mar 27, 2014 2811 skorolev Updated logger.
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Jan 21, 2009 1939 jkorman Initial creation
* Oct 10, 2012 1261 djohnson Add some generics wildcarding.
* Nov 02, 2012 1302 djohnson Add Javadoc.
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Mar 27, 2014 2811 skorolev Updated logger.
* Jun 06, 2014 2061 bsteffen Extend PointDataPluginDao
*
* </pre>
*
@ -53,7 +54,7 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
* @version 1.0
*/
public class ACARSDao extends DefaultPluginDao {
public class ACARSDao extends PointDataPluginDao<ACARSRecord> {
/**
* Creates a new ReccoDao
@ -211,4 +212,19 @@ public class ACARSDao extends DefaultPluginDao {
return retData;
}
@Override
public String[] getKeysRequiredForFileName() {
return new String[0];
}
@Override
public ACARSRecord newObject() {
return new ACARSRecord();
}
@Override
public String getPointDataFileName(ACARSRecord p) {
return null;
}
}