git-svn-id: https://svn.coded.pt/svn/SIPRP@1572 bb69d46d-e84e-40c8-a05a-06db0d633741

0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Diogo Neves 15 years ago
parent 0081f21ed1
commit 14d90ae619

Binary file not shown.

@ -4,7 +4,7 @@ auxiliary.org-netbeans-modules-web-client-tools-api.FIREFOX=true
auxiliary.org-netbeans-modules-web-client-tools-api.INTERNET_5f_EXPLORER=false
auxiliary.org-netbeans-modules-web-client-tools-api.serverdebug=true
deploy.ant.properties.file=/home/dneves/.netbeans/6.7/tomcat60.properties
j2ee.platform.classpath=/usr/local/apache-tomcat-6.0.18/lib/jasper.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ant.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/usr/local/apache-tomcat-6.0.18/lib/annotations-api.jar:/usr/local/apache-tomcat-6.0.18/lib/servlet-api.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper-el.jar:/usr/local/apache-tomcat-6.0.18/lib/el-api.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ha.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/usr/local/apache-tomcat-6.0.18/lib/jsp-api.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/usr/local/apache-tomcat-6.0.18/bin/tomcat-juli.jar
j2ee.platform.classpath=/usr/local/apache-tomcat-6.0.18/lib/catalina.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/usr/local/apache-tomcat-6.0.18/lib/annotations-api.jar:/usr/local/apache-tomcat-6.0.18/lib/servlet-api.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper-el.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/usr/local/apache-tomcat-6.0.18/lib/el-api.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ha.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ant.jar:/usr/local/apache-tomcat-6.0.18/lib/jsp-api.jar:/usr/local/apache-tomcat-6.0.18/bin/tomcat-juli.jar
j2ee.server.instance=tomcat60:home=/usr/local/apache-tomcat-6.0.18:base=apache-tomcat-6.0.18_base
javac.debug=true
javadoc.preview=true

@ -12,7 +12,7 @@ database.siprp_local = siprp_local_3
username.siprp_local = postgres
#password.siprp_local =
# tests
# tests evoserver
#server.siprp = evoserver
#port.siprp = 5432
#database.siprp = siprp_20100813
@ -23,4 +23,17 @@ username.siprp_local = postgres
#port.siprp_local = 5432
#database.siprp_local = siprp_local_3_20100813
#username.siprp_local = postgres
##password.siprp_local =
##password.siprp_local =
# tests evolute.pt
#server.siprp = www.evolute.pt
#port.siprp = 5436
#database.siprp = siprp
#username.siprp = postgres
#password.siprp = -rg2hpgsql
#
#server.siprp_local = www.evolute.pt
#port.siprp_local = 5436
#database.siprp_local = siprp_local_3
#username.siprp_local = postgres
#password.siprp_local = -rg2hpgsql

