Changeset 447 for tapas/service

Timestamp:

04/02/12 17:48:51 (12 years ago)

Author:

rboipsl

Message:

mapping tapas num request

Location:

tapas/service

Files:

• implementation/com/ether/TapasServiceImpl.java (modified) (7 diffs)
• implementation/service-context.xml (modified) (1 diff)
• interface/com/ether/TapasService.java (modified) (2 diffs)

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

@@ -2 +2 @@
 
 import com.ether.dao.ObservatoryDAO;
+import com.ether.dao.TapasNumRequestDAO;
 import com.ether.tapas.Observatory;
 import com.ether.tapas.Request;
@@ -30 +31 @@
 
     public void createXMLRequest( @NotNull final Tapas fTapas )
+            throws ServiceException
     {
 
@@ -40 +42 @@
         //On crée un nouveau Document JDOM basé sur la racine que l'on vient de créer
         final Document document = new Document( tapas );
-
 
         //a terme recuperer id tapas via la BDD
@@ -57 +58 @@
             request.setAttribute( idR );
 
+            final Observatory obs = getObservatoryByName( iRequest.getObservation().getObservatory().getName() );
+
             // PREFERENCES
             final Element preferences = new Element( "preferences" );
@@ -70 +73 @@
 
             // Element rayleighExtinction
-           /* final Element rayleighExtinction = new Element( "rayleigh_extinction" );
-            final Attribute validR = new Attribute( "valid", iRequest.getPreference().getRayleighExtinction().getFirstValue() );
-            rayleighExtinction.setAttribute( validR );
-            rayleighExtinction.setText( iRequest.getPreference().getRayleighExtinction().getSecondValue() );
-            preferences.addContent( rayleighExtinction );*/
+            /* final Element rayleighExtinction = new Element( "rayleigh_extinction" );
+          final Attribute validR = new Attribute( "valid", iRequest.getPreference().getRayleighExtinction().getFirstValue() );
+          rayleighExtinction.setAttribute( validR );
+          rayleighExtinction.setText( iRequest.getPreference().getRayleighExtinction().getSecondValue() );
+          preferences.addContent( rayleighExtinction );*/
 
 
@@ -129 +132 @@
     }
 
+    // recuperation infos observatoire avec le nom
+    @Nullable
+    @Transactional(readOnly = true)
+    public Long getNumRequest()
+            throws ServiceException
+    {
+        try
+        {
+            return _tapasNumRequestDAO.getNumRequest();
+        }
+        catch( PersistenceException e )
+        {
+            throw new ServiceException( ServiceException.ServiceCode.OBSERVATORY_NOT_FOUND, e );
+        }
+    }
+
+
+    // recuperation infos observatoire avec le nom
+    @Nullable
+    @Transactional(readOnly = true)
+    public Observatory getObservatoryByName( @NotNull final String name )
+            throws ServiceException
+    {
+        try
+        {
+            return _observatoryDAO.getObservatoryByName( name );
+        }
+        catch( PersistenceException e )
+        {
+            throw new ServiceException( ServiceException.ServiceCode.OBSERVATORY_NOT_FOUND, e );
+        }
+    }
+
 
     @Required
@@ -136 +172 @@
     }
 
+    @Required
+    public void setTapasNumRequestDAO( final TapasNumRequestDAO tapasNumRequestDAO )
+    {
+        _tapasNumRequestDAO = tapasNumRequestDAO;
+    }
+
     private static final Log LOGGER = LogFactory.getLog( TapasServiceImpl.class );
 
     private ObservatoryDAO _observatoryDAO;
+
+    private TapasNumRequestDAO _tapasNumRequestDAO;
 }

tapas/service/implementation/service-context.xml

@@ -5 +5 @@
     <bean id="tapasServiceTarget" class="com.ether.TapasServiceImpl" parent="backofficeServiceTarget">
         <property name="observatoryDAO" ref="refObservatoryDAO"/>
+        <property name="tapasNumRequestDAO" ref="refTapasNumRequestDAO"/>
     </bean>
 

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

@@ -17 +17 @@
 {
 
-    public void createXMLRequest( @NotNull final Tapas tapas );
+    public void createXMLRequest( @NotNull final Tapas tapas )
+            throws ServiceException;
 
     public void createXMLFile( final String fichier, final Document document );
@@ -23 +24 @@
     public List<Observatory> getAllObservatories() throws ServiceException;
 
+    public Observatory getObservatoryByName(@NotNull final String name) throws ServiceException;
+
+    public Long getNumRequest() throws ServiceException;
+
 }