36 |
|
|
37 |
|
|
38 |
|
|
39 |
|
DeduplicateHelper<String> vejnavnCache = new DeduplicateHelper<String>(); |
40 |
DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>(); |
41 |
DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>(); |
42 |
|
|
101 |
|
|
102 |
logger.info("Henter alle IKKE-daekkede adresser"); |
logger.info("Henter alle IKKE-daekkede adresser"); |
103 |
|
|
104 |
String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + |
String sql = "SELECT id,a.postnr,vejnavn,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + |
105 |
"FROM fulddaekning.adressetabel a " + |
"FROM fulddaekning.adressetabel a " + |
106 |
"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " + |
"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " + |
107 |
"WHERE rute IS NULL " + //Ingen dækning |
"WHERE rute IS NULL " + //Ingen dækning |
160 |
|
|
161 |
public int hentAlleDaekkedeAdresser() throws SQLException { |
public int hentAlleDaekkedeAdresser() throws SQLException { |
162 |
if ( alleAdresser == null ) { |
if ( alleAdresser == null ) { |
163 |
String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + |
String sql = "SELECT id,a.postnr,vejnavn,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + |
164 |
"FROM fulddaekning.adressetabel a " + |
"FROM fulddaekning.adressetabel a " + |
165 |
"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " + |
"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " + |
166 |
"WHERE rute IS NOT NULL " + |
"WHERE rute IS NOT NULL " + |
203 |
|
|
204 |
|
|
205 |
public synchronized void gemResultat(Adresse orgAdresse, Adresse bedsteAdresse, double bedsteAfstand) throws SQLException { |
public synchronized void gemResultat(Adresse orgAdresse, Adresse bedsteAdresse, double bedsteAfstand) throws SQLException { |
206 |
/*String sql = "INSERT INTO fulddaekning.afstand_anden_rute_thn (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+ |
/*String sql = "INSERT INTO fulddaekning.afstand_anden_rute_thn (orgId,orgPostnr, orgVejnavn,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,vejnavn,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+ |
207 |
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )"; |
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )"; |
208 |
|
|
209 |
PreparedStatement saveStmt = conn.prepareStatement(sql);*/ |
PreparedStatement saveStmt = conn.prepareStatement(sql);*/ |
210 |
|
|
211 |
saveStmt.setInt(1, orgAdresse.id); |
saveStmt.setInt(1, orgAdresse.id); |
212 |
saveStmt.setShort(2, orgAdresse.postnr); |
saveStmt.setShort(2, orgAdresse.postnr); |
213 |
saveStmt.setString(3, orgAdresse.adresse); |
saveStmt.setString(3, orgAdresse.vejnavn); |
214 |
saveStmt.setInt(4, orgAdresse.gadeid); |
saveStmt.setInt(4, orgAdresse.gadeid); |
215 |
saveStmt.setShort(5, orgAdresse.husnr); |
saveStmt.setShort(5, orgAdresse.husnr); |
216 |
saveStmt.setString(6, orgAdresse.husnrbogstav); |
saveStmt.setString(6, orgAdresse.husnrbogstav); |
219 |
|
|
220 |
saveStmt.setInt(8, bedsteAdresse.id); |
saveStmt.setInt(8, bedsteAdresse.id); |
221 |
saveStmt.setShort(9, bedsteAdresse.postnr); |
saveStmt.setShort(9, bedsteAdresse.postnr); |
222 |
saveStmt.setString(10, bedsteAdresse.adresse); |
saveStmt.setString(10, bedsteAdresse.vejnavn); |
223 |
saveStmt.setInt(11, bedsteAdresse.gadeid); |
saveStmt.setInt(11, bedsteAdresse.gadeid); |
224 |
saveStmt.setShort(12, bedsteAdresse.husnr); |
saveStmt.setShort(12, bedsteAdresse.husnr); |
225 |
saveStmt.setString(13, bedsteAdresse.husnrbogstav); |
saveStmt.setString(13, bedsteAdresse.husnrbogstav); |
263 |
|
|
264 |
adr.id = res.getInt(1); |
adr.id = res.getInt(1); |
265 |
adr.postnr = res.getShort(2); |
adr.postnr = res.getShort(2); |
266 |
adr.adresse = res.getString(3); |
adr.vejnavn = vejnavnCache.getInstance( res.getString(3) ); |
267 |
adr.gadeid = res.getInt(4); |
adr.gadeid = res.getInt(4); |
268 |
adr.husnr = res.getShort(5); |
adr.husnr = res.getShort(5); |
269 |
adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) ); |
adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) ); |