28 |
String debugFilter = DatabaseLayer.DEBUG ? " AND postnr = 8700 " : ""; |
String debugFilter = DatabaseLayer.DEBUG ? " AND postnr = 8700 " : ""; |
29 |
|
|
30 |
String sql = |
String sql = |
31 |
"SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,upper(distributor) AS distributor,dbkbane,koreliste,rute,latitude,longitude " |
"SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,upper(distributor) AS distributor,dbkbane,koreliste,rute,korelistesoendag,rutesoendag,latitude,longitude " |
32 |
+ "FROM fulddaekning.adressetabel " |
+ "FROM fulddaekning.adressetabel " |
33 |
+ "WHERE gadeid IS NOT NULL " |
+ "WHERE gadeid IS NOT NULL " |
34 |
+ debugFilter |
+ debugFilter |
59 |
a.kommunekode = (short) res.getInt(5); |
a.kommunekode = (short) res.getInt(5); |
60 |
a.vejkode = (short)res.getInt(6); |
a.vejkode = (short)res.getInt(6); |
61 |
a.postnr = (short)res.getInt(7); |
a.postnr = (short)res.getInt(7); |
62 |
a.gadeid = res.getLong(8); |
a.gadeid = res.getInt(8); |
63 |
a.distributor = distributorCache.getInstance(res.getString(9)); |
a.distributor = distributorCache.getInstance(res.getString(9)); |
64 |
a.dbkBane = (short) res.getInt(10); |
a.dbkBane = (short) res.getInt(10); |
65 |
|
|
66 |
a.koreliste = korelisteCache.getInstance( res.getString(11) ); |
a.koreliste = korelisteCache.getInstance( res.getString(11) ); |
67 |
a.rute = ruteCache.getInstance( res.getString(12) ); |
a.rute = ruteCache.getInstance( res.getString(12) ); |
68 |
a.latitude = (float) res.getDouble(13); |
a.korelisteSondag = korelisteCache.getInstance( res.getString(13) ); |
69 |
a.longitude = (float) res.getDouble(14); |
a.ruteSondag = ruteCache.getInstance( res.getString(14) ); |
70 |
|
|
71 |
|
a.latitude = (float) res.getDouble(15); |
72 |
|
a.longitude = (float) res.getDouble(16); |
73 |
|
|
74 |
//a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
//a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
75 |
|
|
112 |
while (res.next()) { |
while (res.next()) { |
113 |
|
|
114 |
AliasBean ab = new AliasBean(); |
AliasBean ab = new AliasBean(); |
115 |
ab.postnr = res.getInt(1); |
ab.postnr = res.getShort(1); |
116 |
ab.vejnavn = vejCache.getInstance( res.getString(2) ); |
ab.vejnavn = vejCache.getInstance( res.getString(2) ); |
117 |
ab.aliasVejnavn = vejCache.getInstance( res.getString(3) ); |
ab.aliasVejnavn = vejCache.getInstance( res.getString(3) ); |
118 |
|
|
179 |
} |
} |
180 |
} |
} |
181 |
|
|
182 |
public static Map<Integer,HundredePctBean> get100PctList() throws SQLException { |
public static Map<Short,HundredePctBean> get100PctList() throws SQLException { |
183 |
String sql = "SELECT postnr,UPPER(distributor) as distributor,rute,koreliste,dbkbane " + |
String sql = "SELECT postnr,UPPER(distributor) as distributor,rute,koreliste,dbkbane " + |
184 |
"FROM bogleveringer.adresser_udenfor_daekning"; |
"FROM bogleveringer.adresser_udenfor_daekning"; |
185 |
|
|
188 |
) { |
) { |
189 |
ResultSet res = stmt.executeQuery(sql); |
ResultSet res = stmt.executeQuery(sql); |
190 |
|
|
191 |
Map<Integer,HundredePctBean> map = new HashMap<Integer,HundredePctBean>(); |
Map<Short, HundredePctBean> map = new HashMap<Short,HundredePctBean>(); |
192 |
|
|
193 |
DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>(); |
194 |
|
|
196 |
|
|
197 |
|
|
198 |
HundredePctBean bean = new HundredePctBean(); |
HundredePctBean bean = new HundredePctBean(); |
199 |
bean.postnr = res.getInt(1); |
bean.postnr = (short) res.getInt(1); |
200 |
bean.distributor = distributorCache.getInstance(res.getString(2)); |
bean.distributor = distributorCache.getInstance(res.getString(2)); |
201 |
bean.rute = res.getString(3); |
bean.rute = res.getString(3); |
202 |
bean.koreliste = res.getString(4); |
bean.koreliste = res.getString(4); |
215 |
} |
} |
216 |
|
|
217 |
public static void saveRequestLog(String brugerid, String postnr, String adresse, SearchResult result) throws SQLException { |
public static void saveRequestLog(String brugerid, String postnr, String adresse, SearchResult result) throws SQLException { |
218 |
|
String setVar = "set sql_mode = 'NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' "; |
219 |
|
|
220 |
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, indlast) " + |
221 |
"VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW() )"; |
"VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW() )"; |
222 |
|
|
223 |
|
|
224 |
|
|
225 |
try ( Connection conn = DBConnection.getConnection(); |
try ( Connection conn = DBConnection.getConnection(); |
226 |
|
Statement setStmt = conn.createStatement(); |
227 |
PreparedStatement stmt = conn.prepareStatement(sql); |
PreparedStatement stmt = conn.prepareStatement(sql); |
228 |
) { |
) { |
229 |
|
|
230 |
|
setStmt.execute(setVar); |
231 |
|
|
232 |
|
|
233 |
stmt.setInt( 1, safeInt(postnr) ); |
stmt.setInt( 1, safeInt(postnr) ); |
234 |
stmt.setString( 2, adresse); |
stmt.setString( 2, adresse); |
235 |
stmt.setString( 3, result.splitResult.vej); |
stmt.setString( 3, result.splitResult.vej); |