1 |
package dk.daoas.fulddaekning; |
package dk.daoas.fulddaekning; |
2 |
|
|
3 |
|
import geocode.GeoPoint; |
4 |
|
|
5 |
import java.io.IOException; |
import java.io.IOException; |
6 |
import java.sql.Connection; |
import java.sql.Connection; |
7 |
import java.sql.DriverManager; |
import java.sql.DriverManager; |
9 |
import java.sql.ResultSet; |
import java.sql.ResultSet; |
10 |
import java.sql.SQLException; |
import java.sql.SQLException; |
11 |
import java.util.ArrayList; |
import java.util.ArrayList; |
12 |
|
import java.util.HashMap; |
13 |
import java.util.List; |
import java.util.List; |
14 |
|
import java.util.Map; |
15 |
import java.util.Properties; |
import java.util.Properties; |
16 |
import java.util.Queue; |
import java.util.Queue; |
17 |
|
import java.util.Set; |
18 |
|
import java.util.TreeSet; |
19 |
import java.util.concurrent.ConcurrentLinkedQueue; |
import java.util.concurrent.ConcurrentLinkedQueue; |
20 |
import java.util.logging.Logger; |
import java.util.logging.Logger; |
21 |
|
|
22 |
|
|
23 |
|
|
24 |
public class Database { |
public class Database { |
25 |
Logger logger = Logger.getLogger(Database.class.getName()); |
Logger logger = Logger.getLogger(Database.class.getName()); |
26 |
|
|
27 |
|
int batchCount = 0; |
28 |
|
|
29 |
Connection conn; |
Connection conn; |
30 |
PreparedStatement saveStmt; |
PreparedStatement saveStmt; |
31 |
|
|
32 |
|
List<GeoPoint> alleAdresser; |
33 |
|
Adresse alleIkkeDaekkede[]; |
34 |
|
|
35 |
|
|
36 |
|
DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>(); |
37 |
|
DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>(); |
38 |
|
|
39 |
|
Set<Short> postnumre = new TreeSet<Short>(); |
40 |
|
|
41 |
|
//Map<Short, List<Adresse>> ikkeDaekkedePrPost = new HashMap<Short, List<Adresse>>(); |
42 |
|
|
43 |
|
|
44 |
|
private HashMap<Short,BoundingBox> bbCache = new HashMap<Short,BoundingBox>(); |
45 |
|
|
46 |
public Database(SafeProperties conf) throws SQLException,IOException { |
public Database(SafeProperties conf) throws SQLException,IOException { |
47 |
this.conn = getConnection( conf ); |
this.conn = getConnection( conf ); |
64 |
} |
} |
65 |
|
|
66 |
public void renameResultTables() throws SQLException { |
public void renameResultTables() throws SQLException { |
67 |
|
Constants consts = Constants.getInstance(); |
68 |
|
String ext = consts.getTableExtension(); |
69 |
|
|
70 |
logger.info("Dropping old backup table (if exists)"); |
logger.info("Dropping old backup table (if exists)"); |
71 |
String sql = "DROP TABLE IF EXISTS fulddaekning.afstand_anden_rute_old"; |
String sql = "DROP TABLE IF EXISTS fulddaekning.afstand_anden_rute_old" + ext; |
72 |
conn.createStatement().executeUpdate(sql); |
conn.createStatement().executeUpdate(sql); |
73 |
|
|
74 |
logger.info("Rename tables"); |
logger.info("Rename tables"); |
75 |
sql = "RENAME TABLE fulddaekning.afstand_anden_rute TO fulddaekning.afstand_anden_rute_old, fulddaekning.afstand_anden_rute_ny TO fulddaekning.afstand_anden_rute"; |
sql = "RENAME TABLE fulddaekning.afstand_anden_rute" + ext + " TO fulddaekning.afstand_anden_rute_old" + ext + ", fulddaekning.afstand_anden_rute_ny TO fulddaekning.afstand_anden_rute" + ext; |
|
conn.createStatement().executeUpdate(sql); |
|
|
} |
|
76 |
|
|
77 |
public BoundingBox getBoundingbox(int postnr) throws SQLException { |
logger.info("Executing: " + sql); |
78 |
|
conn.createStatement().executeUpdate(sql); |
79 |
String sql = |
} |
80 |
"SELECT max(latitude) latmax, min(latitude) latmin, max(longitude) lngmax,min(longitude) lngmin " + |
|
81 |
"FROM fulddaekning.adressetabel WHERE postnr=? and rute is null;"; |
public BoundingBox getBoundingbox(short postnr) { |
82 |
|
BoundingBox bb = bbCache.get(postnr); |
83 |
PreparedStatement stmt = conn.prepareStatement(sql); |
return bb.clone();//never return the original / cached object |
84 |
stmt.setInt(1, postnr); |
} |
85 |
|
|
86 |
ResultSet res = stmt.executeQuery(); |
|
87 |
res.next(); //query returnerer altid 1 række |
public Set<Short> hentPostnumreCache() { |
88 |
|
return postnumre; |
|
BoundingBox bbox = new BoundingBox(); |
|
|
bbox.latitudeMax = res.getDouble("latmax"); |
|
|
bbox.latitudeMin = res.getDouble("latmin"); |
|
|
bbox.longitudeMax = res.getDouble("lngmax"); |
|
|
bbox.longitudeMin = res.getDouble("lngmin"); |
|
|
|
|
|
res.close(); |
|
|
stmt.close(); |
|
|
|
|
|
return bbox; |
|
89 |
} |
} |
90 |
|
|
|
public Queue<Adresse> hentIkkedaekkedeAdresser(int postnr) throws SQLException { |
|
|
ConcurrentLinkedQueue<Adresse> queue = new ConcurrentLinkedQueue<Adresse>(); |
|
91 |
|
|
92 |
String sql = "SELECT id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute " + |
public Adresse[] hentAlleIkkedaekkedeAdresser(int minPostnr, int maxPostnr) throws SQLException { |
93 |
"FROM fulddaekning.adressetabel " + |
|
94 |
|
logger.info("Henter alle IKKE-daekkede adresser"); |
95 |
|
|
96 |
|
String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + |
97 |
|
"FROM fulddaekning.adressetabel a " + |
98 |
|
"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " + |
99 |
"WHERE rute IS NULL " + //Ingen dækning |
"WHERE rute IS NULL " + //Ingen dækning |
100 |
"AND postnr=? " + |
"AND a.postnr BETWEEN ? AND ? " + |
101 |
"AND latitude IS NOT NULL " + |
"AND latitude IS NOT NULL " + |
102 |
"AND longitude IS NOT NULL " + |
"AND longitude IS NOT NULL " + |
103 |
"AND gadeid IS NOT NULL "; |
"AND gadeid IS NOT NULL " + |
104 |
|
"AND (a.distributor IS NULL OR a.distributor<>'LUKKET') "; |
105 |
PreparedStatement stmt = conn.prepareStatement(sql); |
PreparedStatement stmt = conn.prepareStatement(sql); |
106 |
stmt.setInt(1, postnr); |
stmt.setInt(1, minPostnr); |
107 |
|
stmt.setInt(2, maxPostnr); |
|
queue.addAll( hentAdresseListe( stmt ) ); |
|
|
return queue; |
|
|
} |
|
108 |
|
|
109 |
public List<Integer> hentPostnumre() throws SQLException { |
List<Adresse> list = hentAdresseListe( stmt ); |
110 |
ArrayList<Integer> list = new ArrayList<Integer>(); |
alleIkkeDaekkede = list.toArray( new Adresse[ list.size() ] ); |
111 |
|
|
112 |
Constants consts = Constants.getInstance(); |
logger.info("Analyserer ikke-daekkede adresser"); |
113 |
|
|
114 |
|
for (Adresse a : alleIkkeDaekkede) { |
115 |
String sql = "SELECT postnr " + |
|
116 |
"FROM fulddaekning.adressetabel " + |
|
117 |
//"WHERE distributor = ? and rute is not null " + |
BoundingBox bbox; |
118 |
"WHERE postnr BETWEEN ? AND ? " + |
|
119 |
"GROUP BY postnr " + |
if (! postnumre.contains(a.postnr )) { |
120 |
"ORDER by postnr"; |
postnumre.add( a.postnr ); |
121 |
PreparedStatement stmt = conn.prepareStatement(sql); |
|
122 |
//stmt.setString(1, Lookup.distributor ); |
bbox = new BoundingBox(); |
123 |
stmt.setInt(1, consts.getMinPostnr()); |
|
124 |
stmt.setInt(2, consts.getMaxPostnr()); |
bbCache.put( a.postnr, bbox); |
125 |
ResultSet res = stmt.executeQuery(); |
|
126 |
|
} else { |
127 |
while (res.next()) { |
bbox = bbCache.get( a.postnr); |
128 |
int postnr = res.getInt("postnr"); |
} |
129 |
list.add(postnr); |
|
130 |
|
bbox.latitudeMax = Math.max(bbox.latitudeMax, a.latitude); |
131 |
|
bbox.latitudeMin = Math.min(bbox.latitudeMin, a.latitude); |
132 |
|
bbox.longitudeMax = Math.max(bbox.longitudeMax, a.longitude); |
133 |
|
bbox.longitudeMin = Math.min(bbox.longitudeMin, a.longitude); |
134 |
|
|
135 |
|
|
136 |
} |
} |
137 |
res.close(); |
return alleIkkeDaekkede; |
|
stmt.close(); |
|
|
|
|
|
//list.add(8700); |
|
|
|
|
|
return list; |
|
138 |
} |
} |
139 |
|
|
140 |
|
|
141 |
public Adresse[] hentDaekkedeAdresser( BoundingBox bbox) throws SQLException { |
|
142 |
String sql = "SELECT id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute " + |
|
143 |
"FROM fulddaekning.adressetabel " + |
|
144 |
"WHERE rute IS NOT NULL " + |
|
145 |
"AND latitude BETWEEN ? AND ? " + |
public List<GeoPoint> hentAlleDaekkedeAdresser() throws SQLException { |
146 |
"AND longitude BETWEEN ? AND ? " + |
if ( alleAdresser == null ) { |
147 |
"AND distributor = ? "; |
String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + |
148 |
|
"FROM fulddaekning.adressetabel a " + |
149 |
// Forward only + concur_read_only + fetchsize tvinger driver til at hente en række af gangen (bedre performance ved store result sets) |
"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " + |
150 |
// Se http://dev.mysql.com/doc/connector-j/en/connector-j-reference-implementation-notes.html |
"WHERE rute IS NOT NULL " + |
151 |
//PreparedStatement stmt = conn.prepareStatement(sql); |
"AND latitude IS NOT NULL " + |
152 |
PreparedStatement stmt = conn.prepareStatement(sql, java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY); |
"AND longitude IS NOT NULL " + |
153 |
stmt.setFetchSize(Integer.MIN_VALUE); |
"AND a.distributor = ? "; |
154 |
|
|
155 |
stmt.setDouble(1, bbox.latitudeMin); |
// Forward only + concur_read_only + fetchsize tvinger driver til at hente en række af gangen (bedre performance ved store result sets) |
156 |
stmt.setDouble(2, bbox.latitudeMax); |
// Se http://dev.mysql.com/doc/connector-j/en/connector-j-reference-implementation-notes.html |
157 |
stmt.setDouble(3, bbox.longitudeMin); |
PreparedStatement stmt = conn.prepareStatement(sql, java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY); |
158 |
stmt.setDouble(4, bbox.longitudeMax); |
stmt.setFetchSize(Integer.MIN_VALUE); |
159 |
stmt.setString(5, Lookup.distributor); |
|
160 |
|
stmt.setString(1, LookupMain.distributor); |
161 |
List<Adresse> list = hentAdresseListe( stmt ); |
|
162 |
return list.toArray( new Adresse[ list.size() ] ); |
List<Adresse> list = hentAdresseListe( stmt ); |
163 |
|
|
164 |
|
alleAdresser = new ArrayList<GeoPoint>(); |
165 |
|
alleAdresser.addAll(list); |
166 |
|
} |
167 |
|
return alleAdresser; |
168 |
} |
} |
169 |
|
|
170 |
|
|
171 |
|
|
172 |
public synchronized void gemResultat(Adresse orgAdresse, Adresse bedsteAdresse, double bedsteAfstand) throws SQLException { |
public synchronized void gemResultat(Adresse orgAdresse, Adresse bedsteAdresse, double bedsteAfstand) throws SQLException { |
173 |
/*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, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+ |
176 |
PreparedStatement saveStmt = conn.prepareStatement(sql);*/ |
PreparedStatement saveStmt = conn.prepareStatement(sql);*/ |
177 |
|
|
178 |
saveStmt.setInt(1, orgAdresse.id); |
saveStmt.setInt(1, orgAdresse.id); |
179 |
saveStmt.setInt(2, orgAdresse.postnr); |
saveStmt.setShort(2, orgAdresse.postnr); |
180 |
saveStmt.setString(3, orgAdresse.adresse); |
saveStmt.setString(3, orgAdresse.adresse); |
181 |
saveStmt.setInt(4, orgAdresse.gadeid); |
saveStmt.setInt(4, orgAdresse.gadeid); |
182 |
saveStmt.setInt(5, orgAdresse.husnr); |
saveStmt.setShort(5, orgAdresse.husnr); |
183 |
saveStmt.setString(6, orgAdresse.husnrbogstav); |
saveStmt.setString(6, orgAdresse.husnrbogstav); |
184 |
saveStmt.setDouble(7, orgAdresse.latitude); |
saveStmt.setDouble(7, orgAdresse.latitude); |
185 |
saveStmt.setDouble(8, orgAdresse.longitude); |
saveStmt.setDouble(8, orgAdresse.longitude); |
187 |
|
|
188 |
|
|
189 |
saveStmt.setInt(10, bedsteAdresse.id); |
saveStmt.setInt(10, bedsteAdresse.id); |
190 |
saveStmt.setInt(11, bedsteAdresse.postnr); |
saveStmt.setShort(11, bedsteAdresse.postnr); |
191 |
saveStmt.setString(12, bedsteAdresse.adresse); |
saveStmt.setString(12, bedsteAdresse.adresse); |
192 |
saveStmt.setInt(13, bedsteAdresse.gadeid); |
saveStmt.setInt(13, bedsteAdresse.gadeid); |
193 |
saveStmt.setInt(14, bedsteAdresse.husnr); |
saveStmt.setShort(14, bedsteAdresse.husnr); |
194 |
saveStmt.setString(15, bedsteAdresse.husnrbogstav); |
saveStmt.setString(15, bedsteAdresse.husnrbogstav); |
195 |
saveStmt.setDouble(16, bedsteAdresse.latitude); |
saveStmt.setDouble(16, bedsteAdresse.latitude); |
196 |
saveStmt.setDouble(17, bedsteAdresse.longitude); |
saveStmt.setDouble(17, bedsteAdresse.longitude); |
198 |
|
|
199 |
saveStmt.setDouble(19, bedsteAfstand); |
saveStmt.setDouble(19, bedsteAfstand); |
200 |
|
|
201 |
saveStmt.executeUpdate(); |
saveStmt.addBatch(); |
202 |
saveStmt.clearParameters(); |
batchCount++; |
203 |
|
if (batchCount >= 1000) { |
204 |
|
saveStmt.executeBatch(); |
205 |
|
batchCount = 0; |
206 |
|
} |
207 |
|
//saveStmt.executeUpdate(); |
208 |
|
//saveStmt.clearParameters(); |
209 |
|
|
210 |
//saveStmt.close(); |
//saveStmt.close(); |
211 |
|
} |
212 |
|
|
213 |
|
public synchronized void saveBatch() throws SQLException{ |
214 |
|
saveStmt.executeBatch(); |
215 |
|
batchCount = 0; |
216 |
} |
} |
217 |
|
|
218 |
|
|
219 |
|
|
220 |
protected ArrayList<Adresse> hentAdresseListe(PreparedStatement stmt) throws SQLException{ |
protected ArrayList<Adresse> hentAdresseListe(PreparedStatement stmt) throws SQLException{ |
221 |
ArrayList<Adresse> list = new ArrayList<Adresse>( 30000 ); |
ArrayList<Adresse> list = new ArrayList<Adresse>( 1000000 ); |
222 |
|
|
223 |
//logger.info("Starting query"); |
//logger.info("Starting query"); |
224 |
ResultSet res = stmt.executeQuery(); |
ResultSet res = stmt.executeQuery(); |
225 |
//logger.info("Starting exec query done"); |
//logger.info("Starting exec query done"); |
226 |
|
|
227 |
while (res.next()) { |
while (res.next()) { |
228 |
Adresse adr = new Adresse(); |
|
229 |
adr.id = res.getInt("id"); |
double latitude = res.getDouble(7); |
230 |
adr.postnr = res.getInt("postnr"); |
double longitude = res.getDouble(8); |
231 |
adr.adresse = res.getString("adresse"); |
|
232 |
adr.gadeid = res.getInt("gadeid"); |
|
233 |
adr.husnr = res.getInt("husnr"); |
Adresse adr = new Adresse(latitude,longitude); |
234 |
adr.husnrbogstav = res.getString("husnrbogstav"); |
|
235 |
adr.latitude = res.getDouble("latitude"); |
adr.id = res.getInt(1); |
236 |
adr.longitude = res.getDouble("longitude"); |
adr.postnr = res.getShort(2); |
237 |
adr.rute = res.getString("rute"); |
adr.adresse = res.getString(3); |
238 |
|
adr.gadeid = res.getInt(4); |
239 |
|
adr.husnr = res.getShort(5); |
240 |
|
adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) ); |
241 |
|
//adr.latitude = res.getDouble(7); |
242 |
|
//adr.longitude = res.getDouble(8); |
243 |
|
adr.rute = ruteCache.getInstance( res.getString(9) ); |
244 |
|
adr.ho = res.getShort(10); |
245 |
|
|
246 |
list.add(adr); |
list.add(adr); |
247 |
|
|
268 |
connectionProps.put("user", db_user); |
connectionProps.put("user", db_user); |
269 |
connectionProps.put("password", db_pass); |
connectionProps.put("password", db_pass); |
270 |
|
|
271 |
|
//For debug output, tilføj denne til JDBC url'en: &profileSQL=true |
272 |
conn = DriverManager.getConnection( |
conn = DriverManager.getConnection( |
273 |
"jdbc:mysql://" + |
"jdbc:mysql://" + |
274 |
db_host + |
db_host + |
275 |
":3306/", |
":3306/?rewriteBatchedStatements=true", |
276 |
connectionProps); |
connectionProps); |
277 |
logger.info("Connected to database"); |
logger.info("Connected to database"); |
278 |
return conn; |
return conn; |
279 |
} |
} |
280 |
|
|
281 |
|
|
282 |
|
// ////////////////////////////////////////////////////////////////// |
283 |
|
|
284 |
|
/* |
285 |
|
public Queue<Adresse> hentIkkedaekkedeAdresserCache(short postnr) { |
286 |
|
List<Adresse> postListe = ikkeDaekkedePrPost.get(postnr); |
287 |
|
|
288 |
|
return new ConcurrentLinkedQueue<Adresse>(postListe); |
289 |
|
} |
290 |
|
|
291 |
|
public Adresse[] hentDaekkedeAdresserCache( BoundingBox bbox, Adresse adresseListe[] ) { |
292 |
|
long start = System.currentTimeMillis(); |
293 |
|
ArrayList<Adresse> list = new ArrayList<Adresse>(); |
294 |
|
for (Adresse a : adresseListe) { |
295 |
|
if ( a.latitude > bbox.latitudeMin && a.latitude< bbox.latitudeMax && a.longitude> bbox.longitudeMin && a.longitude < bbox.longitudeMax) { |
296 |
|
list.add(a); |
297 |
|
} |
298 |
|
} |
299 |
|
long stop = System.currentTimeMillis(); |
300 |
|
logger.info("Elapsed cache: " + (stop - start)); |
301 |
|
return list.toArray( new Adresse[ list.size() ] ); |
302 |
|
} |
303 |
|
|
304 |
|
|
305 |
|
/*public Adresse[] hentDaekkedeAdresserCache( BoundingBox bbox) { |
306 |
|
return hentDaekkedeAdresserCache(bbox, alleAdresser); |
307 |
|
}*/ |
308 |
|
|
309 |
|
/* |
310 |
|
@Deprecated |
311 |
|
private BoundingBox getBoundingboxFromDb_old(String postnr) throws SQLException { |
312 |
|
String minPostnr = postnr.replace('x', '0'); |
313 |
|
String maxPostnr = postnr.replace('x', '9'); |
314 |
|
|
315 |
|
String sql = |
316 |
|
"SELECT max(latitude) latmax, min(latitude) latmin, max(longitude) lngmax,min(longitude) lngmin " + |
317 |
|
"FROM fulddaekning.adressetabel WHERE postnr BETWEEN ? and ? and rute is null;"; |
318 |
|
|
319 |
|
PreparedStatement stmt = conn.prepareStatement(sql); |
320 |
|
stmt.setString(1, minPostnr); |
321 |
|
stmt.setString(2, maxPostnr); |
322 |
|
|
323 |
|
ResultSet res = stmt.executeQuery(); |
324 |
|
res.next(); //query returnerer altid 1 række |
325 |
|
|
326 |
|
BoundingBox bbox = new BoundingBox(); |
327 |
|
bbox.latitudeMax = res.getDouble("latmax"); |
328 |
|
bbox.latitudeMin = res.getDouble("latmin"); |
329 |
|
bbox.longitudeMax = res.getDouble("lngmax"); |
330 |
|
bbox.longitudeMin = res.getDouble("lngmin"); |
331 |
|
|
332 |
|
res.close(); |
333 |
|
stmt.close(); |
334 |
|
|
335 |
|
return bbox; |
336 |
|
} |
337 |
|
|
338 |
|
@Deprecated |
339 |
|
public Adresse[] hentDaekkedeAdresser_old( BoundingBox bbox) throws SQLException { |
340 |
|
long start = System.currentTimeMillis(); |
341 |
|
String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + |
342 |
|
"FROM fulddaekning.adressetabel a " + |
343 |
|
"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " + |
344 |
|
"WHERE rute IS NOT NULL " + |
345 |
|
"AND latitude BETWEEN ? AND ? " + |
346 |
|
"AND longitude BETWEEN ? AND ? " + |
347 |
|
"AND a.distributor = ? "; |
348 |
|
|
349 |
|
// Forward only + concur_read_only + fetchsize tvinger driver til at hente en række af gangen (bedre performance ved store result sets) |
350 |
|
// Se http://dev.mysql.com/doc/connector-j/en/connector-j-reference-implementation-notes.html |
351 |
|
//PreparedStatement stmt = conn.prepareStatement(sql); |
352 |
|
PreparedStatement stmt = conn.prepareStatement(sql, java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY); |
353 |
|
stmt.setFetchSize(Integer.MIN_VALUE); |
354 |
|
|
355 |
|
stmt.setDouble(1, bbox.latitudeMin); |
356 |
|
stmt.setDouble(2, bbox.latitudeMax); |
357 |
|
stmt.setDouble(3, bbox.longitudeMin); |
358 |
|
stmt.setDouble(4, bbox.longitudeMax); |
359 |
|
stmt.setString(5, LookupMain.distributor); |
360 |
|
|
361 |
|
List<Adresse> list = hentAdresseListe( stmt ); |
362 |
|
long stop = System.currentTimeMillis(); |
363 |
|
logger.info("Elapsed DB: " + (stop - start)); |
364 |
|
return list.toArray( new Adresse[ list.size() ] ); |
365 |
|
} |
366 |
|
|
367 |
|
@Deprecated |
368 |
|
public Queue<Adresse> hentIkkedaekkedeAdresser_old(String postnr) throws SQLException { |
369 |
|
|
370 |
|
String minPostnr = postnr.replace('x', '0'); |
371 |
|
String maxPostnr = postnr.replace('x', '9'); |
372 |
|
|
373 |
|
ConcurrentLinkedQueue<Adresse> queue = new ConcurrentLinkedQueue<Adresse>(); |
374 |
|
|
375 |
|
String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + |
376 |
|
"FROM fulddaekning.adressetabel a " + |
377 |
|
"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " + |
378 |
|
"WHERE rute IS NULL " + //Ingen dækning |
379 |
|
"AND a.postnr BETWEEN ? AND ? " + |
380 |
|
"AND latitude IS NOT NULL " + |
381 |
|
"AND longitude IS NOT NULL " + |
382 |
|
"AND gadeid IS NOT NULL " + |
383 |
|
"AND (a.distributor IS NULL OR a.distributor<>'LUKKET') "; |
384 |
|
PreparedStatement stmt = conn.prepareStatement(sql); |
385 |
|
stmt.setString(1, minPostnr); |
386 |
|
stmt.setString(2, maxPostnr); |
387 |
|
|
388 |
|
queue.addAll( hentAdresseListe( stmt ) ); |
389 |
|
return queue; |
390 |
|
} |
391 |
|
|
392 |
|
@Deprecated |
393 |
|
public List<String> hentPostnumre_old() throws SQLException { |
394 |
|
ArrayList<String> list = new ArrayList<String>(); |
395 |
|
|
396 |
|
Constants consts = Constants.getInstance(); |
397 |
|
|
398 |
|
/* |
399 |
|
String sql = "SELECT postnr " + |
400 |
|
"FROM fulddaekning.adressetabel " + |
401 |
|
"WHERE postnr BETWEEN ? AND ? " + |
402 |
|
"AND rute is null " + // Træk kun liste på postnumre hvor der er ikke-dækkede adresser |
403 |
|
"GROUP BY postnr " + |
404 |
|
"ORDER by postnr"; |
405 |
|
* / |
406 |
|
|
407 |
|
|
408 |
|
String sql = "SELECT rpad(left(postnr,?),'4', 'x') as postnr2 " + |
409 |
|
"FROM fulddaekning.adressetabel " + |
410 |
|
"WHERE postnr BETWEEN ? AND ? " + |
411 |
|
"AND rute is null " + // Trae kun liste paa postnumre hvor der er ikke-daekede adresser |
412 |
|
"AND (postnr NOT BETWEEN 3900 and 3999) " + //Skip alle groenlandske postnumre |
413 |
|
"GROUP BY postnr2 " + |
414 |
|
"ORDER by postnr2 "; |
415 |
|
|
416 |
|
|
417 |
|
|
418 |
|
PreparedStatement stmt = conn.prepareStatement(sql); |
419 |
|
//stmt.setString(1, Lookup.distributor ); |
420 |
|
|
421 |
|
stmt.setInt(1, consts.getPostnrGroup() ); |
422 |
|
|
423 |
|
stmt.setInt(2, consts.getMinPostnr()); |
424 |
|
stmt.setInt(3, consts.getMaxPostnr()); |
425 |
|
ResultSet res = stmt.executeQuery(); |
426 |
|
|
427 |
|
while (res.next()) { |
428 |
|
String postnr = res.getString("postnr2"); |
429 |
|
list.add(postnr); |
430 |
|
} |
431 |
|
res.close(); |
432 |
|
stmt.close(); |
433 |
|
|
434 |
|
//list.add(8700); |
435 |
|
|
436 |
|
return list; |
437 |
|
}*/ |
438 |
|
|
439 |
|
|
440 |
} |
} |