Skip to content

Add files via upload #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HeloisaSoaresUTFPR wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add files via upload #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
67a8900
Add files via upload
HeloisaSoaresUTFPR Aug 18, 2020
97eab36
Refatoração da função save
HeloisaSoaresUTFPR Sep 1, 2020
91acd4c
Não alterei nada
HeloisaSoaresUTFPR Sep 1, 2020
67f014f
Refatoração do método save
HeloisaSoaresUTFPR Sep 1, 2020
90fa081
Refatoração método save
HeloisaSoaresUTFPR Sep 1, 2020
7b30982
Configuração da biblioteca Lombok
HeloisaSoaresUTFPR Sep 3, 2020
5fff83e
Teste Departament
HeloisaSoaresUTFPR Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,18 @@
<artifactId>commons-javaflow</artifactId>
<version>1590792-patched-play-1.3.0</version>
</dependency>
</dependencies>

<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.12</version>
<scope>provided</scope>
</dependency>



</dependencies>

<build>
<finalName>siacoes</finalName>
Expand Down
123 changes: 75 additions & 48 deletions src/main/java/br/edu/utfpr/dv/siacoes/dao/ActivityUnitDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,27 @@
import br.edu.utfpr.dv.siacoes.log.UpdateEvent;
import br.edu.utfpr.dv.siacoes.model.ActivityUnit;

// A classe está implementada dentro dos meus conhecimentos sobre java(jdbc)