@ -93,6 +93,8 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
FIELD_INDEXES.put( PlanosActuacao.DATA_VALIDACAO_SEG_FULL, PlanosActuacao.DATA_VALIDACAO_SEG_INDEX );
FIELD_INDEXES.put( PlanosActuacao.USER_SEG, PlanosActuacao.USER_SEG_INDEX );
FIELD_INDEXES.put( PlanosActuacao.USER_SEG_FULL, PlanosActuacao.USER_SEG_INDEX );
FIELD_INDEXES.put( PlanosActuacao.HS_RELATORIO_ID, PlanosActuacao.HS_RELATORIO_ID_INDEX );
FIELD_INDEXES.put( PlanosActuacao.HS_RELATORIO_ID_FULL, PlanosActuacao.HS_RELATORIO_ID_INDEX );
}
private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@ -230,6 +232,9 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
public static final String USER_SEG = "user_seg";
public static final String USER_SEG_FULL = "planos_actuacao.user_seg";
public static final int USER_SEG_INDEX = 38;
public static final String HS_RELATORIO_ID = "hs_relatorio_id";
public static final String HS_RELATORIO_ID_FULL = "planos_actuacao.hs_relatorio_id";
public static final int HS_RELATORIO_ID_INDEX = 39;
public static final String FIELD_NAMES[] = new String[]{
ESTABELECIMENTO_ID, FASE, DATA_VISITA, NOME_ESTABELECIMENTO,
@ -241,7 +246,7 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
NOME_EMPRESA, TECNICO_HS_ID, TECNICO_HS_NOME, DATA_RELATORIO, DELETED_DATE,
CONCLUIDO_POR_DESACTIVACAO, TECNICO_SUPERIOR_HS_ID,
TECNICO_SUPERIOR_HS_NOME, DATA_DESACTIVACAO, DATA_DISPONIBILIZACAO,
DATA_VALIDACAO_SEG, USER_SEG, };
DATA_VALIDACAO_SEG, USER_SEG, HS_RELATORIO_ID, };
public static final String FIELD_NAMES_FULL[] = new String[]{
TABLENAME + "." + ESTABELECIMENTO_ID, TABLENAME + "." + FASE, TABLENAME + "." + DATA_VISITA, TABLENAME + "." + NOME_ESTABELECIMENTO,
@ -253,7 +258,7 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
TABLENAME + "." + NOME_EMPRESA, TABLENAME + "." + TECNICO_HS_ID, TABLENAME + "." + TECNICO_HS_NOME, TABLENAME + "." + DATA_RELATORIO, TABLENAME + "." + DELETED_DATE,
TABLENAME + "." + CONCLUIDO_POR_DESACTIVACAO, TABLENAME + "." + TECNICO_SUPERIOR_HS_ID,
TABLENAME + "." + TECNICO_SUPERIOR_HS_NOME, TABLENAME + "." + DATA_DESACTIVACAO, TABLENAME + "." + DATA_DISPONIBILIZACAO,
TABLENAME + "." + DATA_VALIDACAO_SEG, TABLENAME + "." + USER_SEG, };
TABLENAME + "." + DATA_VALIDACAO_SEG, TABLENAME + "." + USER_SEG, TABLENAME + "." + HS_RELATORIO_ID, };
protected static final String DB_FIELD_NAMES[] = new String[]{
ESTABELECIMENTO_ID, FASE, DATA_VISITA, NOME_ESTABELECIMENTO,
@ -264,7 +269,7 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
DATA_EMAIL_CONTROLO, EMPRESA_ID, NOME_EMPRESA, TECNICO_HS_ID, TECNICO_HS_NOME,
ID, DATA_RELATORIO, DELETED_DATE, CONCLUIDO_POR_DESACTIVACAO,
TECNICO_SUPERIOR_HS_ID, TECNICO_SUPERIOR_HS_NOME, DATA_DESACTIVACAO,
DATA_DISPONIBILIZACAO, DATA_VALIDACAO_SEG, USER_SEG, };
DATA_DISPONIBILIZACAO, DATA_VALIDACAO_SEG, USER_SEG, HS_RELATORIO_ID, };
protected static final String PK_FIELD_NAMES[] = new String[]{
@ -280,7 +285,7 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
DATA_EMAIL_CONTROLO, EMPRESA_ID, NOME_EMPRESA, TECNICO_HS_ID, TECNICO_HS_NOME,
ID, DATA_RELATORIO, DELETED_DATE, CONCLUIDO_POR_DESACTIVACAO,
TECNICO_SUPERIOR_HS_ID, TECNICO_SUPERIOR_HS_NOME, DATA_DESACTIVACAO,
DATA_DISPONIBILIZACAO, DATA_VALIDACAO_SEG, USER_SEG, };
DATA_DISPONIBILIZACAO, DATA_VALIDACAO_SEG, USER_SEG, HS_RELATORIO_ID, };
private Integer estabelecimento_id;
private Integer fase;
@ -321,6 +326,7 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
private java.util.Date data_disponibilizacao;
private java.util.Date data_validacao_seg;
private Integer user_seg;
private Integer hs_relatorio_id;
protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
@ -332,7 +338,7 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false,
false, false, false, false };
false, false, false, false, false };
}
public Integer getEstabelecimento_id()
@ -1471,6 +1477,35 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
LAZY_LOADED_OBJECTS.put( USER_SEG, Boolean.TRUE );
}
public Integer getHs_relatorio_id()
{
try
{
setLastAccess( System.currentTimeMillis() );
prepare( HS_RELATORIO_ID );
}
catch( java.lang.Exception ex )
{
throw new RuntimeException( ex );
}
return this.hs_relatorio_id;
}
public void setHs_relatorio_id( Integer hs_relatorio_id )
{
try
{
setLockedForRefresh( true );
preProcess( HS_RELATORIO_ID, hs_relatorio_id );
}
catch( com.evolute.entity.evo.EvoDataException edex )
{
throw new RuntimeException( edex );
}
this.hs_relatorio_id = hs_relatorio_id;
LAZY_LOADED_OBJECTS.put( HS_RELATORIO_ID, Boolean.TRUE );
}
public Object get( String fieldName )
{
Object value = null;
@ -1594,6 +1629,9 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
case PlanosActuacao.USER_SEG_INDEX:
value = getUser_seg();
break;
case PlanosActuacao.HS_RELATORIO_ID_INDEX:
value = getHs_relatorio_id();
break;
}
return value;
}
@ -1721,6 +1759,9 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
case PlanosActuacao.USER_SEG_INDEX:
value = this.user_seg;
break;
case PlanosActuacao.HS_RELATORIO_ID_INDEX:
value = this.hs_relatorio_id;
break;
}
return value;
}
@ -1847,6 +1888,9 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
case PlanosActuacao.USER_SEG_INDEX:
setUser_seg( ( Integer ) value );
break;
case PlanosActuacao.HS_RELATORIO_ID_INDEX:
setHs_relatorio_id( ( Integer ) value );
break;
}
}
@ -1972,6 +2016,9 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
case PlanosActuacao.USER_SEG_INDEX:
this.user_seg = ( Integer ) value;
break;
case PlanosActuacao.HS_RELATORIO_ID_INDEX:
this.hs_relatorio_id = ( Integer ) value;
break;
}
}
@ -2128,6 +2175,9 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
case PlanosActuacao.USER_SEG_INDEX:
theClass = Integer.class;
break;
case PlanosActuacao.HS_RELATORIO_ID_INDEX:
theClass = Integer.class;
break;
}
return theClass;
}

