Skip to content
This repository was archived by the owner on Dec 31, 2018. It is now read-only.

Kuupäeva võrdluse parandus #1

Open
varres wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Kuupäeva võrdluse parandus #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59b1e54
Kuupäeva võrdluse parandus: aktiivne on kirje ka siis, kui kuupäev on
Dec 11, 2011
e7099e0
Sulgeja ja suletud võib teha ühe updatega, ei ole mõtet kiusata baasi
Dec 11, 2011
3b95c9a
Eemaldatud koodi dubleerimine
Dec 12, 2011
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
20 changes: 8 additions & 12 deletions Piirivalve/src/main/java/ee/itcollege/jejee/entities/BaseEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,27 +134,23 @@ public void setSuletud(Date suletud) {
@Transactional
public void remove() {
String table = this.getClass().getSimpleName();
Query q = entityManager().createQuery("UPDATE " + table + " SET suletud=:date WHERE id=" + id);
q.setParameter("date", new Date());
// this.entityManager.getTransaction().begin();
if(q.executeUpdate() != 1) {
//FAILED
// this.entityManager.getTransaction().rollback();
//TODO: write to log
return;
}

String user = SecurityContextHolder.getContext().getAuthentication().getName();
q = entityManager().createQuery("UPDATE " + table + " SET sulgeja=:sulgeja WHERE id=" + id);

Query q = entityManager().createQuery("UPDATE " + table + " SET suletud=:date, sulgeja=:sulgeja WHERE id=" + id);
q.setParameter("date", getDate());
q.setParameter("sulgeja", user);
// this.entityManager.getTransaction().begin();
if(q.executeUpdate() != 1) {
//FAILED
// this.entityManager.getTransaction().rollback();
//TODO: write to log
return;
}

// this.entityManager.getTransaction().commit();
}

public static Date getDate() {
return new Date();
}

}
12 changes: 6 additions & 6 deletions Piirivalve/src/main/java/ee/itcollege/jejee/entities/Intsidendi_liik.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,22 @@ public void setIntsident(Collection<Intsident> param) {


public static long countIntsidendi_liiks() {
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Intsidendi_liik o WHERE o.suletud=:d", Long.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Intsidendi_liik o WHERE o.suletud > :date", Long.class);
q.setParameter("date", getDate());
return (Long) q.getSingleResult();
}

