10 |
import java.util.List; |
import java.util.List; |
11 |
import java.util.Map; |
import java.util.Map; |
12 |
|
|
13 |
import dk.daoas.daoadresseservice.DaekningsType; |
import dk.daoas.daoadresseservice.AddressUtils; |
14 |
import dk.daoas.daoadresseservice.beans.Address; |
import dk.daoas.daoadresseservice.beans.Address; |
15 |
import dk.daoas.daoadresseservice.beans.AliasBean; |
import dk.daoas.daoadresseservice.beans.AliasBean; |
16 |
import dk.daoas.daoadresseservice.beans.ExtendedBean; |
import dk.daoas.daoadresseservice.beans.ExtendedBean; |
17 |
import dk.daoas.daoadresseservice.beans.HundredePctBean; |
import dk.daoas.daoadresseservice.beans.HundredePctBean; |
|
import dk.daoas.daoadresseservice.beans.LoggedAddress; |
|
18 |
import dk.daoas.daoadresseservice.beans.SearchResult; |
import dk.daoas.daoadresseservice.beans.SearchResult; |
19 |
import dk.daoas.daoadresseservice.util.DeduplicateHelper; |
import dk.daoas.daoadresseservice.util.DeduplicateHelper; |
20 |
|
|
74 |
|
|
75 |
//a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
//a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
76 |
|
|
77 |
if (a.rute != null && a.rute.length()> 0) { |
|
78 |
a.daekningsType = DaekningsType.DAEKNING_DIREKTE; |
//Ajourfør adresse objectets dækningstype |
79 |
} else { |
AddressUtils.updateDaekningstype(a); |
|
a.daekningsType = DaekningsType.DAEKNING_IKKEDAEKKET; |
|
|
} |
|
80 |
|
|
81 |
list.add(a); |
list.add(a); |
82 |
} |
} |
83 |
res.close(); |
res.close(); |
|
stmt.close(); |
|
|
conn.close(); |
|
84 |
|
|
85 |
System.out.println("Loaded " + list.size() + " adresses"); |
System.out.println("Loaded " + list.size() + " adresses"); |
86 |
|
|
215 |
} |
} |
216 |
|
|
217 |
@Override |
@Override |
218 |
public void saveRequestLog(String brugerid, String postnr, String adresse, SearchResult result) throws SQLException { |
public void saveRequestLog(String brugerid, String postnr, String adresse, String omdelingsdag, SearchResult result) throws SQLException { |
219 |
String setVar = "set sql_mode = 'NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' "; |
String setVar = "set sql_mode = 'NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' "; |
220 |
|
|
221 |
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, OmdelingDag, indlast) " + |
222 |
"VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW() )"; |
"VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW() )"; |
223 |
|
|
224 |
|
|
225 |
|
|
240 |
stmt.setString( 7, result.splitResult.etage); |
stmt.setString( 7, result.splitResult.etage); |
241 |
stmt.setString( 8, result.splitResult.lejlighed); |
stmt.setString( 8, result.splitResult.lejlighed); |
242 |
stmt.setString( 9, result.splitResult.resten); |
stmt.setString( 9, result.splitResult.resten); |
243 |
stmt.setString(10, brugerid); |
stmt.setString(10, brugerid); |
244 |
stmt.setInt(11, getStatusInt(result.status) ); |
stmt.setInt(11, getStatusInt(result.status) ); |
245 |
|
stmt.setString(12, omdelingsdag); |
246 |
|
|
247 |
stmt.executeUpdate(); |
stmt.executeUpdate(); |
248 |
|
|
249 |
} |
} |
250 |
} |
} |
251 |
|
|
|
/* |
|
|
* Bruges til at sammenligne gammel og ny adresse service - kan fjernes engang efter at vi er skiftet til ny service |
|
|
*/ |
|
|
@Deprecated |
|
|
public static List<LoggedAddress> getLoggedAdresses(int antaldage) throws SQLException { |
|
|
String sql = "select postnr,adresse,status from logs.hentruteinformation where indlast>=date_sub(curdate(), interval " + antaldage + " day) " + |
|
|
"and status IN (10,11,12) " + |
|
|
"group by postnr,adresse " |
|
|
; |
|
|
|
|
|
try ( Connection conn = DBConnection.getConnection(); |
|
|
Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY); |
|
|
) { |
|
|
|
|
|
|
|
|
stmt.setFetchSize(Integer.MIN_VALUE); |
|
|
|
|
|
ResultSet res = stmt.executeQuery(sql); |
|
|
|
|
|
List<LoggedAddress> result = new ArrayList<LoggedAddress>(); |
|
|
|
|
|
while (res.next()) { |
|
|
LoggedAddress a = new LoggedAddress(); |
|
|
a.postnr = res.getInt(1); |
|
|
a.adresse = res.getString(2); |
|
|
a.status = res.getInt(3); |
|
|
|
|
|
result.add(a); |
|
|
} |
|
|
|
|
|
res.close(); |
|
252 |
|
|
|
return result; |
|
|
} |
|
|
} |
|
253 |
|
|
254 |
|
|
255 |
private static int safeInt(String str) { |
private static int safeInt(String str) { |