@ -1336,6 +1336,10 @@
<column name="user_seg"/>
<extension vendor-name="evolute" key="java-type" value="Integer"/>
</field>
<field name="hs_relatorio_id">
<column name="hs_relatorio_id"/>
<extension vendor-name="evolute" key="java-type" value="Integer"/>
</field>
</class>
<class name="Recomendacoes" identity-type="application" table="recomendacoes" >
<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="recomendacoes_id_seq">

@ -79,6 +79,9 @@ public class PlanoActuacao implements Serializable
private String tecnicos_nomes;
private Integer hs_relatorio_id;
public PlanoActuacao()
{
@ -514,4 +517,12 @@ public class PlanoActuacao implements Serializable
this.user_seg = user_seg;
}
public Integer getHs_relatorio_id() {
return hs_relatorio_id;
}
public void setHs_relatorio_id(Integer hs_relatorio_id) {
this.hs_relatorio_id = hs_relatorio_id;
}
}

@ -587,9 +587,11 @@ public class CreatePlanosDataProvider extends GenericDataProvider
planoData.setData_validacao_seg( null );
planoData.setUser_seg( null );
planoData.setHs_relatorio_id( p.getHs_relatorio_id() );
System.out.println( "\nCREATE PLANO : " );
planoData.setProvider( EvoBaseProvider.getInstance().getProvider() );
planoData.save();;
planoData.save();
newPlanoID = planoData.getId();
System.out.println( "\n\tplanoID : " + newPlanoID );

@ -396,6 +396,7 @@ public class PlanosDataProvider extends GenericDataProvider
pa.setData_disponibilizacao( rs.getDate( "data_disponibilizacao" ) );
pa.setData_validacao_seg( rs.getDate( "data_validacao_seg" ) );
pa.setUser_seg( rs.getInt( "user_seg" ) );
pa.setHs_relatorio_id( rs.getInt( "hs_relatorio_id" ) );
list.add( pa );
}

