diff --git a/trunk/SiprpWebFichasClinicas/.classpath b/trunk/SiprpWebFichasClinicas/.classpath index b5cbf4da..52b35ab5 100644 --- a/trunk/SiprpWebFichasClinicas/.classpath +++ b/trunk/SiprpWebFichasClinicas/.classpath @@ -24,7 +24,6 @@ - @@ -40,9 +39,6 @@ - - - @@ -50,7 +46,6 @@ - @@ -113,25 +108,14 @@ - - - - - - - - - - - diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/commons-validator-1.4.0.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/commons-validator-1.4.0.jar deleted file mode 100644 index ddb78e75..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/commons-validator-1.4.0.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/evolute.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/evolute.jar index 702cdc73..3f166a1f 100644 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/evolute.jar and b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/evolute.jar differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/jackson-annotations-2.3.0.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/jackson-annotations-2.3.0.jar deleted file mode 100644 index 3901f328..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/jackson-annotations-2.3.0.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/jackson-core-2.3.0.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/jackson-core-2.3.0.jar deleted file mode 100644 index 15121006..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/jackson-core-2.3.0.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/jackson-databind-2.3.0.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/jackson-databind-2.3.0.jar deleted file mode 100644 index 32f12f05..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/jackson-databind-2.3.0.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/json-20080701.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/json-20080701.jar deleted file mode 100644 index c9a093ed..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/json-20080701.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/json-20140107.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/json-20140107.jar deleted file mode 100644 index 40a325db..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/json-20140107.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar deleted file mode 100644 index 68d4f3b0..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/kxml2-2.3.0.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/kxml2-2.3.0.jar deleted file mode 100644 index 64709522..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/kxml2-2.3.0.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/kxml2-min-2.3.0.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/kxml2-min-2.3.0.jar deleted file mode 100644 index a77dd1d0..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/kxml2-min-2.3.0.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/xmlpull-1.1.3.1.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/xmlpull-1.1.3.1.jar deleted file mode 100644 index cbc149d0..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/xmlpull-1.1.3.1.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/xom-1.1.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/xom-1.1.jar deleted file mode 100644 index 3d1fcc88..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/xom-1.1.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/xpp3_min-1.1.4c.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/xpp3_min-1.1.4c.jar deleted file mode 100644 index 813a9a83..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/xpp3_min-1.1.4c.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/xstream-1.4.7.jar b/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/xstream-1.4.7.jar deleted file mode 100644 index ea4b6a28..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/lib/xstream-1.4.7.jar and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/build/app.properties b/trunk/SiprpWebFichasClinicas/build/app.properties index 1ac414fd..843e5f2a 100644 Binary files a/trunk/SiprpWebFichasClinicas/build/app.properties and b/trunk/SiprpWebFichasClinicas/build/app.properties differ diff --git a/trunk/SiprpWebFichasClinicas/build/pt/evolute/data/ProviderSpringBean.class b/trunk/SiprpWebFichasClinicas/build/pt/evolute/data/ProviderSpringBean.class index ba6b268b..dc7da459 100644 Binary files a/trunk/SiprpWebFichasClinicas/build/pt/evolute/data/ProviderSpringBean.class and b/trunk/SiprpWebFichasClinicas/build/pt/evolute/data/ProviderSpringBean.class differ diff --git a/trunk/SiprpWebFichasClinicas/build/shst/medicina/fichasclinicas/webservice/FichasClinicasWSImpl.class b/trunk/SiprpWebFichasClinicas/build/shst/medicina/fichasclinicas/webservice/FichasClinicasWSImpl.class index d93cd61a..bc8eb186 100644 Binary files a/trunk/SiprpWebFichasClinicas/build/shst/medicina/fichasclinicas/webservice/FichasClinicasWSImpl.class and b/trunk/SiprpWebFichasClinicas/build/shst/medicina/fichasclinicas/webservice/FichasClinicasWSImpl.class differ diff --git a/trunk/SiprpWebFichasClinicas/build/siprp_fichasclinicas.properties b/trunk/SiprpWebFichasClinicas/build/siprp_fichasclinicas.properties index 138e24c6..511e69e5 100644 --- a/trunk/SiprpWebFichasClinicas/build/siprp_fichasclinicas.properties +++ b/trunk/SiprpWebFichasClinicas/build/siprp_fichasclinicas.properties @@ -1,4 +1,4 @@ -#Wed, 16 Apr 2014 10:29:39 +0100 +#Thu, 17 Apr 2014 13:08:18 +0100 -timestamp=2014/04/16 10\:29 +timestamp=2014/04/17 13\:08 user=rsantos diff --git a/trunk/SiprpWebFichasClinicas/dist/siprp_fichasclinicas.jar b/trunk/SiprpWebFichasClinicas/dist/siprp_fichasclinicas.jar index 4ae469e9..6dd335d7 100644 Binary files a/trunk/SiprpWebFichasClinicas/dist/siprp_fichasclinicas.jar and b/trunk/SiprpWebFichasClinicas/dist/siprp_fichasclinicas.jar differ diff --git a/trunk/SiprpWebFichasClinicas/dist/siprp_fichasclinicas.war b/trunk/SiprpWebFichasClinicas/dist/siprp_fichasclinicas.war index 6a051ed1..9c51451e 100644 Binary files a/trunk/SiprpWebFichasClinicas/dist/siprp_fichasclinicas.war and b/trunk/SiprpWebFichasClinicas/dist/siprp_fichasclinicas.war differ diff --git a/trunk/SiprpWebFichasClinicas/src/pt/evolute/data/ProviderSpringBean.java b/trunk/SiprpWebFichasClinicas/src/pt/evolute/data/ProviderSpringBean.java index e56b5c10..1c33bac6 100644 --- a/trunk/SiprpWebFichasClinicas/src/pt/evolute/data/ProviderSpringBean.java +++ b/trunk/SiprpWebFichasClinicas/src/pt/evolute/data/ProviderSpringBean.java @@ -102,7 +102,7 @@ public class ProviderSpringBean { } setupProperties(); - DBMANAGER = new JDBCManager( url, username, password, 100, 75, 25, new SQLQuery[]{} ); + DBMANAGER = new JDBCManager( url, username, password, 50,10, new SQLQuery[]{} ); ConnectionIdentity conn = new ConnectionIdentity( url, username ); conn.setPassword( password ); diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/webservice/FichasClinicasWSImpl.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/webservice/FichasClinicasWSImpl.java index ee5fee28..14bfb0db 100644 --- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/webservice/FichasClinicasWSImpl.java +++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/webservice/FichasClinicasWSImpl.java @@ -2,10 +2,8 @@ package shst.medicina.fichasclinicas.webservice; import java.util.Collection; import java.util.LinkedList; -import java.util.Random; import javax.jws.WebService; -import javax.xml.ws.BindingType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -19,6 +17,8 @@ import shst.medicina.fichasclinicas.data.shst.EstabelecimentosData; import shst.medicina.fichasclinicas.data.shst.TrabalhadoresData; import com.evolute.utils.arrays.Virtual2DArray; +import com.evolute.utils.db.Executer; +import com.evolute.utils.db.SQLExecuter; import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.sql.Expression; import com.evolute.utils.sql.Field; @@ -37,48 +37,43 @@ public class FichasClinicasWSImpl implements FichasClinicasWS @Qualifier("siprpProvider") ProviderSpringBean siprpProvidersBean; - static final Object[] tokens = {new Object(),new Object(),new Object()}; - static final Random r5 = new Random(System.currentTimeMillis()); - public Collection getAllEmpresas() { - - Collection result = new LinkedList(); Expression dataFilter = new Field(EmpresasData.INACTIVO).isDifferent("y").and(new Field(EmpresasData.DATA_CANCELAMENTO).isEqual(null)); try - { - - Select2 sel = new Select2(EmpresasData.TABLENAME, dataFilter, new String[]{EmpresasData.ID,EmpresasData.DESIGNACAO_SOCIAL}); + { + Collection bdLoad = siprpProvidersBean + .getENTITY_PROVIDER() + .listLoad(EmpresasData.class, dataFilter, new String[]{EmpresasData.DESIGNACAO_SOCIAL}, null); -// Collection bdLoad = siprpProvidersBean -// .getENTITY_PROVIDER() -// .listLoad(EmpresasData.class, dataFilter, new String[]{EmpresasData.DESIGNACAO_SOCIAL}, null); + for(EmpresasData bdElem : bdLoad) + { + EmpresasBeanData resultElem = new EmpresasBeanData(); + resultElem.setMapData(bdElem.getPropertiesValues(new String[]{EmpresasData.ID,EmpresasData.DESIGNACAO_SOCIAL})); + + result.add(resultElem); + } +// Select2 sel = new Select2(EmpresasData.TABLENAME, dataFilter, new String[]{EmpresasData.ID,EmpresasData.DESIGNACAO_SOCIAL}); // -// for(EmpresasData bdElem : bdLoad) +// Executer EXECUTER = siprpProvidersBean.getDBMANAGER().getSharedExecuter( Thread.currentThread().getId() % 190 ); +// Virtual2DArray queryResult = EXECUTER.executeQuery(sel); +// for(int i=0 ; i < queryResult.rowCount(); i++) // { // EmpresasBeanData resultElem = new EmpresasBeanData(); -// resultElem.setMapData(bdElem.getPropertiesValues(new String[]{EmpresasData.ID,EmpresasData.DESIGNACAO_SOCIAL})); -// +// resultElem.setId((Integer) queryResult.get(i, 0)); +// resultElem.setDesignacao_social((String) queryResult.get(i, 1)); // result.add(resultElem); // } - Virtual2DArray queryResult = siprpProvidersBean.getDBMANAGER().getSharedExecuter(tokens[r5.nextInt()%3]).executeQuery(sel); - for(int i=0 ; i < queryResult.rowCount(); i++) - { - EmpresasBeanData resultElem = new EmpresasBeanData(); - resultElem.setId((Integer) queryResult.get(i, 0)); - resultElem.setDesignacao_social((String) queryResult.get(i, 1)); - result.add(resultElem); - } } catch (Exception ex) { ErrorLogger.logException(ex); } - result.add(new EmpresasBeanData()); + //System.out.println("TH:"+Thread.getAllStackTraces().size()); return result; }