1 |
torben |
2145 |
package dk.daoas.fulddaekning;
|
2 |
|
|
|
3 |
torben |
2585 |
import geocode.GeoPoint;
|
4 |
|
|
|
5 |
torben |
2152 |
import java.io.IOException;
|
6 |
torben |
2145 |
import java.sql.Connection;
|
7 |
torben |
2152 |
import java.sql.DriverManager;
|
8 |
torben |
2145 |
import java.sql.PreparedStatement;
|
9 |
|
|
import java.sql.ResultSet;
|
10 |
|
|
import java.sql.SQLException;
|
11 |
|
|
import java.util.ArrayList;
|
12 |
torben |
2247 |
import java.util.HashMap;
|
13 |
torben |
2145 |
import java.util.List;
|
14 |
torben |
2152 |
import java.util.Properties;
|
15 |
torben |
2328 |
import java.util.Set;
|
16 |
|
|
import java.util.TreeSet;
|
17 |
torben |
2145 |
import java.util.logging.Logger;
|
18 |
|
|
|
19 |
|
|
|
20 |
torben |
2219 |
|
21 |
torben |
2145 |
public class Database {
|
22 |
|
|
Logger logger = Logger.getLogger(Database.class.getName());
|
23 |
torben |
2151 |
|
24 |
torben |
2219 |
int batchCount = 0;
|
25 |
torben |
2151 |
|
26 |
torben |
2145 |
Connection conn;
|
27 |
|
|
PreparedStatement saveStmt;
|
28 |
torben |
2247 |
|
29 |
torben |
2585 |
List<GeoPoint> alleAdresser;
|
30 |
torben |
2328 |
Adresse alleIkkeDaekkede[];
|
31 |
torben |
2263 |
|
32 |
torben |
2328 |
|
33 |
torben |
2327 |
DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>();
|
34 |
|
|
DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>();
|
35 |
|
|
|
36 |
torben |
2575 |
Set<Short> postnumre = new TreeSet<Short>();
|
37 |
torben |
2328 |
|
38 |
torben |
2585 |
//Map<Short, List<Adresse>> ikkeDaekkedePrPost = new HashMap<Short, List<Adresse>>();
|
39 |
torben |
2328 |
|
40 |
|
|
|
41 |
torben |
2575 |
private HashMap<Short,BoundingBox> bbCache = new HashMap<Short,BoundingBox>();
|
42 |
torben |
2145 |
|
43 |
torben |
2157 |
public Database(SafeProperties conf) throws SQLException,IOException {
|
44 |
torben |
2152 |
this.conn = getConnection( conf );
|
45 |
torben |
2151 |
|
46 |
torben |
2192 |
String sql = "INSERT INTO fulddaekning.afstand_anden_rute_ny (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+
|
47 |
torben |
2151 |
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
|
48 |
torben |
2145 |
|
49 |
torben |
2150 |
saveStmt = conn.prepareStatement(sql);
|
50 |
torben |
2151 |
|
51 |
torben |
2145 |
}
|
52 |
torben |
2151 |
|
53 |
|
|
public void resetResultTable() throws SQLException {
|
54 |
torben |
2192 |
logger.info("Dropping old result table (if exists)");
|
55 |
|
|
String sql = "DROP TABLE IF EXISTS fulddaekning.afstand_anden_rute_ny";
|
56 |
torben |
2151 |
conn.createStatement().executeUpdate(sql);
|
57 |
torben |
2192 |
|
58 |
|
|
logger.info("Create new result table");
|
59 |
|
|
sql = "CREATE TABLE fulddaekning.afstand_anden_rute_ny LIKE fulddaekning.afstand_anden_rute";
|
60 |
|
|
conn.createStatement().executeUpdate(sql);
|
61 |
torben |
2151 |
}
|
62 |
torben |
2192 |
|
63 |
|
|
public void renameResultTables() throws SQLException {
|
64 |
torben |
2223 |
Constants consts = Constants.getInstance();
|
65 |
|
|
String ext = consts.getTableExtension();
|
66 |
|
|
|
67 |
torben |
2192 |
logger.info("Dropping old backup table (if exists)");
|
68 |
torben |
2223 |
String sql = "DROP TABLE IF EXISTS fulddaekning.afstand_anden_rute_old" + ext;
|
69 |
torben |
2192 |
conn.createStatement().executeUpdate(sql);
|
70 |
|
|
|
71 |
|
|
logger.info("Rename tables");
|
72 |
torben |
2224 |
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;
|
73 |
torben |
2230 |
|
74 |
|
|
logger.info("Executing: " + sql);
|
75 |
torben |
2192 |
conn.createStatement().executeUpdate(sql);
|
76 |
torben |
2247 |
}
|
77 |
|
|
|
78 |
torben |
2575 |
public BoundingBox getBoundingbox(short postnr) {
|
79 |
torben |
2247 |
BoundingBox bb = bbCache.get(postnr);
|
80 |
|
|
return bb.clone();//never return the original / cached object
|
81 |
|
|
}
|
82 |
|
|
|
83 |
|
|
|
84 |
torben |
2575 |
public Set<Short> hentPostnumreCache() {
|
85 |
torben |
2328 |
return postnumre;
|
86 |
|
|
}
|
87 |
torben |
2151 |
|
88 |
torben |
2328 |
|
89 |
torben |
2585 |
public Adresse[] hentAlleIkkedaekkedeAdresser(int minPostnr, int maxPostnr) throws SQLException {
|
90 |
torben |
2238 |
|
91 |
torben |
2328 |
logger.info("Henter alle IKKE-daekkede adresser");
|
92 |
torben |
2151 |
|
93 |
torben |
2231 |
String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " +
|
94 |
|
|
"FROM fulddaekning.adressetabel a " +
|
95 |
|
|
"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
|
96 |
torben |
2145 |
"WHERE rute IS NULL " + //Ingen dækning
|
97 |
torben |
2238 |
"AND a.postnr BETWEEN ? AND ? " +
|
98 |
torben |
2145 |
"AND latitude IS NOT NULL " +
|
99 |
|
|
"AND longitude IS NOT NULL " +
|
100 |
torben |
2235 |
"AND gadeid IS NOT NULL " +
|
101 |
|
|
"AND (a.distributor IS NULL OR a.distributor<>'LUKKET') ";
|
102 |
torben |
2145 |
PreparedStatement stmt = conn.prepareStatement(sql);
|
103 |
torben |
2328 |
stmt.setInt(1, minPostnr);
|
104 |
|
|
stmt.setInt(2, maxPostnr);
|
105 |
torben |
2151 |
|
106 |
torben |
2328 |
List<Adresse> list = hentAdresseListe( stmt );
|
107 |
|
|
alleIkkeDaekkede = list.toArray( new Adresse[ list.size() ] );
|
108 |
torben |
2203 |
|
109 |
torben |
2328 |
logger.info("Analyserer ikke-daekkede adresser");
|
110 |
torben |
2238 |
|
111 |
torben |
2328 |
for (Adresse a : alleIkkeDaekkede) {
|
112 |
|
|
|
113 |
|
|
|
114 |
|
|
BoundingBox bbox;
|
115 |
|
|
|
116 |
|
|
if (! postnumre.contains(a.postnr )) {
|
117 |
|
|
postnumre.add( a.postnr );
|
118 |
|
|
|
119 |
torben |
2585 |
bbox = new BoundingBox();
|
120 |
torben |
2328 |
|
121 |
|
|
bbCache.put( a.postnr, bbox);
|
122 |
|
|
|
123 |
|
|
} else {
|
124 |
|
|
bbox = bbCache.get( a.postnr);
|
125 |
|
|
}
|
126 |
|
|
|
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 |
torben |
2145 |
}
|
134 |
torben |
2585 |
return alleIkkeDaekkede;
|
135 |
torben |
2145 |
}
|
136 |
torben |
2328 |
|
137 |
torben |
2424 |
|
138 |
torben |
2225 |
|
139 |
torben |
2263 |
|
140 |
torben |
2424 |
|
141 |
|
|
|
142 |
torben |
2585 |
public List<GeoPoint> hentAlleDaekkedeAdresser() throws SQLException {
|
143 |
torben |
2263 |
if ( alleAdresser == null ) {
|
144 |
|
|
String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " +
|
145 |
|
|
"FROM fulddaekning.adressetabel a " +
|
146 |
|
|
"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
|
147 |
|
|
"WHERE rute IS NOT NULL " +
|
148 |
|
|
"AND latitude IS NOT NULL " +
|
149 |
|
|
"AND longitude IS NOT NULL " +
|
150 |
|
|
"AND a.distributor = ? ";
|
151 |
|
|
|
152 |
|
|
// Forward only + concur_read_only + fetchsize tvinger driver til at hente en række af gangen (bedre performance ved store result sets)
|
153 |
|
|
// 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.setFetchSize(Integer.MIN_VALUE);
|
156 |
|
|
|
157 |
|
|
stmt.setString(1, LookupMain.distributor);
|
158 |
|
|
|
159 |
|
|
List<Adresse> list = hentAdresseListe( stmt );
|
160 |
torben |
2585 |
|
161 |
|
|
alleAdresser = new ArrayList<GeoPoint>();
|
162 |
|
|
alleAdresser.addAll(list);
|
163 |
torben |
2263 |
}
|
164 |
|
|
return alleAdresser;
|
165 |
torben |
2145 |
}
|
166 |
torben |
2225 |
|
167 |
|
|
|
168 |
torben |
2145 |
|
169 |
|
|
public synchronized void gemResultat(Adresse orgAdresse, Adresse bedsteAdresse, double bedsteAfstand) throws SQLException {
|
170 |
|
|
/*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`) "+
|
171 |
|
|
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
|
172 |
torben |
2151 |
|
173 |
torben |
2145 |
PreparedStatement saveStmt = conn.prepareStatement(sql);*/
|
174 |
torben |
2151 |
|
175 |
torben |
2145 |
saveStmt.setInt(1, orgAdresse.id);
|
176 |
torben |
2575 |
saveStmt.setShort(2, orgAdresse.postnr);
|
177 |
torben |
2145 |
saveStmt.setString(3, orgAdresse.adresse);
|
178 |
|
|
saveStmt.setInt(4, orgAdresse.gadeid);
|
179 |
torben |
2575 |
saveStmt.setShort(5, orgAdresse.husnr);
|
180 |
torben |
2145 |
saveStmt.setString(6, orgAdresse.husnrbogstav);
|
181 |
|
|
saveStmt.setDouble(7, orgAdresse.latitude);
|
182 |
|
|
saveStmt.setDouble(8, orgAdresse.longitude);
|
183 |
|
|
saveStmt.setString(9, orgAdresse.rute);
|
184 |
torben |
2151 |
|
185 |
|
|
|
186 |
torben |
2145 |
saveStmt.setInt(10, bedsteAdresse.id);
|
187 |
torben |
2575 |
saveStmt.setShort(11, bedsteAdresse.postnr);
|
188 |
torben |
2145 |
saveStmt.setString(12, bedsteAdresse.adresse);
|
189 |
|
|
saveStmt.setInt(13, bedsteAdresse.gadeid);
|
190 |
torben |
2575 |
saveStmt.setShort(14, bedsteAdresse.husnr);
|
191 |
torben |
2145 |
saveStmt.setString(15, bedsteAdresse.husnrbogstav);
|
192 |
|
|
saveStmt.setDouble(16, bedsteAdresse.latitude);
|
193 |
|
|
saveStmt.setDouble(17, bedsteAdresse.longitude);
|
194 |
|
|
saveStmt.setString(18, bedsteAdresse.rute);
|
195 |
torben |
2151 |
|
196 |
torben |
2145 |
saveStmt.setDouble(19, bedsteAfstand);
|
197 |
torben |
2151 |
|
198 |
torben |
2219 |
saveStmt.addBatch();
|
199 |
|
|
batchCount++;
|
200 |
torben |
2423 |
if (batchCount >= 1000) {
|
201 |
torben |
2219 |
saveStmt.executeBatch();
|
202 |
|
|
batchCount = 0;
|
203 |
|
|
}
|
204 |
|
|
//saveStmt.executeUpdate();
|
205 |
|
|
//saveStmt.clearParameters();
|
206 |
torben |
2151 |
|
207 |
torben |
2145 |
//saveStmt.close();
|
208 |
|
|
}
|
209 |
torben |
2219 |
|
210 |
|
|
public synchronized void saveBatch() throws SQLException{
|
211 |
|
|
saveStmt.executeBatch();
|
212 |
|
|
batchCount = 0;
|
213 |
|
|
}
|
214 |
torben |
2151 |
|
215 |
|
|
|
216 |
|
|
|
217 |
torben |
2145 |
protected ArrayList<Adresse> hentAdresseListe(PreparedStatement stmt) throws SQLException{
|
218 |
torben |
2210 |
ArrayList<Adresse> list = new ArrayList<Adresse>( 1000000 );
|
219 |
torben |
2151 |
|
220 |
torben |
2145 |
//logger.info("Starting query");
|
221 |
|
|
ResultSet res = stmt.executeQuery();
|
222 |
|
|
//logger.info("Starting exec query done");
|
223 |
torben |
2151 |
|
224 |
torben |
2145 |
while (res.next()) {
|
225 |
torben |
2585 |
|
226 |
|
|
double latitude = res.getDouble(7);
|
227 |
|
|
double longitude = res.getDouble(8);
|
228 |
torben |
2261 |
|
229 |
torben |
2585 |
|
230 |
|
|
Adresse adr = new Adresse(latitude,longitude);
|
231 |
|
|
|
232 |
torben |
2261 |
adr.id = res.getInt(1);
|
233 |
torben |
2575 |
adr.postnr = res.getShort(2);
|
234 |
torben |
2261 |
adr.adresse = res.getString(3);
|
235 |
|
|
adr.gadeid = res.getInt(4);
|
236 |
torben |
2575 |
adr.husnr = res.getShort(5);
|
237 |
torben |
2327 |
adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) );
|
238 |
torben |
2585 |
//adr.latitude = res.getDouble(7);
|
239 |
|
|
//adr.longitude = res.getDouble(8);
|
240 |
torben |
2327 |
adr.rute = ruteCache.getInstance( res.getString(9) );
|
241 |
torben |
2575 |
adr.ho = res.getShort(10);
|
242 |
torben |
2151 |
|
243 |
torben |
2145 |
list.add(adr);
|
244 |
torben |
2151 |
|
245 |
torben |
2145 |
//logger.info( "Adress:" + adr);
|
246 |
|
|
}
|
247 |
torben |
2151 |
|
248 |
torben |
2145 |
res.close();
|
249 |
|
|
stmt.close();
|
250 |
torben |
2151 |
|
251 |
torben |
2145 |
return list;
|
252 |
|
|
}
|
253 |
|
|
|
254 |
torben |
2157 |
public Connection getConnection(SafeProperties conf) throws SQLException, IOException {
|
255 |
torben |
2152 |
|
256 |
torben |
2157 |
String db_host = conf.getSafeProperty("DB_HOST");
|
257 |
|
|
String db_user = conf.getSafeProperty("DB_USER");
|
258 |
|
|
String db_pass = conf.getSafeProperty("DB_PASS");
|
259 |
torben |
2145 |
|
260 |
torben |
2152 |
|
261 |
|
|
|
262 |
torben |
2151 |
|
263 |
torben |
2152 |
Connection conn = null;
|
264 |
|
|
Properties connectionProps = new Properties();
|
265 |
|
|
connectionProps.put("user", db_user);
|
266 |
|
|
connectionProps.put("password", db_pass);
|
267 |
|
|
|
268 |
torben |
2220 |
//For debug output, tilføj denne til JDBC url'en: &profileSQL=true
|
269 |
torben |
2152 |
conn = DriverManager.getConnection(
|
270 |
|
|
"jdbc:mysql://" +
|
271 |
|
|
db_host +
|
272 |
torben |
2218 |
":3306/?rewriteBatchedStatements=true",
|
273 |
torben |
2152 |
connectionProps);
|
274 |
|
|
logger.info("Connected to database");
|
275 |
|
|
return conn;
|
276 |
|
|
}
|
277 |
|
|
|
278 |
torben |
2328 |
|
279 |
|
|
// //////////////////////////////////////////////////////////////////
|
280 |
torben |
2585 |
|
281 |
torben |
2330 |
/*
|
282 |
torben |
2585 |
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 |
torben |
2328 |
@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 |
torben |
2330 |
* /
|
403 |
torben |
2328 |
|
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 |
torben |
2330 |
}*/
|
435 |
torben |
2328 |
|
436 |
|
|
|
437 |
torben |
2145 |
}
|