@ -234,6 +234,7 @@ public class PlanosActuacao
p.setNome_estabelecimento( relatorio.toMarcacao_id().toEstabelecimento_id().getNome() );
p.setData_relatorio(relatorio.getData());
p.setData_disponibilizacao( relatorio.getIs_submetido() );
p.setHs_relatorio_id( relatorio.getId() );
//p = rdp.getFullPlano(p, relatorio.getId());
p = cpdp.getFullPlano( p, relatorio.getId() );

@ -0,0 +1,101 @@
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package utils;
import com.evolute.utils.arrays.Virtual2DArray;
import com.evolute.utils.db.Executer;
import com.evolute.utils.sql.Assignment;
import com.evolute.utils.sql.Expression;
import com.evolute.utils.sql.Field;
import com.evolute.utils.sql.Select2;
import com.evolute.utils.sql.Update;
import db.providers.EvoBaseProvider;
import java.util.Date;
import shst.companydataloaders.SIPRPPropertiesLoader;
/**
*
* @author dneves
*/
public class PlanosUpdater
{
public static void main( String[] args )
{
try
{
SIPRPPropertiesLoader props = SIPRPPropertiesLoader.getInstance();
props.load();
EvoBaseProvider provider = EvoBaseProvider.getInstance();
Executer executer = provider.getExecuter();
Executer localExecuter = provider.getLocalExecuter();
// Expression whereExpression = new Field( "planos_actuacao.deleted_date" ).isEqual( null );
Expression whereExpression = null;
Select2 query = new Select2(
new String[] { "planos_actuacao" },
new Integer[] {},
new Expression[] {},
new String[] { "planos_actuacao.id", "planos_actuacao.estabelecimento_id", "planos_actuacao.data_visita" },
whereExpression,
new String[] { "planos_actuacao.estabelecimento_id", "planos_actuacao.data_visita" },
null, null, null
);
Virtual2DArray array = executer.executeQuery( query );
if ( array != null )
{
System.out.println( array.columnLength() + " : " );
for ( int i = 0; i < array.columnLength(); i++ )
{
Integer planoID = array.get( i, 0 );
Integer estabelecimentoID = array.get( i, 1 );
Date dataVisita = array.get( i, 2 );
System.out.println( planoID + " : " + estabelecimentoID + " : " + dataVisita );
Integer relatorioID = null;
Date dataDisponibilizacao = null;
Expression whereExpression2 = new Field( "marcacoes_estabelecimento.data" ).isEqual( dataVisita ).and(
new Field( "marcacoes_estabelecimento.estabelecimento_id" ).isEqual( estabelecimentoID )
);
Select2 query2 = new Select2(
new String[] { "hs_relatorio", "marcacoes_estabelecimento" },
new Integer[] { Select2.JOIN_INNER },
new Expression[] {
new Field( "marcacoes_estabelecimento.id" ).isEqual( new Field( "hs_relatorio.marcacao_id" ) )
},
new String[] { "hs_relatorio.id", "hs_relatorio.is_submetido" },
whereExpression2,
null,
null, null, null
);
Virtual2DArray array2 = localExecuter.executeQuery( query2 );
if ( array2 != null && array2.columnLength() > 0 )
{
relatorioID = array2.get( 0, 0 );
dataDisponibilizacao = array2.get( 0, 1 );
}
System.out.println( "\tRelatorioID : " + relatorioID );
Update upd = new Update( "planos_actuacao", new Assignment[] {
new Assignment( new Field( "hs_relatorio_id" ), relatorioID ),
new Assignment( new Field( "data_disponibilizacao" ), dataDisponibilizacao )
}, new Field( "id" ).isEqual( planoID ) );
executer.executeQuery( upd );
}
}
}
catch ( Exception e )
{
System.out.println( e.getMessage() );
}
}
}
Loading…
Cancel
Save