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,korelisteloerdag,ruteloerdag,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 |
54 |
Address a = new Address(); |
Address a = new Address(); |
55 |
a.id = res.getInt(1); |
a.id = res.getInt(1); |
56 |
a.vejnavn = vejnavnCache.getInstance( res.getString(2) ); |
a.vejnavn = vejnavnCache.getInstance( res.getString(2) ); |
57 |
a.husnr = res.getInt(3); |
a.husnr = (short) res.getInt(3); |
58 |
a.husnrbogstav = husnrbogstavCache.getInstance( res.getString(4) ); |
a.husnrbogstav = husnrbogstavCache.getInstance( res.getString(4) ); |
59 |
a.kommunekode = res.getInt(5); |
a.kommunekode = (short) res.getInt(5); |
60 |
a.vejkode = res.getInt(6); |
a.vejkode = (short)res.getInt(6); |
61 |
a.postnr = 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 = 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 = res.getDouble(13); |
a.korelisteLordag = korelisteCache.getInstance( res.getString(13) ); |
69 |
a.longitude = res.getDouble(14); |
a.ruteLordag = ruteCache.getInstance( res.getString(14) ); |
70 |
|
a.korelisteSondag = korelisteCache.getInstance( res.getString(15) ); |
71 |
|
a.ruteSondag = ruteCache.getInstance( res.getString(16) ); |
72 |
|
|
73 |
|
a.latitude = (float) res.getDouble(17); |
74 |
|
a.longitude = (float) res.getDouble(18); |
75 |
|
|
76 |
//a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
//a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
77 |
|
|
114 |
while (res.next()) { |
while (res.next()) { |
115 |
|
|
116 |
AliasBean ab = new AliasBean(); |
AliasBean ab = new AliasBean(); |
117 |
ab.postnr = res.getInt(1); |
ab.postnr = res.getShort(1); |
118 |
ab.vejnavn = vejCache.getInstance( res.getString(2) ); |
ab.vejnavn = vejCache.getInstance( res.getString(2) ); |
119 |
ab.aliasVejnavn = vejCache.getInstance( res.getString(3) ); |
ab.aliasVejnavn = vejCache.getInstance( res.getString(3) ); |
120 |
|
|
167 |
ExtendedBean eb = new ExtendedBean(); |
ExtendedBean eb = new ExtendedBean(); |
168 |
eb.orgId = res.getInt(1); |
eb.orgId = res.getInt(1); |
169 |
eb.targetId = res.getInt(2); |
eb.targetId = res.getInt(2); |
170 |
eb.afstand = res.getDouble(3); |
eb.afstand = (float) res.getDouble(3); |
171 |
eb.transport = transportCache.getInstance(res.getString(4)); |
eb.transport = transportCache.getInstance(res.getString(4)); |
172 |
|
|
173 |
list.add(eb); |
list.add(eb); |
181 |
} |
} |
182 |
} |
} |
183 |
|
|
184 |
public static Map<Integer,HundredePctBean> get100PctList() throws SQLException { |
public static Map<Short,HundredePctBean> get100PctList() throws SQLException { |
185 |
String sql = "SELECT postnr,UPPER(distributor) as distributor,rute,koreliste,dbkbane " + |
String sql = "SELECT postnr,UPPER(distributor) as distributor,rute,koreliste,dbkbane " + |
186 |
"FROM bogleveringer.adresser_udenfor_daekning"; |
"FROM bogleveringer.adresser_udenfor_daekning"; |
187 |
|
|
190 |
) { |
) { |
191 |
ResultSet res = stmt.executeQuery(sql); |
ResultSet res = stmt.executeQuery(sql); |
192 |
|
|
193 |
Map<Integer,HundredePctBean> map = new HashMap<Integer,HundredePctBean>(); |
Map<Short, HundredePctBean> map = new HashMap<Short,HundredePctBean>(); |
194 |
|
|
195 |
DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>(); |
196 |
|
|
198 |
|
|
199 |
|
|
200 |
HundredePctBean bean = new HundredePctBean(); |
HundredePctBean bean = new HundredePctBean(); |
201 |
bean.postnr = res.getInt(1); |
bean.postnr = (short) res.getInt(1); |
202 |
bean.distributor = distributorCache.getInstance(res.getString(2)); |
bean.distributor = distributorCache.getInstance(res.getString(2)); |
203 |
bean.rute = res.getString(3); |
bean.rute = res.getString(3); |
204 |
bean.koreliste = res.getString(4); |
bean.koreliste = res.getString(4); |
205 |
bean.dbkBane = res.getInt(5); |
bean.dbkBane = (short)res.getInt(5); |
206 |
|
|
207 |
map.put(bean.postnr, bean); |
map.put(bean.postnr, bean); |
208 |
} |
} |
217 |
} |
} |
218 |
|
|
219 |
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 { |
220 |
|
String setVar = "set sql_mode = 'NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' "; |
221 |
|
|
222 |
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) " + |
223 |
"VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW() )"; |
"VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW() )"; |
224 |
|
|
225 |
|
|
226 |
|
|
227 |
try ( Connection conn = DBConnection.getConnection(); |
try ( Connection conn = DBConnection.getConnection(); |
228 |
|
Statement setStmt = conn.createStatement(); |
229 |
PreparedStatement stmt = conn.prepareStatement(sql); |
PreparedStatement stmt = conn.prepareStatement(sql); |
230 |
) { |
) { |
231 |
|
|
232 |
|
setStmt.execute(setVar); |
233 |
|
|
234 |
|
|
235 |
stmt.setInt( 1, safeInt(postnr) ); |
stmt.setInt( 1, safeInt(postnr) ); |
236 |
stmt.setString( 2, adresse); |
stmt.setString( 2, adresse); |
237 |
stmt.setString( 3, result.splitResult.vej); |
stmt.setString( 3, result.splitResult.vej); |
252 |
/* |
/* |
253 |
* Bruges til at sammenligne gammel og ny adresse service - kan fjernes engang efter at vi er skiftet til ny service |
* Bruges til at sammenligne gammel og ny adresse service - kan fjernes engang efter at vi er skiftet til ny service |
254 |
*/ |
*/ |
255 |
|
@Deprecated |
256 |
public static List<LoggedAddress> getLoggedAdresses(int antaldage) throws SQLException { |
public static List<LoggedAddress> getLoggedAdresses(int antaldage) throws SQLException { |
257 |
String sql = "select postnr,adresse,status from logs.hentruteinformation where indlast>=date_sub(curdate(), interval " + antaldage + " day) " + |
String sql = "select postnr,adresse,status from logs.hentruteinformation where indlast>=date_sub(curdate(), interval " + antaldage + " day) " + |
258 |
"and status IN (10,11,12) " + |
"and status IN (10,11,12) " + |