Changeset 129 for ether_megapoli/trunk/persistence

Timestamp:

07/25/11 21:20:23 (13 years ago)

Author:

vmipsl

Message:

Commit intermédiaire : plot dynamique (version instable et pas clean)

Location:

ether_megapoli/trunk/persistence

Files:

• implementation/com/ether/dao/ValueDAOImpl.java (modified) (3 diffs)
• implementation/hibernate-domain.cfg.xml (modified) (1 diff)
• interface/com/ether/dao/ValueDAO.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package com.ether.dao;
 
-import java.util.Date;
-import java.util.List;
-
+import com.ether.Data;
+import com.ether.Pair;
+import com.ether.PersistenceException;
 import com.medias.database.objects.Valeur;
 import org.hibernate.criterion.DetachedCriteria;
@@ -12 +12 @@
 import org.jetbrains.annotations.Nullable;
 
-import com.ether.Data;
-import com.ether.PersistenceException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
@@ -19 +20 @@
  * @date 07 apr 2011
  */
-public class ValueDAOImpl extends DomainAccessObjectImpl<Valeur, Integer>
-        implements ValueDAO
+public class ValueDAOImpl
+        extends DomainAccessObjectImpl<Valeur, Integer>
+        implements ValueDAO
 {
-    protected ValueDAOImpl() {
-        super(Valeur.class);
+    protected ValueDAOImpl()
+    {
+        super( Valeur.class );
     }
 
-        @Nullable
-        public List<Data> getValuesByPlateformByParameterByPeriod(@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));
+    @Nullable
+    public List<Pair<Double, Date>> getValuesByPlateformByParameterByPeriod( @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.setProjection( Projections.distinct( Projections.projectionList()
-                                        .add( Projections.property( "value.valeurVal" ) )
-                                        .add( Projections.property( "measure.mesureDate" ) ) ) );
+        if( null != dateBegin )
+            criteria.add( Restrictions.ge( "measure.mesureDate", dateBegin ) );
+        if( null != dateEnd )
+            criteria.add( Restrictions.le( "measure.mesureDate", dateEnd ) );
 
-        criteria.addOrder( Order.asc("measure.mesureDate") );
+        criteria.setProjection( Projections.distinct( Projections.projectionList()
+                .add( Projections.property( "value.valeurVal" ) )
+                .add( Projections.property( "measure.mesureDate" ) ) ) );
 
-                return selectAllByCriteria(Data.class, criteria);
-        }
+        criteria.addOrder( Order.asc( "measure.mesureDate" ) );
+
+        final List<Object[]> objects = selectAllByCriteria( Object[].class, criteria );
+        final List<Pair<Double, Date>> result = new ArrayList<Pair<Double, Date>>();
+        for( final Object[] value : objects )
+        {
+            final Pair<Double, Date> item = new Pair<Double, Date>();
+            item.setFirstValue( (Double) value[0] );
+            item.setSecondValue( (Date) value[1] );
+            result.add( item );
+        }
+
+        return result;
+    }
 }

ether_megapoli/trunk/persistence/implementation/hibernate-domain.cfg.xml

@@ -6 +6 @@
 <hibernate-configuration>
         <session-factory>
-        <mapping resource="com/medias/objects/Adresse.hbm.xml"/>
-        <mapping resource="com/medias/objects/Bilan.hbm.xml"/>
-        <mapping resource="com/medias/objects/Capteur.hbm.xml"/>
-        <mapping resource="com/medias/objects/Categorie.hbm.xml"/>
-        <mapping resource="com/medias/objects/CategorieParam.hbm.xml"/>
-        <mapping resource="com/medias/objects/Commentaire.hbm.xml"/>
-        <mapping resource="com/medias/objects/DeltaMesure.hbm.xml"/>
-        <mapping resource="com/medias/objects/Fabriquant.hbm.xml"/>
-        <mapping resource="com/medias/objects/Fichier.hbm.xml"/>
-        <mapping resource="com/medias/objects/Flag.hbm.xml"/>
-        <mapping resource="com/medias/objects/Jeu.hbm.xml"/>
-        <mapping resource="com/medias/objects/Langue.hbm.xml"/>
-        <mapping resource="com/medias/objects/Localisation.hbm.xml"/>
-        <mapping resource="com/medias/objects/Mesure.hbm.xml"/>
-        <mapping resource="com/medias/objects/Organisme.hbm.xml"/>
-        <mapping resource="com/medias/objects/Parametre.hbm.xml"/>
-        <mapping resource="com/medias/objects/Personne.hbm.xml"/>
-        <mapping resource="com/medias/objects/Plateforme.hbm.xml"/>
-        <mapping resource="com/medias/objects/RequeteNbvalsJeu.hbm.xml"/>
-        <mapping resource="com/medias/objects/RequetePlatLoc.hbm.xml"/>
-        <mapping resource="com/medias/objects/Sequence.hbm.xml"/>
-        <mapping resource="com/medias/objects/TypeCapteur.hbm.xml"/>
-        <mapping resource="com/medias/objects/TypePlateforme.hbm.xml"/>
-        <mapping resource="com/medias/objects/Unite.hbm.xml"/>
-        <mapping resource="com/medias/objects/Valeur.hbm.xml"/>
-        <mapping resource="com/medias/objects/Zone.hbm.xml"/>
+        <!--<mapping resource="com/medias/objects/Adresse.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Bilan.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Capteur.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Categorie.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/CategorieParam.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Commentaire.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/DeltaMesure.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Fabriquant.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Fichier.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Flag.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Jeu.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Langue.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Localisation.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Mesure.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Organisme.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Parametre.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Personne.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Plateforme.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/RequeteNbvalsJeu.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/RequetePlatLoc.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Sequence.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/TypeCapteur.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/TypePlateforme.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Unite.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Valeur.hbm.xml"/>-->
+        <!--<mapping resource="com/medias/objects/Zone.hbm.xml"/>-->
         </session-factory>
 </hibernate-configuration>

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

@@ -4 +4 @@
 import java.util.List;
 
+import com.ether.Pair;
 import com.medias.database.objects.Valeur;
 import org.jetbrains.annotations.NotNull;
@@ -19 +20 @@
 {
         @Nullable
-        List<Data> getValuesByPlateformByParameterByPeriod(@NotNull final Integer plateformId, @NotNull final Integer parameterId, @Nullable final Date dateBegin, @Nullable final Date dateEnd) throws PersistenceException;
+        List<Pair<Double, Date>> getValuesByPlateformByParameterByPeriod(@NotNull final Integer plateformId, @NotNull final Integer parameterId, @Nullable final Date dateBegin, @Nullable final Date dateEnd) throws PersistenceException;
 }