--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/db/DatabaseLayerImplementation.java 2015/07/15 13:42:30 2616
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/db/DatabaseLayerImplementation.java 2015/11/03 10:02:56 2764
@@ -17,6 +17,7 @@
import dk.daoas.daoadresseservice.beans.HundredePctBean;
import dk.daoas.daoadresseservice.beans.SearchResult;
import dk.daoas.daoadresseservice.util.DeduplicateHelper;
+import dk.daoas.daoadresseservice.util.TimingHelper;
public class DatabaseLayerImplementation implements DatabaseLayer {
@@ -24,6 +25,8 @@
@Override
public List
getAllAdresses() throws SQLException {
+ TimingHelper timing = new TimingHelper();
+
String debugFilter = DatabaseLayerImplementation.DEBUG ? " AND postnr = 8700 " : "";
String sql =
@@ -81,10 +84,8 @@
list.add(a);
}
res.close();
- stmt.close();
- conn.close();
- System.out.println("Loaded " + list.size() + " adresses");
+ System.out.println("DB Loaded " + list.size() + " adresses in " + timing.getElapsed() + "ms");
return list;
}
@@ -92,6 +93,7 @@
@Override
public List getAliasList() throws SQLException {
+ TimingHelper timing = new TimingHelper();
String sql = "SELECT postnr,vejnavn,aliasvejnavn " +
@@ -121,7 +123,7 @@
res.close();
- System.out.println("Loaded " + list.size() + " aliase beans");
+ System.out.println("DB Loaded " + list.size() + " aliase beans in " + timing.getElapsed() + "ms");
return list;
}
@@ -130,6 +132,9 @@
@Override
public List getExtendedAdresslist() throws SQLException {
+
+ TimingHelper timing = new TimingHelper();
+
String debugFilter1 = DatabaseLayerImplementation.DEBUG ? " WHERE orgPostnr = 8700 " : "";
String debugFilter2 = DatabaseLayerImplementation.DEBUG ? " AND orgPostnr = 8700 " : "";
@@ -174,7 +179,7 @@
res.close();
- System.out.println("Loaded " + list.size() + " extendedbeans");
+ System.out.println("DB Loaded " + list.size() + " extendedbeans in " + timing.getElapsed() + "ms");
return list;
}
@@ -182,6 +187,8 @@
@Override
public Map get100PctList() throws SQLException {
+ TimingHelper timing = new TimingHelper();
+
String sql = "SELECT postnr,UPPER(distributor) as distributor,rute,koreliste,dbkbane " +
"FROM bogleveringer.adresser_udenfor_daekning";
@@ -193,6 +200,8 @@
Map map = new HashMap();
DeduplicateHelper distributorCache = new DeduplicateHelper();
+ DeduplicateHelper ruteCache = new DeduplicateHelper();
+ DeduplicateHelper korelisteCache = new DeduplicateHelper();
while (res.next()) {
@@ -200,8 +209,8 @@
HundredePctBean bean = new HundredePctBean();
bean.postnr = (short) res.getInt(1);
bean.distributor = distributorCache.getInstance(res.getString(2));
- bean.rute = res.getString(3);
- bean.koreliste = res.getString(4);
+ bean.rute = ruteCache.getInstance( res.getString(3) );
+ bean.koreliste = korelisteCache.getInstance(res.getString(4) );
bean.dbkBane = (short)res.getInt(5);
map.put(bean.postnr, bean);
@@ -209,7 +218,7 @@
res.close();
- System.out.println("Loaded " + map.size() + " 100pct beans");
+ System.out.println("DB Loaded " + map.size() + " 100pct beans in " + timing.getElapsed() + "ms");
return map;
}
@@ -217,11 +226,11 @@
}
@Override
- public void saveRequestLog(String brugerid, String postnr, String adresse, SearchResult result) throws SQLException {
+ public void saveRequestLog(String brugerid, String postnr, String adresse, String omdelingsdag, SearchResult result) throws SQLException {
String setVar = "set sql_mode = 'NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' ";
- String sql = "INSERT INTO logs.hentruteinformation (postnr,adresse,vejnavn,googlevejnavn,husnr,husnr_bogstav,etage,lejlighed,rest,brugerid,status, indlast) " +
- "VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW() )";
+ String sql = "INSERT INTO logs.hentruteinformation (postnr,adresse,vejnavn,googlevejnavn,husnr,husnr_bogstav,etage,lejlighed,rest,brugerid,status, OmdelingDag, indlast) " +
+ "VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW() )";
@@ -242,8 +251,9 @@
stmt.setString( 7, result.splitResult.etage);
stmt.setString( 8, result.splitResult.lejlighed);
stmt.setString( 9, result.splitResult.resten);
- stmt.setString(10, brugerid);
+ stmt.setString(10, brugerid);
stmt.setInt(11, getStatusInt(result.status) );
+ stmt.setString(12, omdelingsdag);
stmt.executeUpdate();