|
@@ -6,10 +6,12 @@ import com.skyversation.poiaddr.addquery.AddressQueryEngine;
|
|
|
import com.skyversation.poiaddr.addquery.Constant;
|
|
|
import com.skyversation.poiaddr.bean.*;
|
|
|
import com.skyversation.poiaddr.config.DbConnection;
|
|
|
+import com.skyversation.poiaddr.entity.AddrBean;
|
|
|
import com.skyversation.poiaddr.service.impl.GrTableRepository;
|
|
|
import com.skyversation.poiaddr.service.impl.PgTableRepository;
|
|
|
import com.skyversation.poiaddr.service.impl.TAddressCallbackRepository;
|
|
|
import com.skyversation.poiaddr.service.impl.YyszAddressRepository;
|
|
|
+import com.skyversation.poiaddr.util.AddrSplitLmrMap;
|
|
|
import com.skyversation.poiaddr.util.MessageManage;
|
|
|
import com.skyversation.poiaddr.util.ShanghaiAddressSplitUtil;
|
|
|
import com.skyversation.poiaddr.util.SplitAddress;
|
|
@@ -356,21 +358,13 @@ public class AreaService {
|
|
|
* @param addrStr
|
|
|
*/
|
|
|
public void callBackErrorAddr(String addrStr) {
|
|
|
-// System.out.println("尝试回流无结果数据:" + addrStr);
|
|
|
- SplitAddress splitAddress = ShanghaiAddressSplitUtil.splitBestAddress(addrStr);
|
|
|
- if (splitAddress.getStatus() == 3 || splitAddress.getStatus() == -1) {
|
|
|
-// System.out.println("拒绝回流,检测到非地址");
|
|
|
- return;
|
|
|
- } else {
|
|
|
- // 查询回流列表中是否存在
|
|
|
+ AddrBean lmrAddrBean = AddrSplitLmrMap.outAddrMapInAddr(addrStr);
|
|
|
+ if (lmrAddrBean.getRule() == null || Integer.parseInt(lmrAddrBean.getRule()) > 0) {
|
|
|
if (!ScheduledTasks.callBackAllErrorAddrs.contains(addrStr)) {
|
|
|
TAddressCallback tAddressCallback = new TAddressCallback();
|
|
|
tAddressCallback.setSearchAddress(addrStr);
|
|
|
ScheduledTasks.callBackDatas.add(tAddressCallback);
|
|
|
ScheduledTasks.callBackAllErrorAddrs.add(addrStr);
|
|
|
-// System.out.println("回流成功,等待进一检查处理");
|
|
|
- } else {
|
|
|
-// System.out.println("回流列表中已存在该数据!");
|
|
|
}
|
|
|
}
|
|
|
}
|