11 |
import java.util.Map; |
import java.util.Map; |
12 |
|
|
13 |
import dk.daoas.daoadresseservice.AddressUtils; |
import dk.daoas.daoadresseservice.AddressUtils; |
|
import dk.daoas.daoadresseservice.DaekningsType; |
|
14 |
import dk.daoas.daoadresseservice.beans.Address; |
import dk.daoas.daoadresseservice.beans.Address; |
15 |
import dk.daoas.daoadresseservice.beans.AliasBean; |
import dk.daoas.daoadresseservice.beans.AliasBean; |
16 |
import dk.daoas.daoadresseservice.beans.ExtendedBean; |
import dk.daoas.daoadresseservice.beans.ExtendedBean; |
17 |
import dk.daoas.daoadresseservice.beans.HundredePctBean; |
import dk.daoas.daoadresseservice.beans.HundredePctBean; |
|
import dk.daoas.daoadresseservice.beans.LoggedAddress; |
|
18 |
import dk.daoas.daoadresseservice.beans.SearchResult; |
import dk.daoas.daoadresseservice.beans.SearchResult; |
19 |
import dk.daoas.daoadresseservice.util.DeduplicateHelper; |
import dk.daoas.daoadresseservice.util.DeduplicateHelper; |
20 |
|
import dk.daoas.daoadresseservice.util.TimingHelper; |
21 |
|
|
22 |
public class DatabaseLayerImplementation implements DatabaseLayer { |
public class DatabaseLayerImplementation implements DatabaseLayer { |
23 |
|
|
25 |
|
|
26 |
@Override |
@Override |
27 |
public List<Address> getAllAdresses() throws SQLException { |
public List<Address> getAllAdresses() throws SQLException { |
28 |
|
TimingHelper timing = new TimingHelper(); |
29 |
|
|
30 |
String debugFilter = DatabaseLayerImplementation.DEBUG ? " AND postnr = 8700 " : ""; |
String debugFilter = DatabaseLayerImplementation.DEBUG ? " AND postnr = 8700 " : ""; |
31 |
|
|
32 |
String sql = |
String sql = |
84 |
list.add(a); |
list.add(a); |
85 |
} |
} |
86 |
res.close(); |
res.close(); |
|
stmt.close(); |
|
|
conn.close(); |
|
87 |
|
|
88 |
System.out.println("Loaded " + list.size() + " adresses"); |
System.out.println("DB Loaded " + list.size() + " adresses in " + timing.getElapsed() + "ms"); |
89 |
|
|
90 |
return list; |
return list; |
91 |
} |
} |
93 |
|
|
94 |
@Override |
@Override |
95 |
public List<AliasBean> getAliasList() throws SQLException { |
public List<AliasBean> getAliasList() throws SQLException { |
96 |
|
TimingHelper timing = new TimingHelper(); |
97 |
|
|
98 |
|
|
99 |
String sql = "SELECT postnr,vejnavn,aliasvejnavn " + |
String sql = "SELECT postnr,vejnavn,aliasvejnavn " + |
123 |
|
|
124 |
res.close(); |
res.close(); |
125 |
|
|
126 |
System.out.println("Loaded " + list.size() + " aliase beans"); |
System.out.println("DB Loaded " + list.size() + " aliase beans in " + timing.getElapsed() + "ms"); |
127 |
|
|
128 |
return list; |
return list; |
129 |
} |
} |
132 |
|
|
133 |
@Override |
@Override |
134 |
public List<ExtendedBean> getExtendedAdresslist() throws SQLException { |
public List<ExtendedBean> getExtendedAdresslist() throws SQLException { |
135 |
|
|
136 |
|
TimingHelper timing = new TimingHelper(); |
137 |
|
|
138 |
String debugFilter1 = DatabaseLayerImplementation.DEBUG ? " WHERE orgPostnr = 8700 " : ""; |
String debugFilter1 = DatabaseLayerImplementation.DEBUG ? " WHERE orgPostnr = 8700 " : ""; |
139 |
String debugFilter2 = DatabaseLayerImplementation.DEBUG ? " AND orgPostnr = 8700 " : ""; |
String debugFilter2 = DatabaseLayerImplementation.DEBUG ? " AND orgPostnr = 8700 " : ""; |
140 |
|
|
141 |
|
|
142 |
String sql = "select orgid, a.id as targetid, afstand, LOWER(type) as type from fulddaekning.afstand_anden_rute a " + |
String sql = "select orgid, a.id as targetid, afstand, LOWER(type) as type from fulddaekning.afstand_anden_rute a " + |
143 |
"join odbc.transporttype t " + |
"LEFT join odbc.transporttype t " + |
144 |
"on t.Art = 'Transpost' " + |
"ON (t.Rute = a.Rute) " + |
|
"and ( (t.Type = 'Cykel' and a.Afstand < 1.001) or (t.Type = 'Scooter' and a.Afstand < 1.201) or (t.Type = 'Bil' and a.Afstand < 2.601) ) " + |
|
|
"and t.Rute = a.Rute " + |
|
145 |
debugFilter1 + |
debugFilter1 + |
146 |
|
|
147 |
"UNION ALL " + |
"UNION ALL " + |
177 |
|
|
178 |
res.close(); |
res.close(); |
179 |
|
|
180 |
System.out.println("Loaded " + list.size() + " extendedbeans"); |
System.out.println("DB Loaded " + list.size() + " extendedbeans in " + timing.getElapsed() + "ms"); |
181 |
|
|
182 |
return list; |
return list; |
183 |
} |
} |
185 |
|
|
186 |
@Override |
@Override |
187 |
public Map<Short,HundredePctBean> get100PctList() throws SQLException { |
public Map<Short,HundredePctBean> get100PctList() throws SQLException { |
188 |
|
TimingHelper timing = new TimingHelper(); |
189 |
|
|
190 |
String sql = "SELECT postnr,UPPER(distributor) as distributor,rute,koreliste,dbkbane " + |
String sql = "SELECT postnr,UPPER(distributor) as distributor,rute,koreliste,dbkbane " + |
191 |
"FROM bogleveringer.adresser_udenfor_daekning"; |
"FROM bogleveringer.adresser_udenfor_daekning"; |
192 |
|
|
198 |
Map<Short, HundredePctBean> map = new HashMap<Short,HundredePctBean>(); |
Map<Short, HundredePctBean> map = new HashMap<Short,HundredePctBean>(); |
199 |
|
|
200 |
DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>(); |
201 |
|
DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>(); |
202 |
|
DeduplicateHelper<String> korelisteCache = new DeduplicateHelper<String>(); |
203 |
|
|
204 |
while (res.next()) { |
while (res.next()) { |
205 |
|
|
207 |
HundredePctBean bean = new HundredePctBean(); |
HundredePctBean bean = new HundredePctBean(); |
208 |
bean.postnr = (short) res.getInt(1); |
bean.postnr = (short) res.getInt(1); |
209 |
bean.distributor = distributorCache.getInstance(res.getString(2)); |
bean.distributor = distributorCache.getInstance(res.getString(2)); |
210 |
bean.rute = res.getString(3); |
bean.rute = ruteCache.getInstance( res.getString(3) ); |
211 |
bean.koreliste = res.getString(4); |
bean.koreliste = korelisteCache.getInstance(res.getString(4) ); |
212 |
bean.dbkBane = (short)res.getInt(5); |
bean.dbkBane = (short)res.getInt(5); |
213 |
|
|
214 |
map.put(bean.postnr, bean); |
map.put(bean.postnr, bean); |
216 |
|
|
217 |
res.close(); |
res.close(); |
218 |
|
|
219 |
System.out.println("Loaded " + map.size() + " 100pct beans"); |
System.out.println("DB Loaded " + map.size() + " 100pct beans in " + timing.getElapsed() + "ms"); |
220 |
|
|
221 |
return map; |
return map; |
222 |
} |
} |
224 |
} |
} |
225 |
|
|
226 |
@Override |
@Override |
227 |
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 { |
228 |
String setVar = "set sql_mode = 'NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' "; |
String setVar = "set sql_mode = 'NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' "; |
229 |
|
|
230 |
String sql = "INSERT INTO logs.hentruteinformation (postnr,adresse,vejnavn,googlevejnavn,husnr,husnr_bogstav,etage,lejlighed,rest,brugerid,status, indlast) " + |
String sql = "INSERT INTO logs.hentruteinformation (postnr,adresse,vejnavn,googlevejnavn,husnr,husnr_bogstav,etage,lejlighed,rest,brugerid,status, OmdelingDag, indlast) " + |
231 |
"VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW() )"; |
"VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW() )"; |
232 |
|
|
233 |
|
|
234 |
|
|
249 |
stmt.setString( 7, result.splitResult.etage); |
stmt.setString( 7, result.splitResult.etage); |
250 |
stmt.setString( 8, result.splitResult.lejlighed); |
stmt.setString( 8, result.splitResult.lejlighed); |
251 |
stmt.setString( 9, result.splitResult.resten); |
stmt.setString( 9, result.splitResult.resten); |
252 |
stmt.setString(10, brugerid); |
stmt.setString(10, brugerid); |
253 |
stmt.setInt(11, getStatusInt(result.status) ); |
stmt.setInt(11, getStatusInt(result.status) ); |
254 |
|
stmt.setString(12, omdelingsdag); |
255 |
|
|
256 |
stmt.executeUpdate(); |
stmt.executeUpdate(); |
257 |
|
|
258 |
} |
} |
259 |
} |
} |
260 |
|
|
|
/* |
|
|
* Bruges til at sammenligne gammel og ny adresse service - kan fjernes engang efter at vi er skiftet til ny service |
|
|
*/ |
|
|
@Deprecated |
|
|
public static List<LoggedAddress> getLoggedAdresses(int antaldage) throws SQLException { |
|
|
String sql = "select postnr,adresse,status from logs.hentruteinformation where indlast>=date_sub(curdate(), interval " + antaldage + " day) " + |
|
|
"and status IN (10,11,12) " + |
|
|
"group by postnr,adresse " |
|
|
; |
|
261 |
|
|
|
try ( Connection conn = DBConnection.getConnection(); |
|
|
Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY); |
|
|
) { |
|
|
|
|
|
|
|
|
stmt.setFetchSize(Integer.MIN_VALUE); |
|
|
|
|
|
ResultSet res = stmt.executeQuery(sql); |
|
|
|
|
|
List<LoggedAddress> result = new ArrayList<LoggedAddress>(); |
|
|
|
|
|
while (res.next()) { |
|
|
LoggedAddress a = new LoggedAddress(); |
|
|
a.postnr = res.getInt(1); |
|
|
a.adresse = res.getString(2); |
|
|
a.status = res.getInt(3); |
|
|
|
|
|
result.add(a); |
|
|
} |
|
|
|
|
|
res.close(); |
|
|
|
|
|
return result; |
|
|
} |
|
|
} |
|
262 |
|
|
263 |
|
|
264 |
private static int safeInt(String str) { |
private static int safeInt(String str) { |