--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java 2016/01/25 21:43:59 2844 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java 2016/01/26 08:21:22 2845 @@ -19,6 +19,22 @@ /* * TODO: håndtering af entry dupletter ! (+ rapportering af dem) + * TODO: ajourføring af DBKbane +DAO: +UPDATE fulddaekning.adressetabel +SET dbkbane = case + when substr(korelisteMa,1,2) IN ('07','10','11','12','14','15','16','18','19','20') then 205 #DAO-BRA + when substr(korelisteMa,1,2) BETWEEN 24 and 30 then 201 #DAO-Ovrige + else 202 #dao syd (52-99= +END +WHERE distributor='DAO' +AND ruteMa is not null; + +FD: Altid 200 +NS: Altid 204 +BK: 195,196,197,198 + + */ public class AddressManager { @@ -157,11 +173,11 @@ if (addr.state == AddressState.NOT_CHANGED) { continue; } - if (addr.stateMan == AddressState.NOT_CHANGED || addr.stateMan == AddressState.CREATED) { + /*if (addr.stateMan == AddressState.NOT_CHANGED || addr.stateMan == AddressState.CREATED) { continue; - } + }*/ - if (addr.stateMan != AddressState.MODIFIED ) { + if (addr.stateMan != AddressState.OPENED ) { continue; } @@ -190,7 +206,10 @@ } DatabaseLayerImplementation db = new DatabaseLayerImplementation(); + db.updateAddresses(updates); + + System.out.println("Writeback done: elapsed " + timer.getElapsed() + "ms."); } @@ -275,15 +294,7 @@ return; } - addr.visited = true; - if (addr.state == AddressState.NOT_CHANGED) { - if (addr.distributor == null) { - addr.state = AddressState.OPENED; - addr.distributor = entry.distributor; - } else { - addr.state = AddressState.MODIFIED; - } - } + if (entry.ugedage.mandag) { addr.visitedMan = true; @@ -403,7 +414,23 @@ } } } - + + + + addr.visited = true; + if (addr.state == AddressState.NOT_CHANGED) { + if (addr.distributor == null) { + addr.state = AddressState.OPENED; + addr.distributor = entry.distributor; + } else { + if (addr.stateMan != AddressState.NOT_CHANGED || addr.stateTir != AddressState.NOT_CHANGED + || addr.stateOns != AddressState.NOT_CHANGED || addr.stateTor != AddressState.NOT_CHANGED + || addr.stateFre != AddressState.NOT_CHANGED || addr.stateLor != AddressState.NOT_CHANGED || addr.stateSon != AddressState.NOT_CHANGED ){ + + addr.state = AddressState.MODIFIED; + } + } + } }