| @@ -34,6 +34,7 @@ import org.springframework.stereotype.Component; | |||||
| import java.io.File; | import java.io.File; | ||||
| import java.io.OutputStream; | import java.io.OutputStream; | ||||
| import java.util.ArrayList; | |||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.concurrent.TimeUnit; | import java.util.concurrent.TimeUnit; | ||||
| @@ -264,6 +265,7 @@ public class AsyncTask { | |||||
| List<MerchantPoiTNew> successList = datalist.getList(); | List<MerchantPoiTNew> successList = datalist.getList(); | ||||
| //List<MerchantPoiTNew> failList = datalist.getFailList(); | //List<MerchantPoiTNew> failList = datalist.getFailList(); | ||||
| if(null != successList && successList.size() > 0 ) { | if(null != successList && successList.size() > 0 ) { | ||||
| List<MerchantPoiTNew> tlist = new ArrayList<MerchantPoiTNew>(); | |||||
| try { | try { | ||||
| successList.parallelStream().forEach(poiBase -> { | successList.parallelStream().forEach(poiBase -> { | ||||
| try { | try { | ||||
| @@ -282,16 +284,23 @@ public class AsyncTask { | |||||
| }else { | }else { | ||||
| poiBase.setGaodeRemark("未匹配到信息"); | poiBase.setGaodeRemark("未匹配到信息"); | ||||
| } | } | ||||
| tlist.add(poiBase); | |||||
| } catch (UnknownSessionException ue) { | } catch (UnknownSessionException ue) { | ||||
| logger.error("session :"+ue.getMessage()); | logger.error("session :"+ue.getMessage()); | ||||
| } | } | ||||
| }); | }); | ||||
| if (tlist.size() <= 0 ) { | |||||
| MerchantPoiTNew t = new MerchantPoiTNew(); | |||||
| t.setPoiId("adafdasdf"); | |||||
| t.setGaodeRemark("怎么没有啊"); | |||||
| tlist.add(t); | |||||
| } | |||||
| ExportParams exportParams = new ExportParams(); | ExportParams exportParams = new ExportParams(); | ||||
| exportParams.setCreateHeadRows(true); | exportParams.setCreateHeadRows(true); | ||||
| exportParams.setExclusions(headers); | exportParams.setExclusions(headers); | ||||
| Workbook workBook = ExcelExportUtil.exportExcel(exportParams, MerchantPoiTNew.class, successList); | |||||
| Workbook workBook = ExcelExportUtil.exportExcel(exportParams, MerchantPoiTNew.class, tlist); | |||||
| exportExcel(request, response, workBook, "POI匹配模版-高德.xls"); | exportExcel(request, response, workBook, "POI匹配模版-高德.xls"); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("更新地理信息失败:"+e.getMessage(),e); | logger.error("更新地理信息失败:"+e.getMessage(),e); | ||||