diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java index 3c248043..65a5d791 100644 --- a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java +++ b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java @@ -100,21 +100,13 @@ public class SIPRPDataLoader implements CompanyDataLoader // Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" ); // Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); - Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); - Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); - Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); - Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" ); - Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); - Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); -// // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); -// Singleton.setInstance( SingletonConstants.LOCAL_URL, "dbserver:5432" ); +// Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" ); // Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); // Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); - -// +// // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); @@ -122,6 +114,7 @@ public class SIPRPDataLoader implements CompanyDataLoader // Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); // Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); +// // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); @@ -139,10 +132,17 @@ public class SIPRPDataLoader implements CompanyDataLoader // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); -// Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost:5432" ); +// Singleton.setInstance( SingletonConstants.LOCAL_URL, "dbserver:5432" ); // Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); // Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); + Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); + Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost:5432" ); + Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local3" ); + Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); + // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); diff --git a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java index 0f5679d7..e189651a 100644 --- a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java +++ b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java @@ -21,6 +21,7 @@ import siprp.update.updates.V10_6_To_V10_7; import siprp.update.updates.V10_7_To_V10_8; import siprp.update.updates.V10_8_To_V10_9; import siprp.update.updates.V10_9_To_V11_0; +import siprp.update.updates.V11_0_To_V11_1; import siprp.update.updates.V6_1_To_V7_0; import siprp.update.updates.V7_0_To_V7_2; import siprp.update.updates.V7_2_To_V7_4; @@ -88,7 +89,7 @@ public class UpdateList new V10_3_To_V10_4(), new V10_4_To_V10_5(), new V10_5_To_V10_6(), new V10_6_To_V10_7(), new V10_7_To_V10_8(), new V10_8_To_V10_9(), - new V10_9_To_V11_0() + new V10_9_To_V11_0(), new V11_0_To_V11_1() }; protected static Executer EXECUTER; diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1.java b/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1.java new file mode 100644 index 00000000..87527fa8 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1.java @@ -0,0 +1,120 @@ +package siprp.update.updates; + +import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; +import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; +import static com.evolute.utils.strings.UnicodeLatin1Map.oacute; +import static com.evolute.utils.strings.UnicodeLatin1Map.uacute; + +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; + +import javax.imageio.ImageIO; + +import com.evolute.utils.Singleton; +import com.evolute.utils.arrays.Virtual2DArray; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; +import com.evolute.utils.sql.Assignment; +import com.evolute.utils.sql.BlobUpdate; +import com.evolute.utils.sql.Field; +import com.evolute.utils.sql.Insert; +import com.evolute.utils.sql.Select2; +import com.evolute.utils.sql.Update; + +public class V11_0_To_V11_1 implements siprp.update.Update +{ + + public V11_0_To_V11_1() + { + } + + public String []listChanges() + { + return new String[]{ + "A actualizar informacao dos tecnicos de higiene e seguranca" + }; + } + + public double getStartVersion() + { + return 11.0; + } + + public double getEndVersion() + { + return 11.1; + } + + public void doUpdate() throws Exception + { + DBManager dbm = ( DBManager ) Singleton.getInstance( Singleton.DEFAULT_DBMANAGER ); + Executer executer = dbm.getSharedExecuter(); + + Update update = new Update( + "alter table image alter column image_data drop not null; " + ); + executer.executeQuery( update ); + + Integer assSoniaID = null; + Integer assCatarinaID = null; + String assSonia = "Assinatura(Sonia Filipa Dias Campos)"; + String assCatarina = "Assinatura(Catarina Leonardo)"; + BufferedImage assSoniaImage = ImageIO.read( getClass().getClassLoader().getResourceAsStream( "siprp/update/updates/V11_0_To_V11_1_Assinatura_Sonia.png" ) ); + BufferedImage assCatarinaImage = ImageIO.read( getClass().getClassLoader().getResourceAsStream( "siprp/update/updates/V11_0_To_V11_1_Assinatura_Catarina.png" ) ); + ByteArrayOutputStream assSoniaBytesStream = new ByteArrayOutputStream(); + ByteArrayOutputStream assCatarinaBytesStream = new ByteArrayOutputStream(); + ImageIO.write( assSoniaImage, "PNG", assSoniaBytesStream ); + ImageIO.write( assCatarinaImage, "PNG", assCatarinaBytesStream ); + if( assSoniaImage == null || assSoniaBytesStream.size() == 0 ) + { + throw new Exception("Erro ao ler assinatura: " + assSonia ); + } + if( assCatarinaImage == null || assCatarinaBytesStream.size() == 0 ) + { + throw new Exception("Erro ao ler assinatura: " + assCatarina ); + } + Insert insertQuery = new Insert( "image", new Assignment[]{ + new Assignment(new Field("name"),assSonia) + } ); + Virtual2DArray array = executer.executeQuery( insertQuery ); + insertQuery = new Insert( "image", new Assignment[]{ + new Assignment(new Field("name"), assCatarina) + } ); + executer.executeQuery( insertQuery ); + Select2 selectQuery = new Select2(new String[]{"image"},null,null,new String[]{"id"},new Field("name").isEqual( assSonia ),null,null,null,null); + array = executer.executeQuery( selectQuery ); + if( array.columnLength() == 1 ) + { + assSoniaID = (Integer) array.get( 0, 0 ); + } + selectQuery = new Select2(new String[]{"image"},null,null,new String[]{"id"},new Field("name").isEqual( assCatarina ),null,null,null,null); + array = executer.executeQuery( selectQuery ); + if( array.columnLength() == 1 ) + { + assCatarinaID = (Integer) array.get( 0, 0 ); + } + if( assSoniaID == null ) + { + throw new Exception("Erro ao inserir assinatura: " + assSonia ); + } + if( assCatarinaID == null ) + { + throw new Exception("Erro ao inserir assinatura: " + assCatarina ); + } + BlobUpdate blobUpdate = new BlobUpdate("image","image_data",assSoniaBytesStream.toByteArray(),new Field("id").isEqual( assSoniaID ) ); + executer.executeQuery( blobUpdate ); + blobUpdate = new BlobUpdate("image","image_data",assCatarinaBytesStream.toByteArray(),new Field("id").isEqual( assCatarinaID ) ); + executer.executeQuery( blobUpdate ); + update = new Update( + "update marcacoes_tecnicos_hst set cap='0601/6505/02', formacao='Ergonomia', assinatura=" + assSoniaID + " where id = 2; " + + "update marcacoes_tecnicos_hst set cap='0310/1156/02', formacao='Sa"+uacute+"de Ambiental, P"+oacute+"s Gradua"+ccedil+atilde+"o em Higiene e Seguran"+ccedil+"a do Trabalho e Mestrado em Ergonomia na Seguran"+ccedil+"a do Trabalho', assinatura=" + assCatarinaID + " where id = 1; " + ); + executer.executeQuery( update ); + } + + public String toString() + { + return "v" + getStartVersion() + " para v" + getEndVersion(); + } + +} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1_Assinatura_Catarina.png b/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1_Assinatura_Catarina.png new file mode 100644 index 00000000..506cb2b9 Binary files /dev/null and b/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1_Assinatura_Catarina.png differ diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1_Assinatura_Sonia.png b/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1_Assinatura_Sonia.png new file mode 100644 index 00000000..0db7ac33 Binary files /dev/null and b/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1_Assinatura_Sonia.png differ