Changeset 191 for ether_megapoli/trunk/persistence/implementation/com/ether/dao/ValueDAOImpl.java

Timestamp:

09/12/11 18:11:46 (13 years ago)

Author:

vmipsl

Message:

Servlet _ Contour en cours

File:

• ether_megapoli/trunk/persistence/implementation/com/ether/dao/ValueDAOImpl.java (modified) (6 diffs)

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

@@ -3 +3 @@
 import com.ether.Data;
 import com.ether.PersistenceException;
+import com.medias.Nombre;
 import com.medias.database.objects.Valeur;
 import org.hibernate.criterion.DetachedCriteria;
@@ -11 +12 @@
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -47 +49 @@
 
         final List<Object[]> objects = selectAllByCriteria( Object[].class, criteria );
-        // TODO : remove maxResults to 10
-//        final List<Object[]> objects = selectPage( null, 10, criteria );
 
         final double[] values = new double[objects.size()];
@@ -65 +65 @@
 
     @NotNull
-    public <T1, T2, T3> Data<T1[], T2[], T3[]> getListsByPlateformByParameterByPeriodFor2D( @NotNull final Integer plateformId, @NotNull final Integer parameterId, @Nullable final Date dateBegin, @Nullable final Date dateEnd )
+    public <T1, T2, T3> Data<T1[], T2[], T3[]> getArraysByPlateformByParameterByPeriodFor2D( @NotNull final Integer plateformId, @NotNull final Integer parameterId, @Nullable final Date dateBegin, @Nullable final Date dateEnd )
             throws PersistenceException
     {
@@ -89 +89 @@
 //        final List<Object[]> objects = selectAllByCriteria( Object[].class, criteria );
         // TODO : remove maxResults to 10
-        final List<Object[]> objects = selectPage( null, 10, criteria );
+        final List<Object[]> objects = selectPage( null, 100, criteria );
 
         final double[] latitudeValues = new double[objects.size()];
@@ -99 +99 @@
         {
             parameterValues[i] = (Double) value[0];
-            latitudeValues[i] = Double.valueOf( (Integer) value[1] );
-            longitudeValues[i] = Double.valueOf( (Integer) value[2] );
+            latitudeValues[i] = Nombre.latIntToFloat( (Integer) value[1] );
+            longitudeValues[i] = Nombre.latIntToFloat( (Integer) value[2] );
+            i++;
+        }
+
+        return new Data( parameterValues, latitudeValues, longitudeValues );
+    }
+
+
+    @NotNull
+    public <T1, T2, T3> Data<List<T1>, List<T2>, List<T3>> getListsByPlateformByParameterByPeriodFor2D( @NotNull final Integer plateformId, @NotNull final Integer parameterId, @Nullable final Date dateBegin, @Nullable final Date dateEnd )
+            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 != dateBegin )
+            criteria.add( Restrictions.ge( "measure.mesureDate", dateBegin ) );
+        if( null != dateEnd )
+            criteria.add( Restrictions.le( "measure.mesureDate", dateEnd ) );
+
+        criteria.createCriteria( "localisation", "localisation" );
+
+        criteria.setProjection( Projections.distinct( Projections.projectionList()
+                .add( Projections.property( "value.valeurVal" ) )
+                .add( Projections.property( "localisation.localisationLat" ) )
+                .add( Projections.property( "localisation.localisationLon" ) ) ) );
+
+        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<Double> latitudeValues = new ArrayList<Double>( objects.size() );
+        final List<Double> longitudeValues = new ArrayList<Double>( objects.size() );
+        final List<Double> parameterValues = new ArrayList<Double>( objects.size() );
+
+        int i = 0;
+        for( final Object[] value : objects )
+        {
+            parameterValues.add( (Double) value[0] );
+            latitudeValues.add( Double.valueOf( Nombre.latIntToFloat( (Integer) value[1] ) ) );
+            longitudeValues.add( Double.valueOf( Nombre.latIntToFloat( (Integer) value[2] ) ) );
             i++;
         }