lxbfYeaa9897955
/
SIPRP
forked from Coded/SIPRP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
lxbfYeaa
Diogo Neves 15 years ago
parent b6ddc7d4a4
commit e29df87247
6 changed files with 984 additions and 504 deletions
Show Stats Download Patch File Download Diff File

BIN
trunk/PlanosActuacao/lib/evolute.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/shst.jar
View File

Binary file not shown.

168
trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java
Unescape View File

@ -5,8 +5,13 @@
package db.providers; package db.providers;
import com.evolute.utils.db.DBException; import com.evolute.utils.arrays.Virtual2DArray;
import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.error.ErrorLogger;
import com.evolute.utils.sql.Expression;
import com.evolute.utils.sql.Field;
import com.evolute.utils.sql.Select2;
import db.data.siprp.outer.PlanosActuacaoData;
import db.data.siprp_local.outer.EmpresasData;
import db.entidades.Area; import db.entidades.Area;
import db.entidades.Medida; import db.entidades.Medida;
import db.entidades.PlanoActuacao; import db.entidades.PlanoActuacao;
@ -17,6 +22,7 @@ import java.sql.ResultSet;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import utils.Utils; import utils.Utils;
@ -59,51 +65,101 @@ public class CreatePlanosDataProvider extends GenericDataProvider
public List<Date> getPlanosOnline( Integer estabelecimentoID ) throws Exception public List<Date> getPlanosOnline( Integer estabelecimentoID ) throws Exception
{ {
ArrayList<Date> list = new ArrayList<Date>(); List< Date > list = new LinkedList< Date >();
Statement st = createStatement();
String sql = "select data_visita from planos_actuacao where deleted_date is null";
if( estabelecimentoID != null )
{
sql += " and estabelecimento_id = " + estabelecimentoID;
}
ResultSet rs = st.executeQuery(sql);
if(rs.isBeforeFirst()) Expression where = new Field( PlanosActuacaoData.DELETED_DATE_FULL ).isEqual( null );
{ if ( estabelecimentoID != null )
rs.first(); {
do where = where.and( new Field( PlanosActuacaoData.ESTABELECIMENTO_ID_FULL ).isEqual( estabelecimentoID ) );
{ }
java.sql.Date sqlDate = rs.getDate("data_visita");
java.util.Date data_visita = new java.util.Date(sqlDate.getTime()); Select2 query = new Select2( PlanosActuacaoData.TABLENAME,
System.out.println("DATA PLANO : " + data_visita.toString()); where,
list.add(data_visita); new String[] { PlanosActuacaoData.DATA_VISITA_FULL },
}while(rs.next()); new String[] {} );
} Virtual2DArray array = getExecuter().executeQuery( query );
return list; if ( array != null )
{
System.out.println( "\nCreatePlanosDataProvider . getPlanosOnline( " + estabelecimentoID + " ) : " );
for ( int i = 0; i < array.columnLength(); i++ )
{
Date date = array.get( i, 0 );
System.out.println( "\tdata : " + date );
list.add( date );
}
}
return list;
// ArrayList<Date> list = new ArrayList<Date>();
// Statement st = createStatement();
// String sql = "select data_visita from planos_actuacao where deleted_date is null";
// if( estabelecimentoID != null )
// {
// sql += " and estabelecimento_id = " + estabelecimentoID;
// }
// ResultSet rs = st.executeQuery(sql);
//
// if(rs.isBeforeFirst())
// {
// rs.first();
// do
// {
// java.sql.Date sqlDate = rs.getDate("data_visita");
// java.util.Date data_visita = new java.util.Date(sqlDate.getTime());
// System.out.println("DATA PLANO : " + data_visita.toString());
// list.add(data_visita);
// }while(rs.next());
// }
// return list;
} }
public List<Integer> getEstabelecimentosWithPlanos() public List<Integer> getEstabelecimentosWithPlanos()
{ {
List<Integer> result = new ArrayList<Integer>(); List< Integer > list = new LinkedList< Integer >();
try
{ try
Statement st = createStatement(); {
String sql = "select distinct estabelecimento_id from planos_actuacao where deleted_date is null"; Select2 query = new Select2( PlanosActuacaoData.TABLENAME,
ResultSet rs = st.executeQuery(sql); new Field( PlanosActuacaoData.DELETED_DATE_FULL ).isEqual( null ),
if(rs.isBeforeFirst()) new String[] { "DISTINCT " + PlanosActuacaoData.ESTABELECIMENTO_ID_FULL },
{ new String[] {}
rs.first(); );
do Virtual2DArray array = getExecuter().executeQuery( query );
{ if ( array != null )
result.add( rs.getInt("estabelecimento_id") ); {
}while(rs.next()); for ( int i = 0; i < array.columnLength(); i++ )
} {
} Integer estabelecimentoID = array.get( i, 0 );
catch( Exception e ) list.add( estabelecimentoID );
{ }
ErrorLogger.logException( e ); }
} }
return result; catch ( Exception e )
{
ErrorLogger.logException( e );
}
return list;
// List<Integer> result = new ArrayList<Integer>();
// try
// {
// Statement st = createStatement();
// String sql = "select distinct estabelecimento_id from planos_actuacao where deleted_date is null";
// ResultSet rs = st.executeQuery(sql);
// if(rs.isBeforeFirst())
// {
// rs.first();
// do
// {
// result.add( rs.getInt("estabelecimento_id") );
// }while(rs.next());
// }
// }
// catch( Exception e )
// {
// ErrorLogger.logException( e );
// }
// return result;
} }
@ -613,16 +669,28 @@ public class CreatePlanosDataProvider extends GenericDataProvider
//==================== //====================
public String getEmpresaNome( Integer empresaID ) throws Exception
{
String nome = null;
EmpresasData empresaData = getLocalProvider().load( EmpresasData.class, empresaID, EmpresasData.ID );
if ( empresaData != null )
{
nome = Utils.unicodeToHTML( empresaData.getDesignacao_social() );
}
return nome;
}
// public String getEmpresaNome(Integer empresa_id) throws Exception
// {
// Statement st = createLocalStatement();
// String sql ="SELECT designacao_social FROM empresas WHERE id = " + empresa_id;
// ResultSet rslocal = st.executeQuery(sql);
// rslocal.first();
// String nome = Utils.unicodeToHTML(rslocal.getString("designacao_social"));
// return nome;
// }
public String getEmpresaNome(Integer empresa_id) throws Exception
{
Statement st = createLocalStatement();
String sql ="SELECT designacao_social FROM empresas WHERE id = " + empresa_id;
ResultSet rslocal = st.executeQuery(sql);
rslocal.first();
String nome = Utils.unicodeToHTML(rslocal.getString("designacao_social"));
return nome;
}
// private Statement createStatement() // private Statement createStatement()
// { // {

