Changeset 7660
- Timestamp:
- 26/10/10 16:00:00 (10 years ago)
- Location:
- RevitalizationWS/ws/DPWS/trunk/src/main
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/DPWS.java
r7656 r7660 50 50 import ndg.services.revitalization.executor.ExecuteGetProcessStatusRequest; 51 51 import ndg.services.revitalization.executor.ExecuteGetProviderDetails; 52 import ndg.services.revitalization.executor.ExecuteGetProviderStatistic; 52 53 import ndg.services.revitalization.executor.ExecuteHarvest; 53 54 import ndg.services.revitalization.executor.ServiceExecutor; … … 74 75 import ndg.services.schemas.revitalization.GetProviderDetailsRequest; 75 76 import ndg.services.schemas.revitalization.GetProviderDetailsResponse; 77 import ndg.services.schemas.revitalization.GetProviderStatisticRequest; 78 import ndg.services.schemas.revitalization.GetProviderStatisticResponse; 76 79 77 80 import org.jboss.wsf.spi.annotation.WebContext; … … 170 173 return executor.doService(request); 171 174 } 175 176 @WebMethod(operationName = "getProviderStatistic") 177 public GetProviderStatisticResponse getProviderStatistic(@WebParam(name = "request") GetProviderStatisticRequest request) { 178 ServiceExecutor<GetProviderStatisticRequest, GetProviderStatisticResponse> executor = new ExecuteGetProviderStatistic(); 179 return executor.doService(request); 180 } 172 181 } -
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/ModelManager.java
r7656 r7660 32 32 package ndg.services.revitalization.ejb; 33 33 34 import java.math.BigInteger; 34 35 import java.sql.Timestamp; 35 36 import java.util.ArrayList; … … 46 47 import javax.persistence.Query; 47 48 48 import ndg.common.NdgMessage;49 49 import ndg.common.ejb.exception.TimerCreationException; 50 50 import ndg.common.exception.NdgExecutionException; … … 61 61 import ndg.services.revitalization.jpa.ProviderCommon; 62 62 import ndg.services.revitalization.jpa.ProviderEmail; 63 import ndg.services.revitalization.jpa.ProviderStatistic; 63 64 import ndg.services.revitalization.jpa.ServiceConfig; 64 65 import ndg.services.revitalization.jpa.ServiceParameterValue; … … 87 88 private final static String GET_INGEST_LOG_BY_PROVIDER = "select l, p.providerId from IngestSearchLogging l, HiProcess p where l.reqId=p.id and p.providerId=:providerID and l.startIngest >= :start and l.stopIngest <= :end"; 88 89 private final static String GET_INGEST_LOG_ALL_PROVIDER = "select l, p.providerId from IngestSearchLogging l, HiProcess p where l.reqId=p.id and l.startIngest >= :start and l.stopIngest <= :end"; 90 private final static String GET_PROVIDER_STATISTIC = "select count(datacentre_name) from original_document where datacentre_name IN (:providerIDs) group by datacentre_name"; 91 private final static String GET_ALL_PROVIDER_STATISTIC = "select count(datacentre_name), datacentre_name from original_document group by datacentre_name"; 89 92 90 93 … … 92 95 private EntityManager em; 93 96 97 @PersistenceContext(unitName = "discoveryDB") 98 private EntityManager emDiscovery; 99 94 100 @EJB 95 101 private HiProcessModelLocal processModel; … … 343 349 } 344 350 351 public List<ProviderStatistic> getProviderStatistic(List<Integer> providerID) throws NdgExecutionException { 352 353 //to delete and substitute with the commented code 354 String sqlString = GET_ALL_PROVIDER_STATISTIC; 355 /* 356 String sqlString = GET_PROVIDER_STATISTIC; 357 if (providerID == null || providerID.size() == 0) 358 sqlString = GET_ALL_PROVIDER_STATISTIC; 359 */ 360 361 Query query = emDiscovery.createNativeQuery(sqlString); 362 if (sqlString.equals(GET_PROVIDER_STATISTIC)) 363 query.setParameter("providerIDs", providerID); 364 List<Object[]> origDocs = query.getResultList(); 365 366 List<ProviderStatistic> ret = new ArrayList<ProviderStatistic>(); 367 ProviderStatistic ps = null; 368 for(Object[] stat : origDocs) { 369 ps = new ProviderStatistic(); 370 ps.setProviderID(-1); 371 if (stat[1] != null && stat[1].getClass().isAssignableFrom(Integer.class)) 372 ps.setProviderID((Integer)stat[1]); 373 ps.setIngestedRecord(((BigInteger)stat[0]).intValue()); 374 ret.add(ps); 375 } 376 return ret; 377 } 378 345 379 @SuppressWarnings("unchecked") 346 380 private <T extends ProviderCommon> T getProvider(int id, String queryText) { … … 353 387 return values.get(0); 354 388 } 355 356 389 } -
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/interfaces/ModelManagerLocal.java
r7656 r7660 44 44 import ndg.services.revitalization.jpa.IngestSearchLogging; 45 45 import ndg.services.revitalization.jpa.ProviderCommon; 46 import ndg.services.revitalization.jpa.ProviderStatistic; 46 47 import ndg.services.revitalization.jpa.TimerInfo; 47 48 import ndg.services.revitalization.jpa.TimerInfoLog; … … 107 108 108 109 public void deleteProvider(List<Integer> providerID) throws NdgExecutionException; 110 111 public List<ProviderStatistic> getProviderStatistic(List<Integer> providerID) throws NdgExecutionException; 109 112 } -
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/interfaces/ModelManagerRemote.java
r7656 r7660 46 46 import ndg.services.revitalization.jpa.IngestSearchLogging; 47 47 import ndg.services.revitalization.jpa.ProviderCommon; 48 import ndg.services.revitalization.jpa.ProviderStatistic; 48 49 import ndg.services.revitalization.jpa.TimerInfo; 49 50 import ndg.services.revitalization.jpa.TimerInfoLog; … … 178 179 179 180 public void deleteProvider(List<Integer> providerID) throws NdgExecutionException; 181 182 public List<ProviderStatistic> getProviderStatistic(List<Integer> providerID) throws NdgExecutionException; 180 183 } -
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/executor/ExecuteDeleteProvider.java
r7656 r7660 34 34 import ndg.common.exception.NdgExecutionException; 35 35 import ndg.services.revitalization.EJBBeanFactory; 36 import ndg.services.revitalization.jpa.TimerInfo;37 import ndg.services.revitalization.jpa.TimerInfoLog;38 36 import ndg.services.schemas.revitalization.DeleteProviderRequest; 39 37 import ndg.services.schemas.revitalization.DeleteProviderResponse; 40 import ndg.services.schemas.revitalization.DeleteTimerRequest;41 import ndg.services.schemas.revitalization.DeleteTimerResponse;42 38 43 39 /** -
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/jpa/CswProvider.java
r7389 r7660 17 17 import javax.persistence.Column; 18 18 import javax.persistence.Entity; 19 import javax.persistence.PersistenceContext; 19 20 import javax.persistence.PrimaryKeyJoinColumn; 20 21 import javax.persistence.Table; -
RevitalizationWS/ws/DPWS/trunk/src/main/resources/META-INF/persistence.xml
r7321 r7660 10 10 </properties> 11 11 </persistence-unit> 12 13 <persistence-unit name="discoveryDB" transaction-type="JTA"> 14 <jta-data-source>jdbc/discoveryDB</jta-data-source> 15 <exclude-unlisted-classes>true</exclude-unlisted-classes> 16 <properties> 17 <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" /> 18 <property name="hibernate.hbm2ddl.auto" value="validate" /> 19 </properties> 20 </persistence-unit> 12 21 </persistence>
Note: See TracChangeset
for help on using the changeset viewer.