Changeset 194 for ether_megapoli/trunk/persistence

Timestamp:

09/13/11 16:18:53 (13 years ago)

Author:

vmipsl

Message:

Servlet _ TimeSerie?

• interface bloquée pour 2 params ok
• dates en CEST et non GMT ok

Location:

ether_megapoli/trunk/persistence

Files:

• implementation/com/ether/dao/ValueDAOImpl.java (modified) (3 diffs)
• interface/com/ether/dao/ValueDAO.java (modified) (2 diffs)

ether_megapoli/trunk/persistence/implementation/com/ether/dao/ValueDAOImpl.java

@@ -87 +87 @@
         criteria.addOrder( Order.asc( "localisation.localisationLon" ) );
 
-//        final List<Object[]> objects = selectAllByCriteria( Object[].class, criteria );
-        // TODO : remove maxResults to 10
-        final List<Object[]> objects = selectPage( null, 100, criteria );
+        final List<Object[]> objects = selectAllByCriteria( Object[].class, criteria );
 
         final double[] latitudeValues = new double[objects.size()];
@@ -131 +129 @@
         criteria.addOrder( Order.asc( "localisation.localisationLon" ) );
 
-//        final List<Object[]> objects = selectAllByCriteria( Object[].class, criteria );
-        // TODO : remove maxResults to 10
-        final List<Object[]> objects = selectPage( null, 100, criteria );
+        final List<Object[]> objects = selectAllByCriteria( Object[].class, criteria );
 
         final List<Double> latitudeValues = new ArrayList<Double>( objects.size() );
@@ -169 +165 @@
         return count( criteria );
     }
-
-//    @NotNull
-//    public Integer getNumberValuesByPlateformByParameterByPeriod( @NotNull final List<Pair> pairs, @Nullable final Date beginDate, @Nullable final Date endDate )
-//            throws PersistenceException
-//    {
-//        final DetachedCriteria criteria = DetachedCriteria.forClass( Valeur.class, "value" )
-//                .add( Restrictions.eq( "value.parametre.id", parameterId ) )
-//                .createCriteria( "mesure", "measure" )
-//                .add( Restrictions.eq( "measure.plateforme.id", plateformId ) );
-//
-//        if( null != beginDate )
-//            criteria.add( Restrictions.ge( "measure.mesureDate", beginDate ) );
-//        if( null != endDate )
-//            criteria.add( Restrictions.le( "measure.mesureDate", endDate ) );
-//
-//        criteria.setProjection( Projections.property( "value.valeurVal" ) );
-//
-//        return count( criteria );
-//    }
-
 }

ether_megapoli/trunk/persistence/interface/com/ether/dao/ValueDAO.java

@@ -2 +2 @@
 
 import com.ether.Data;
-import com.ether.Pair;
 import com.ether.PersistenceException;
 import com.medias.database.objects.Valeur;
@@ -33 +32 @@
     Integer getNumberValuesByPlateformByParameterByPeriod( @NotNull final Integer plateformId, @NotNull final Integer parameterId, @Nullable final Date beginDate, @Nullable final Date endDate )
             throws PersistenceException;
-
-//    @NotNull
-//    Integer getNumberValuesByPlateformByParameterByPeriod( @NotNull final List<Pair> pairs, @Nullable final Date beginDate, @Nullable final Date endDate )
-//            throws PersistenceException;
 }