24
trunk/PlanosActuacao/src/java/db/providers/GenericDataProvider.java
Unescape View File

@ -21,10 +21,16 @@ public abstract class GenericDataProvider
private ProviderInterface< EvoDataObject< ? >, EvoDataException > provider = null; private ProviderInterface< EvoDataObject< ? >, EvoDataException > provider = null;
private Executer executer = null; private Executer executer = null;
private ProviderInterface< EvoDataObject< ? >, EvoDataException > localProvider = null;
private Executer localExecuter = null;
protected GenericDataProvider() throws Exception protected GenericDataProvider() throws Exception
{ {
provider = EvoBaseProvider.getInstance().getProvider( DBConstants.DB.SIPRP ); provider = EvoBaseProvider.getInstance().getProvider( DBConstants.DB.SIPRP );
executer = EvoBaseProvider.getInstance().getExecuter(); executer = EvoBaseProvider.getInstance().getExecuter();
localProvider = EvoBaseProvider.getInstance().getProvider( DBConstants.DB.SIPRP_LOCAL );
localExecuter = EvoBaseProvider.getInstance().getLocalExecuter();
} }
public Executer getExecuter() public Executer getExecuter()
@ -32,12 +38,21 @@ public abstract class GenericDataProvider
return executer; return executer;
} }
public Executer getLocalExecuter()
{
return localExecuter;
}
public ProviderInterface< EvoDataObject< ? >, EvoDataException > getProvider() public ProviderInterface< EvoDataObject< ? >, EvoDataException > getProvider()
{ {
return provider; return provider;
} }
public ProviderInterface< EvoDataObject< ? >, EvoDataException > getLocalProvider()
{
return localProvider;
}
// public void checkConnection() // public void checkConnection()
// { // {
@ -79,11 +94,14 @@ public abstract class GenericDataProvider
protected Statement createStatement() protected Statement createStatement()
{ {
try { try
{
// Db db = Db.getInstance(); // Db db = Db.getInstance();
// return db.createStatement(); // return db.createStatement();
return EvoBaseProvider.getInstance().createStatement(); return EvoBaseProvider.getInstance().createStatement();
} catch (DBException ex) { }
catch ( DBException ex )
{
ErrorLogger.logException( ex ); ErrorLogger.logException( ex );
} }
return null; return null;

1174
trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java
View File

File diff suppressed because it is too large Load Diff

122
trunk/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java
Unescape View File

@ -6,6 +6,8 @@
package db.providers; package db.providers;
import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.error.ErrorLogger;
import db.data.siprp_local.outer.EmpresasData;
import db.data.siprp_local.outer.ImageData;
import db.entidades.Area; import db.entidades.Area;
import db.entidades.Medida; import db.entidades.Medida;
import db.entidades.PlanoActuacao; import db.entidades.PlanoActuacao;
@ -48,7 +50,7 @@ public class RelatoriosDataProvider extends GenericDataProvider
{ {
try try
{ {
plano = getAreasByPlano(plano, relatorioId); plano = getAreasByPlano(plano, relatorioId);
} }
catch(Exception ex) catch(Exception ex)
{ {
@ -57,24 +59,23 @@ public class RelatoriosDataProvider extends GenericDataProvider
return plano; return plano;
} }
private PlanoActuacao getAreasByPlano(PlanoActuacao plano, Integer relatorioId) throws Exception private PlanoActuacao getAreasByPlano( PlanoActuacao plano, Integer relatorioID ) throws Exception
{ {
// Statement st = dblocal.createStatement();
Statement st = createLocalStatement(); Statement st = createLocalStatement();
String sql = "select distinct area_id, hs_relatorio_area.description as descricao from hs_relatorio_posto "; String sql = "select distinct area_id, hs_relatorio_area.description as descricao from hs_relatorio_posto ";
sql += "inner join hs_relatorio_posto_medida on hs_relatorio_posto_medida.posto_id = hs_relatorio_posto.id "; sql += "inner join hs_relatorio_posto_medida on hs_relatorio_posto_medida.posto_id = hs_relatorio_posto.id ";
sql += "inner join hs_relatorio_medida on hs_relatorio_medida.id = hs_relatorio_posto_medida.medida_id "; sql += "inner join hs_relatorio_medida on hs_relatorio_medida.id = hs_relatorio_posto_medida.medida_id ";
sql += "inner join hs_relatorio_risco on hs_relatorio_risco.id = hs_relatorio_medida.risco_id "; sql += "inner join hs_relatorio_risco on hs_relatorio_risco.id = hs_relatorio_medida.risco_id ";
sql += "inner join hs_relatorio on hs_relatorio.id = hs_relatorio_risco.relatorio_id "; sql += "inner join hs_relatorio on hs_relatorio.id = hs_relatorio_risco.relatorio_id ";
sql += "inner join hs_relatorio_area on hs_relatorio_area.id = area_id "; sql += "inner join hs_relatorio_area on hs_relatorio_area.id = area_id ";
sql += "where hs_relatorio.id = " + relatorioId + " "; sql += "where hs_relatorio.id = " + relatorioID + " ";
sql += "order by area_id "; sql += "order by area_id ";
System.out.println("AREAS BY PLANO SQL : " + sql); System.out.println("AREAS BY PLANO SQL : " + sql);
ResultSet rs = st.executeQuery(sql); ResultSet rs = st.executeQuery(sql);
List<Area> areas = new ArrayList(); List<Area> areas = new ArrayList();
if(rs.isBeforeFirst()) if(rs.isBeforeFirst())
{ {
rs.first(); rs.first();
@ -88,20 +89,20 @@ public class RelatoriosDataProvider extends GenericDataProvider
a.setDescricao(Utils.unicodeToHTML(rs.getString("descricao"))); a.setDescricao(Utils.unicodeToHTML(rs.getString("descricao")));
try try
{ {
a.setRiscos(getRiscosByArea(a)); a.setRiscos(getRiscosByArea(a));
} }
catch(Exception ex) catch(Exception ex)
{ {
System.out.println("ERRO RISCOS BY AREA !!!!"); System.out.println("ERRO RISCOS BY AREA !!!!");
ErrorLogger.logException( ex ); ErrorLogger.logException( ex );
a.setRiscos(null); a.setRiscos(null);
} }
areas.add(a); areas.add(a);
} }
}while(rs.next()); }while(rs.next());
plano.setAreas(areas); plano.setAreas(areas);
} }
return plano; return plano;
} }
@ -416,45 +417,72 @@ public class RelatoriosDataProvider extends GenericDataProvider
public String getEmpresaNome(Integer empresa_id) throws Exception public String getEmpresaNome(Integer empresa_id) throws Exception
{ {
// Statement st = dblocal.createStatement(); String nome = "";
Statement st = createLocalStatement(); EmpresasData empresaData = getLocalProvider().load( EmpresasData.class, empresa_id, EmpresasData.ID );
if ( empresaData != null )
String sql ="SELECT designacao_social FROM empresas WHERE id = " + empresa_id; {
ResultSet rslocal = st.executeQuery(sql); nome = Utils.unicodeToHTML( empresaData.getDesignacao_social() );
rslocal.first(); }
String nome = Utils.unicodeToHTML(rslocal.getString("designacao_social")); return nome;
return nome;
// Statement st = createLocalStatement();
//
// String sql ="SELECT designacao_social FROM empresas WHERE id = " + empresa_id;
// ResultSet rslocal = st.executeQuery(sql);
// rslocal.first();
// String nome = Utils.unicodeToHTML(rslocal.getString("designacao_social"));
// return nome;
} }
public byte[] getLogoByEmpresa( Integer empresaId ) public byte[] getLogoByEmpresa( Integer empresaId )
throws Exception throws Exception
{ {
// Statement st = dblocal.createStatement(); byte[] logo = null;
Statement st = createLocalStatement(); EmpresasData empresaData = getLocalProvider().load( EmpresasData.class, empresaId, EmpresasData.ID );
if ( empresaData != null )
String sql = "select empresa_logo_id from empresas where id = " + empresaId; {
ResultSet rslocal = st.executeQuery(sql); Integer logoID = empresaData.getEmpresa_logo_id();
if ( rslocal.isBeforeFirst() ) logo = getLogo( logoID );
{ }
rslocal.first(); return logo;
Integer logoId = new Integer( rslocal.getInt("empresa_logo_id") );
byte[] logo = getLogo( logoId );
return logo;
}
return null; // Statement st = createLocalStatement();
} //
// String sql = "select empresa_logo_id from empresas where id = " + empresaId;
public byte[] getLogo(Integer logoId) throws Exception // ResultSet rslocal = st.executeQuery(sql);
{ // if ( rslocal.isBeforeFirst() )
// Statement st = dblocal.createStatement(); // {
Statement st = createLocalStatement(); // rslocal.first();
// Integer logoId = new Integer( rslocal.getInt("empresa_logo_id") );
String sql = "select image_data from image where id = " + logoId; // byte[] logo = getLogo( logoId );
ResultSet rslocal = st.executeQuery(sql); // return logo;
rslocal.first(); // }
byte[] logo = rslocal.getBytes("image_data"); //
System.out.println("LOGO SIZE : " + logo.length); // return null;
return logo;
} }
public byte[] getLogo( Integer logoID ) throws Exception
{
byte[] logo = null;
ImageData imageData = getLocalProvider().load( ImageData.class, logoID, ImageData.ID );
if ( imageData != null )
{
logo = imageData.getImage_data();
}
System.out.println( "\nRelatoriosDataProvider . getLogo( " + logoID + " ) : " + ( logo == null ? "null" : "size = " + logo.length ) );
return logo;
}
// public byte[] getLogo(Integer logoId) throws Exception
// {
// Statement st = createLocalStatement();
//
// String sql = "select image_data from image where id = " + logoId;
// ResultSet rslocal = st.executeQuery(sql);
// rslocal.first();
// byte[] logo = rslocal.getBytes("image_data");
// System.out.println("LOGO SIZE : " + logo.length);
// return logo;
// }
} }
Write Preview
Loading…
Cancel
Save