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