Changeset 480 for tapas/service

Timestamp:

04/13/12 19:46:08 (12 years ago)

Author:

rboipsl

Message:

insertion requete dans bdd
lancement process qsub
debut modif design

Location:

tapas/service

Files:

• implementation/com/ether/TapasServiceImpl.java (modified) (13 diffs)
• implementation/service-context.xml (modified) (2 diffs)
• interface/com/ether/ServiceException.java (modified) (1 diff)
• interface/com/ether/TapasService.java (modified) (4 diffs)
• test/com/ether/EtherTest.java (modified) (1 diff)

tapas/service/implementation/com/ether/TapasServiceImpl.java

@@ -2 +2 @@
 
 import com.ether.dao.ObservatoryDAO;
-import com.ether.dao.TapasNumRequestDAO;
+import com.ether.dao.TapasRequestDAO;
 import com.ether.tapas.Observatory;
 import com.ether.tapas.Request;
 import com.ether.tapas.Tapas;
+import com.ether.tapas.TapasRequest;
 import com.ether.user.User;
 import org.apache.commons.logging.Log;
@@ -27 +28 @@
 import java.util.List;
 import java.util.Properties;
+import java.util.StringTokenizer;
 
 /**
@@ -37 +39 @@
 {
     @Transactional(readOnly = true)
-    public void createXMLRequest( @NotNull final Tapas fTapas, @NotNull final User user )
-            throws ServiceException
-    {
-
-        final String fichier = "/home_local/workspace/request2.xml";
+    public void createXMLRequest( @NotNull final Tapas fTapas, @NotNull final User user, @NotNull final Properties prop )
+            throws ServiceException
+    {
+
+        final String rootPath = prop.getProperty( "root_file_path" );
+        final String execPath = prop.getProperty( "exec_path" );
+
+        final String userPath = "";
+
+        final String fichier = rootPath+"/"+user.getLastName()+"/"+"request.xml";
 
         final Element tapas = new Element( "tapas" );
@@ -49 +56 @@
         final Document document = new Document( tapas );
 
-        //a terme recuperer id tapas via la BDD
-        //Long newNum = getNumRequest();
-        fTapas.setId( "1414" );
+        //recuperation valeur id requete (bdd table tapas_request)
+        fTapas.setId( "ETHER_TAPAS_" + String.valueOf( getNumRequest() ) );
 
         final Attribute id = new Attribute( "Id", fTapas.getId() );
@@ -64 +70 @@
             final Attribute idR = new Attribute( "Id", iRequest.getId().toString() );
             request.setAttribute( idR );
-
 
             // PREFERENCES
@@ -116 +121 @@
 
             // OBSERVATORIES
-            //recuperer les coordonnees obervatoire avec requete sql : methode de tapas services -> appel methode couche persistence
-            // TapasService
-            //iRequest.getObservation().getDate()
+
             final Element observation = new Element( "observation" );
 
@@ -131 +134 @@
             observation.addContent( observatory );
 
+            //recuperation des coordonnées de l'observatoire
             final Observatory obs;
             try
@@ -251 +255 @@
             atmosphere.addContent( reference );
 
-            final Properties prop = new Properties();
-            try
-            {
-                prop.load( new FileInputStream( "/home_local/workspace/tapas.properties" ) );
-            }
-            catch( IOException e )
-            {
-                throw new ServiceException( ServiceException.ServiceCode.PROPERTIES_FILE_NOT_FOUND, e );
-            }
-
-            final String rootPath = prop.getProperty( "root_file_path" );
-            final String userPath = "";
 
 
@@ -269 +261 @@
             fileECMWF = rootPath + "/" + user.getLastName() + "/" + createFileName( iRequest.getObservation().getDate(), "ecmwf" );
 
-
             final Element arlettyFile = new Element( "arletty_file" );
             arlettyFile.setText( fileArletty );
@@ -278 +269 @@
             atmosphere.addContent( ecmwfFile );
 
-
-            //creer le nom des fichiers input ECMW F + ARLETTY Ã  partir du nom court de l'observatoire
-            // + calculer le bonne heure de mesure en fonction de la date demandée : 00 06 12 ou 18h
-            //TapasService
-
-            //créer le num de le requete en lisant dans bdd
-
             tapas.addContent( request );
         }
 
         createXMLFile( fichier, document );
+    }
+
+
+    public boolean execAppelQSub( User user, Properties prop )
+            throws ServiceException
+    {
+
+        String commande = prop.getProperty( "root_file_path" )+"/"+user.getLastName()+"/"+prop.getProperty( "process_name" )+" -f request.xml"+" -m "+user.getEmail();
+
+        try
+        {
+            EtherHelper.execProcess(commande);
+        }
+        catch( FormattedException e )
+        {
+            throw new ServiceException(ServiceException.ServiceCode.ERROR_PROCESS, e);
+        }
+
+        return true;
     }
 
@@ -371 +374 @@
         try
         {
-            return _tapasNumRequestDAO.getNumRequest();
+            return _tapasRequestDAO.getNumRequest()+1;
         }
         catch( PersistenceException e )
         {
-            throw new ServiceException( ServiceException.ServiceCode.OBSERVATORY_NOT_FOUND, e );
+            throw new ServiceException( ServiceException.ServiceCode.REQUEST_NOT_FOUND, e );
+        }
+    }
+
+
+    @NotNull
+    @Transactional(rollbackFor = Exception.class)
+    public Long insertTapasRequest( @NotNull final User user )
+            throws ServiceException
+    {
+
+        try
+        {
+            String dd="1";
+
+            final TapasRequest ntp = new TapasRequest( user.getFirstName(),user.getLastName(),dd,_tapasRequestDAO.getNumRequest()+1);
+            return _tapasRequestDAO.insert( ntp );
+        }
+        catch( PersistenceException e )
+        {
+            throw new ServiceException( ServiceException.ServiceCode.PERSISTENCE, e );
         }
     }
@@ -404 +427 @@
 
     @Required
-    public void setTapasNumRequestDAO( final TapasNumRequestDAO tapasNumRequestDAO )
-    {
-        _tapasNumRequestDAO = tapasNumRequestDAO;
+    public void setTapasRequestDAO( final TapasRequestDAO tapasRequestDAO )
+    {
+        _tapasRequestDAO = tapasRequestDAO;
     }
 
@@ -413 +436 @@
     private ObservatoryDAO _observatoryDAO;
 
-    private TapasNumRequestDAO _tapasNumRequestDAO;
+    private TapasRequestDAO _tapasRequestDAO;
 }

tapas/service/implementation/service-context.xml

@@ -5 +5 @@
     <bean id="tapasServiceTarget" class="com.ether.TapasServiceImpl" parent="backofficeServiceTarget">
         <property name="observatoryDAO" ref="refObservatoryDAO"/>
+        <property name="tapasRequestDAO" ref="refTapasRequestDAO"/>
     </bean>
 
@@ -15 +16 @@
         </property>
     </bean>
+
 
     <bean id="backofficeServiceTarget" class="com.ether.BackofficeServiceImpl">

tapas/service/interface/com/ether/ServiceException.java

@@ -23 +23 @@
         PERSISTENCE,
         OBSERVATORY_NOT_FOUND,
+        REQUEST_NOT_FOUND,
         USER_NOT_FOUND,
-        PROPERTIES_FILE_NOT_FOUND;
+        PROPERTIES_FILE_NOT_FOUND,
+        ERROR_PROCESS;
     }
 }

tapas/service/interface/com/ether/TapasService.java

@@ -3 +3 @@
 import com.ether.tapas.Observatory;
 import com.ether.tapas.Tapas;
+import com.ether.tapas.TapasRequest;
 import com.ether.user.User;
 import org.jdom.Document;
@@ -9 +10 @@
 
 import java.util.List;
+import java.util.Properties;
 
 /**
@@ -18 +20 @@
 {
 
-    public void createXMLRequest( @NotNull final Tapas tapas, @NotNull final User user )
+    public void createXMLRequest( @NotNull final Tapas tapas, @NotNull final User user, @NotNull final Properties prop )
             throws ServiceException;
 
@@ -31 +33 @@
     public String createFileName(String date, String type) throws ServiceException;
 
+    public boolean execAppelQSub( @NotNull final User user, @NotNull final Properties prop ) throws ServiceException;
+
+    Long insertTapasRequest( @NotNull User user ) throws ServiceException;
+
 }

tapas/service/test/com/ether/EtherTest.java

@@ -19 +19 @@
         extends ServiceEtherTest
 {
-    @Test
+    /*@Test
     public void testCreateXML()
             throws Exception
     {
 
-        getService().createXMLRequest( null );
+        getService().createXMLRequest(  );
 
-    }
+    } */