public class ActivityUnitDAO {

public List<ActivityUnit> listAll() throws SQLException{
Connection conn = null;
Statement stmt = null;
ResultSet rs = null;

try{
conn = ConnectionDAO.getInstance().getConnection();
stmt = conn.createStatement();

rs = stmt.executeQuery("SELECT * FROM activityunit ORDER BY description");

List<ActivityUnit> list = new ArrayList<ActivityUnit>();

while(rs.next()){
list.add(this.loadObject(rs));
}

return list;
}finally{
if((rs != null) && !rs.isClosed())
Expand All @@ -40,91 +42,116 @@ public List<ActivityUnit> listAll() throws SQLException{
conn.close();
}
}

public ActivityUnit findById(int id) throws SQLException{
Connection conn = null;
PreparedStatement stmt = null;
ResultSet rs = null;

try{
conn = ConnectionDAO.getInstance().getConnection();
stmt = conn.prepareStatement("SELECT * FROM activityunit WHERE idActivityUnit=?");

stmt.setInt(1, id);

rs = stmt.executeQuery();

if(rs.next()){
return this.loadObject(rs);
}else{
return null;
}
return null;
}finally{
if((rs != null) && !rs.isClosed())
if(rs != null && !rs.isClosed())
rs.close();
if((stmt != null) && !stmt.isClosed())
if(stmt != null && !stmt.isClosed())
stmt.close();
if((conn != null) && !conn.isClosed())
if(conn != null && !conn.isClosed())
conn.close();
}
}

public int save(int idUser, ActivityUnit unit) throws SQLException{
boolean insert = (unit.getIdActivityUnit() == 0);
if(insert){
return salvar(idUser, unit);
}else{
return alterar(idUser, unit);
}
}

public int salvar(int idUser, ActivityUnit unit) throws SQLException{
boolean insert = (unit.getIdActivityUnit() == 0);
Connection conn = null;
PreparedStatement stmt = null;
ResultSet rs = null;

try{
conn = ConnectionDAO.getInstance().getConnection();

if(insert){
stmt = conn.prepareStatement("INSERT INTO activityunit(description, fillAmount, amountDescription) VALUES(?, ?, ?)", Statement.RETURN_GENERATED_KEYS);
}else{
stmt = conn.prepareStatement("UPDATE activityunit SET description=?, fillAmount=?, amountDescription=? WHERE idActivityUnit=?");
}


stmt = conn.prepareStatement("INSERT INTO activityunit(description, fillAmount, amountDescription) VALUES(?, ?, ?)", Statement.RETURN_GENERATED_KEYS);

stmt.setString(1, unit.getDescription());
stmt.setInt(2, (unit.isFillAmount() ? 1 : 0));
stmt.setString(3, unit.getAmountDescription());

if(!insert){
stmt.setInt(4, unit.getIdActivityUnit());
}


stmt.execute();

if(insert){
rs = stmt.getGeneratedKeys();

if(rs.next()){
unit.setIdActivityUnit(rs.getInt(1));
}

new UpdateEvent(conn).registerInsert(idUser, unit);
} else {
new UpdateEvent(conn).registerUpdate(idUser, unit);

rs = stmt.getGeneratedKeys();

if(rs.next()){
unit.setIdActivityUnit(rs.getInt(1));
}

new UpdateEvent(conn).registerInsert(idUser, unit);

return unit.getIdActivityUnit();
}finally{
if((rs != null) && !rs.isClosed())
if(rs != null && !rs.isClosed())
rs.close();
if((stmt != null) && !stmt.isClosed())
if(stmt != null && !stmt.isClosed())
stmt.close();
if((conn != null) && !conn.isClosed())
if(conn != null && !conn.isClosed())
conn.close();
}
}


public int alterar(int idUser, ActivityUnit unit) throws SQLException{
Connection conn = null;
PreparedStatement stmt = null;
ResultSet rs = null;

try{
conn = ConnectionDAO.getInstance().getConnection();

stmt = conn.prepareStatement("UPDATE activityunit SET description=?, fillAmount=?, amountDescription=? WHERE idActivityUnit=?");

stmt.setString(1, unit.getDescription());
stmt.setInt(2, (unit.isFillAmount() ? 1 : 0));
stmt.setString(3, unit.getAmountDescription());
stmt.setInt(4, unit.getIdActivityUnit());

stmt.execute();

new UpdateEvent(conn).registerUpdate(idUser, unit);

return unit.getIdActivityUnit();
}finally{
if(rs != null && !rs.isClosed())
rs.close();
if(stmt != null && !stmt.isClosed())
stmt.close();
if(conn != null && !conn.isClosed())
conn.close();
}
}

private ActivityUnit loadObject(ResultSet rs) throws SQLException{
ActivityUnit unit = new ActivityUnit();

unit.setIdActivityUnit(rs.getInt("idActivityUnit"));
unit.setDescription(rs.getString("Description"));
unit.setFillAmount(rs.getInt("fillAmount") == 1);
unit.setAmountDescription(rs.getString("amountDescription"));

return unit;
}

Expand Down
55 changes: 30 additions & 25 deletions src/main/java/br/edu/utfpr/dv/siacoes/dao/BugReportDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,25 @@
import br.edu.utfpr.dv.siacoes.model.Module;
import br.edu.utfpr.dv.siacoes.model.User;

// A classe está implementada dentro dos meus conhecimentos sobre java

public class BugReportDAO {

public BugReport findById(int id) throws SQLException{
Connection conn = null;
PreparedStatement stmt = null;
ResultSet rs = null;

try{
conn = ConnectionDAO.getInstance().getConnection();
stmt = conn.prepareStatement("SELECT bugreport.*, \"user\".name " +
"FROM bugreport INNER JOIN \"user\" ON \"user\".idUser=bugreport.idUser " +
"WHERE idBugReport = ?");
stmt = conn.prepareStatement("SELECT bugreport.*, \"user\".name " +
"FROM bugreport INNER JOIN \"user\" ON \"user\".idUser=bugreport.idUser " +
"WHERE idBugReport = ?");

stmt.setInt(1, id);

rs = stmt.executeQuery();

if(rs.next()){
return this.loadObject(rs);
}else{
Expand All @@ -45,25 +47,25 @@ public BugReport findById(int id) throws SQLException{
conn.close();
}
}

public List<BugReport> listAll() throws SQLException{
Connection conn = null;
Statement stmt = null;
ResultSet rs = null;

try{
conn = ConnectionDAO.getInstance().getConnection();
stmt = conn.createStatement();

rs = stmt.executeQuery("SELECT bugreport.*, \"user\".name " +
"FROM bugreport INNER JOIN \"user\" ON \"user\".idUser=bugreport.idUser " +
"ORDER BY status, reportdate");
List<BugReport> list = new ArrayList<BugReport>();

while(rs.next()){
list.add(this.loadObject(rs));
}

return list;
}finally{
if((rs != null) && !rs.isClosed())
Expand All @@ -74,22 +76,22 @@ public List<BugReport> listAll() throws SQLException{
conn.close();
}
}

public int save(BugReport bug) throws SQLException{
boolean insert = (bug.getIdBugReport() == 0);
Connection conn = null;
PreparedStatement stmt = null;
ResultSet rs = null;

try{
conn = ConnectionDAO.getInstance().getConnection();

if(insert){
stmt = conn.prepareStatement("INSERT INTO bugreport(idUser, module, title, description, reportDate, type, status, statusDate, statusDescription) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)", Statement.RETURN_GENERATED_KEYS);
}else{
stmt = conn.prepareStatement("UPDATE bugreport SET idUser=?, module=?, title=?, description=?, reportDate=?, type=?, status=?, statusDate=?, statusDescription=? WHERE idBugReport=?");
}

stmt.setInt(1, bug.getUser().getIdUser());
stmt.setInt(2, bug.getModule().getValue());
stmt.setString(3, bug.getTitle());
Expand All @@ -103,21 +105,21 @@ public int save(BugReport bug) throws SQLException{
stmt.setDate(8, new java.sql.Date(bug.getStatusDate().getTime()));
}
stmt.setString(9, bug.getStatusDescription());

if(!insert){
stmt.setInt(10, bug.getIdBugReport());
}

stmt.execute();

if(insert){
rs = stmt.getGeneratedKeys();

if(rs.next()){
bug.setIdBugReport(rs.getInt(1));
}
}

return bug.getIdBugReport();
}finally{
if((rs != null) && !rs.isClosed())
Expand All @@ -128,10 +130,10 @@ public int save(BugReport bug) throws SQLException{
conn.close();
}
}

private BugReport loadObject(ResultSet rs) throws SQLException{
BugReport bug = new BugReport();

bug.setIdBugReport(rs.getInt("idBugReport"));
bug.setUser(new User());
bug.getUser().setIdUser(rs.getInt("idUser"));
Expand All @@ -144,8 +146,11 @@ private BugReport loadObject(ResultSet rs) throws SQLException{
bug.setStatus(BugReport.BugStatus.valueOf(rs.getInt("status")));
bug.setStatusDate(rs.getDate("statusDate"));
bug.setStatusDescription(rs.getString("statusDescription"));

return bug;
}



}

Loading