@SuppressWarnings("unchecked")
public static List<Intsidendi_liik> findAllIntsidendi_liiks() {
Query q = entityManager().createQuery("SELECT o FROM Intsidendi_liik o WHERE o.suletud=:d", Intsidendi_liik.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Intsidendi_liik o WHERE o.suletud > :date", Intsidendi_liik.class);
q.setParameter("date", getDate());
return q.getResultList();
}

@SuppressWarnings("unchecked")
public static List<Intsidendi_liik> findIntsidendi_liikEntries(int firstResult, int maxResults) {
Query q = entityManager().createQuery("SELECT o FROM Intsidendi_liik o WHERE o.suletud=:d", Intsidendi_liik.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Intsidendi_liik o WHERE o.suletud > :date", Intsidendi_liik.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("date", getDate());
return q.getResultList();
}

Expand Down
24 changes: 12 additions & 12 deletions Piirivalve/src/main/java/ee/itcollege/jejee/entities/Intsident.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,50 +187,50 @@ public void setPiirivalvurid_intsidendis(Collection<Piirivalvur_intsidendis> pii


public static long countIntsidents() {
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Intsident o WHERE o.suletud=:d", Long.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Intsident o WHERE o.suletud > :date", Long.class);
q.setParameter("date", getDate());
return (Long) q.getSingleResult();
}

@SuppressWarnings("unchecked")
public static List<Intsident> findAllIntsidents() {
Query q = entityManager().createQuery("SELECT o FROM Intsident o WHERE o.suletud=:d", Intsident.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Intsident o WHERE o.suletud > :date", Intsident.class);
q.setParameter("date", getDate());
return q.getResultList();
}

@SuppressWarnings("unchecked")
public static List<Intsident> findIntsidentEntries(int firstResult, int maxResults) {
Query q = entityManager().createQuery("SELECT o FROM Intsident o WHERE o.suletud=:d", Intsident.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Intsident o WHERE o.suletud > :date", Intsident.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("date", getDate());
return q.getResultList();
}


@SuppressWarnings("unchecked")
public static List<Intsident> findAllIntsidentsForPiiriloik(Piiriloik piir) {
Query q = entityManager().createQuery("SELECT o FROM Intsident o WHERE o.piiriloik=:piir AND o.suletud=:d", Intsident.class);
Query q = entityManager().createQuery("SELECT o FROM Intsident o WHERE o.piiriloik=:piir AND o.suletud > :date", Intsident.class);
q.setParameter("piir", piir);
q.setParameter("d", SURROGATE_DATE);
q.setParameter("date", getDate());
return q.getResultList();
}

@SuppressWarnings("unchecked")
public static List<Intsident> findIntsidentsForPiiriloikWithInterval(Piiriloik piir, Date toimumise_algus, Date toimumise_lopp) {
Query q = entityManager().createQuery("SELECT o FROM Intsident o WHERE o.piiriloik=:piir and o.toimumise_algus>=:toimumise_algus and o.toimumise_lopp<=:toimumise_lopp AND o.suletud=:d", Intsident.class);
Query q = entityManager().createQuery("SELECT o FROM Intsident o WHERE o.piiriloik=:piir and o.toimumise_algus>=:toimumise_algus and o.toimumise_lopp<=:toimumise_lopp AND o.suletud > :date", Intsident.class);
q.setParameter("piir", piir);
q.setParameter("toimumise_algus", toimumise_algus);
q.setParameter("toimumise_lopp", toimumise_lopp);
q.setParameter("d", SURROGATE_DATE);
q.setParameter("date", getDate());
return q.getResultList();
}

@SuppressWarnings("unchecked")
public static List<Intsident> findAllIntsidentsWithInterval(Date toimumise_algus, Date toimumise_lopp) {
Query q = entityManager().createQuery("SELECT o FROM Intsident o WHERE o.toimumise_algus>=:toimumise_algus and o.toimumise_lopp<=:toimumise_lopp AND o.suletud=:d", Intsident.class);
Query q = entityManager().createQuery("SELECT o FROM Intsident o WHERE o.toimumise_algus>=:toimumise_algus and o.toimumise_lopp<=:toimumise_lopp AND o.suletud > :date", Intsident.class);
q.setParameter("toimumise_algus", toimumise_algus);
q.setParameter("toimumise_lopp", toimumise_lopp);
q.setParameter("d", SURROGATE_DATE);
q.setParameter("date", getDate());
return q.getResultList();
}

Expand Down
16 changes: 8 additions & 8 deletions Piirivalve/src/main/java/ee/itcollege/jejee/entities/Isik_intsidendis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,31 +109,31 @@ public Object clone() throws CloneNotSupportedException {


public static long countIsik_intsidendises() {
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Isik_intsidendis o WHERE o.suletud=:d", Long.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Isik_intsidendis o WHERE o.suletud > :date", Long.class);
q.setParameter("date", getDate());
return (Long) q.getSingleResult();
}

@SuppressWarnings("unchecked")
public static List<Isik_intsidendis> findAllIsik_intsidendises() {
Query q = entityManager().createQuery("SELECT o FROM Isik_intsidendis o WHERE o.suletud=:d", Isik_intsidendis.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Isik_intsidendis o WHERE o.suletud > :date", Isik_intsidendis.class);
q.setParameter("date", getDate());
return q.getResultList();
}

@SuppressWarnings("unchecked")
public static List<Isik_intsidendis> findIsik_intsidendisEntries(int firstResult, int maxResults) {
Query q = entityManager().createQuery("SELECT o FROM Isik_intsidendis o WHERE o.suletud=:d", Isik_intsidendis.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Isik_intsidendis o WHERE o.suletud > :date", Isik_intsidendis.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("date", getDate());
return q.getResultList();
}


@SuppressWarnings("unchecked")
public static List<Isik_intsidendis> findAllIsik_intsidendisForIntsident(Intsident ints) {
Query q = entityManager().createQuery("SELECT o FROM Isik_intsidendis o WHERE o.intsident=:ints AND o.suletud=:d", Isik_intsidendis.class);
Query q = entityManager().createQuery("SELECT o FROM Isik_intsidendis o WHERE o.intsident=:ints AND o.suletud > :date", Isik_intsidendis.class);
q.setParameter("ints", ints);
q.setParameter("d", SURROGATE_DATE);
q.setParameter("date", getDate());
return q.getResultList();
}

Expand Down
20 changes: 10 additions & 10 deletions Piirivalve/src/main/java/ee/itcollege/jejee/entities/Objekt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,39 +88,39 @@ public void setPiiririkkuja(Collection<Piiririkkuja> param) {


public static long countObjekts() {
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Objekt o WHERE o.suletud=:d", Long.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Objekt o WHERE o.suletud > :date", Long.class);
q.setParameter("date", getDate());
return (Long) q.getSingleResult();
}

@SuppressWarnings("unchecked")
public static List<Objekt> findAllObjekts() {
Query q = entityManager().createQuery("SELECT o FROM Objekt o WHERE o.suletud=:d", Objekt.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Objekt o WHERE o.suletud > :date", Objekt.class);
q.setParameter("date", getDate());
return q.getResultList();
}

@SuppressWarnings("unchecked")
public static List<Objekt> findObjektEntries(int firstResult, int maxResults) {
Query q = entityManager().createQuery("SELECT o FROM Objekt o WHERE o.suletud=:d", Objekt.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Objekt o WHERE o.suletud > :date", Objekt.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("date", getDate());
return q.getResultList();
}


@SuppressWarnings("unchecked")
public static List<Objekt> findAllObjektidForIntsident(Intsident ints) {
Query q = entityManager().createQuery("SELECT o FROM Objekt o JOIN o.objekt_intsidendis oi WHERE oi.intsident=:ints AND o.suletud=:d", Objekt.class);
Query q = entityManager().createQuery("SELECT o FROM Objekt o JOIN o.objekt_intsidendis oi WHERE oi.intsident=:ints AND o.suletud > :date", Objekt.class);
q.setParameter("ints", ints);
q.setParameter("d", SURROGATE_DATE);
q.setParameter("date", getDate());
return q.getResultList();
}

@SuppressWarnings("unchecked")
public static Collection<Objekt> findAllObjektidNotInIntsident(Intsident ints) {
Query q = entityManager().createQuery("SELECT o FROM Objekt o WHERE o NOT IN (SELECT o1 FROM Objekt o1 JOIN o1.objekt_intsidendis oi WHERE oi.intsident=:ints) AND o.suletud=:d", Objekt.class);
Query q = entityManager().createQuery("SELECT o FROM Objekt o WHERE o NOT IN (SELECT o1 FROM Objekt o1 JOIN o1.objekt_intsidendis oi WHERE oi.intsident=:ints) AND o.suletud > :date", Objekt.class);
q.setParameter("ints", ints);
q.setParameter("d", SURROGATE_DATE);
q.setParameter("date", getDate());
return q.getResultList();
}

Expand Down
16 changes: 8 additions & 8 deletions Piirivalve/src/main/java/ee/itcollege/jejee/entities/Objekt_intsidendis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,31 +109,31 @@ public Object clone() throws CloneNotSupportedException {


public static long countObjekt_intsidendises() {
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Objekt_intsidendis o WHERE o.suletud=:d", Long.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Objekt_intsidendis o WHERE o.suletud > :date", Long.class);
q.setParameter("date", getDate());
return (Long) q.getSingleResult();
}

@SuppressWarnings("unchecked")
public static List<Objekt_intsidendis> findAllObjekt_intsidendises() {
Query q = entityManager().createQuery("SELECT o FROM Objekt_intsidendis o WHERE o.suletud=:d", Objekt_intsidendis.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Objekt_intsidendis o WHERE o.suletud > :date", Objekt_intsidendis.class);
q.setParameter("date", getDate());
return q.getResultList();
}

@SuppressWarnings("unchecked")
public static List<Objekt_intsidendis> findObjekt_intsidendisEntries(int firstResult, int maxResults) {
Query q = entityManager().createQuery("SELECT o FROM Objekt_intsidendis o WHERE o.suletud=:d", Objekt_intsidendis.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Objekt_intsidendis o WHERE o.suletud > :date", Objekt_intsidendis.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("date", getDate());
return q.getResultList();
}


@SuppressWarnings("unchecked")
public static List<Objekt_intsidendis> findAllObjekt_intsidendisForIntsident(Intsident ints) {
Query q = entityManager().createQuery("SELECT o FROM Objekt_intsidendis o WHERE o.intsident=:ints AND o.suletud=:d", Objekt_intsidendis.class);
Query q = entityManager().createQuery("SELECT o FROM Objekt_intsidendis o WHERE o.intsident=:ints AND o.suletud > :date", Objekt_intsidendis.class);
q.setParameter("ints", ints);
q.setParameter("d", SURROGATE_DATE);
q.setParameter("date", getDate());
return q.getResultList();
}

Expand Down
12 changes: 6 additions & 6 deletions Piirivalve/src/main/java/ee/itcollege/jejee/entities/Objekti_liik.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,22 @@ public void setObjekt(Collection<Objekt> param) {


public static long countObjekti_liiks() {
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Objekti_liik o WHERE o.suletud=:d", Long.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Objekti_liik o WHERE o.suletud > :date", Long.class);
q.setParameter("date", getDate());
return (Long) q.getSingleResult();
}

@SuppressWarnings("unchecked")
public static List<Objekti_liik> findAllObjekti_liiks() {
Query q = entityManager().createQuery("SELECT o FROM Objekti_liik o WHERE o.suletud=:d", Objekti_liik.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Objekti_liik o WHERE o.suletud > :date", Objekti_liik.class);
q.setParameter("date", getDate());
return q.getResultList();
}

@SuppressWarnings("unchecked")
public static List<Objekti_liik> findObjekti_liikEntries(int firstResult, int maxResults) {
Query q = entityManager().createQuery("SELECT o FROM Objekti_liik o WHERE o.suletud=:d", Objekti_liik.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Objekti_liik o WHERE o.suletud > :date", Objekti_liik.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("date", getDate());
return q.getResultList();
}

Expand Down
12 changes: 6 additions & 6 deletions Piirivalve/src/main/java/ee/itcollege/jejee/entities/Piiriloik.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,22 +81,22 @@ public void setVahtkond_piiriloigul(Collection<Vahtkond_piiriloigul> param) {


public static long countPiiriloiks() {
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Piiriloik o WHERE o.suletud=:d", Long.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Piiriloik o WHERE o.suletud > :date", Long.class);
q.setParameter("date", getDate());
return (Long) q.getSingleResult();
}

@SuppressWarnings("unchecked")
public static List<Piiriloik> findAllPiiriloiks() {
Query q = entityManager().createQuery("SELECT o FROM Piiriloik o WHERE o.suletud=:d", Piiriloik.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Piiriloik o WHERE o.suletud > :date", Piiriloik.class);
q.setParameter("date", getDate());
return q.getResultList();
}

@SuppressWarnings("unchecked")
public static List<Piiriloik> findPiiriloikEntries(int firstResult, int maxResults) {
Query q = entityManager().createQuery("SELECT o FROM Piiriloik o WHERE o.suletud=:d", Piiriloik.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Piiriloik o WHERE o.suletud > :date", Piiriloik.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("date", getDate());
return q.getResultList();
}

Expand Down
12 changes: 6 additions & 6 deletions Piirivalve/src/main/java/ee/itcollege/jejee/entities/Piiripunkt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,22 +136,22 @@ public void setVahtkond(Collection<Vahtkond> param) {


public static long countPiiripunkts() {
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Piiripunkt o WHERE o.suletud=:d", Long.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT COUNT(o) FROM Piiripunkt o WHERE o.suletud > :date", Long.class);
q.setParameter("date", getDate());
return (Long) q.getSingleResult();
}

@SuppressWarnings("unchecked")
public static List<Piiripunkt> findAllPiiripunkts() {
Query q = entityManager().createQuery("SELECT o FROM Piiripunkt o WHERE o.suletud=:d", Piiripunkt.class);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Piiripunkt o WHERE o.suletud > :date", Piiripunkt.class);
q.setParameter("date", getDate());
return q.getResultList();
}

@SuppressWarnings("unchecked")
public static List<Piiripunkt> findPiiripunktEntries(int firstResult, int maxResults) {
Query q = entityManager().createQuery("SELECT o FROM Piiripunkt o WHERE o.suletud=:d", Piiripunkt.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("d", SURROGATE_DATE);
Query q = entityManager().createQuery("SELECT o FROM Piiripunkt o WHERE o.suletud > :date", Piiripunkt.class).setFirstResult(firstResult).setMaxResults(maxResults);
q.setParameter("date", getDate());
return q.getResultList();
}

Expand Down
Loading