From 721f13febc66a8f9066b7f3d6edf8116b190fb1b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 9 Sep 2021 10:04:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ImportExcelController.java | 9 +- .../service/impl/ImportExcelServiceImpl.java | 226 +++++++++--------- 2 files changed, 118 insertions(+), 117 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java index 39b46fc5..1a36d323 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java @@ -47,11 +47,10 @@ public class ImportExcelController extends BaseController { @PostMapping("/import") public void deleteList(MultipartFile file, MultipartFile file2, HttpServletResponse response, HttpServletRequest request) throws IOException { Map> mapMap=importExcelService.getExcelData(file,file2); - List errorList = importExcelService.storageExclData(mapMap); -// ResponseMessage responseMessage=new ResponseMessage(); -// responseMessage.setMessage(mapMap.toString()); -// responseMessage.isOk(); - + List errorList = importExcelService.storageExclData(mapMap); +// List guonei= mapMap.get("GNBZ"); +// List haiwai = mapMap.get("HWBZ"); +// List qibiao = mapMap.get("QYBZ"); OutputStream os = null; Workbook workbook = null; try { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java index c6635b30..b5db3b55 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java @@ -75,16 +75,19 @@ public class ImportExcelServiceImpl extends ServiceImpl> getExcelData(MultipartFile file, MultipartFile file2) { + List dates=new ArrayList<>(); + for(int i=1669;i<2023;i++){ + dates.add("-"+i); + dates.add("—"+i); + dates.add("- "+i); + dates.add("— "+i); + } + if (file == null || file.getSize() == 0) { log.error("文件上传错误，重新上传"); } @@ -133,7 +136,7 @@ public class ImportExcelServiceImpl extends ServiceImpl { //判断是否是正确的数据 String[] as = items.split(","); - if (!inDate(as[0])) { + if (!inDate(as[0],dates)) { ImportDto importDto = getImportDto(as); error.add(importDto); middle.put(as[0].trim(), "error-"+error.size()); @@ -176,8 +179,7 @@ public class ImportExcelServiceImpl extends ServiceImpl dates = new ArrayList<>(Arrays.asList(DATE.split(","))); + private boolean inDate(String as,List dates) { if (null != as && !"".equals(as)) { for (String s : dates) { if (s.equals(as.trim())) { @@ -296,48 +298,48 @@ public class ImportExcelServiceImpl extends ServiceImpl standSaveWrapper = new QueryWrapper<>(); - standSaveWrapper - .eq("STAND_SORT",sarStandardsInfo.getStandSort()) - .eq("STAND_NUMBER",sarStandardsInfo.getStandNumber()) - .eq("STAND_YEAR",sarStandardsInfo.getStandYear()); - - SarStandardsInfo one = sarStandardsInfoService.getOne(standSaveWrapper); - if (one!=null){ - sarStandardsInfo.setId(one.getId()); - - sarStandardsInfoService.update(sarStandardsInfo,standSaveWrapper); - QueryWrapper standAttrWrapper = new QueryWrapper<>(); - standAttrWrapper.eq("STAND_ID",one.getId()); - - sarStandAttrInfo.setStandId(one.getId()); - sarStandAttrInfoService.update(sarStandAttrInfo,standAttrWrapper); - }else { - sarStandardsInfoService.save(sarStandardsInfo); - String field="ID,STAND_ID,VALID_FLAG,DTBJH,SSRQ"; - String value="\'"+sarStandAttrInfo.getId()+"\'"+","+ "\'"+sarStandAttrInfo.getStandId()+"\'"+","+"\'"+"0"+"\'"; - - - if (sarStandAttrInfo.getDtbjh()!=null){ - value+=","+"\'"+sarStandAttrInfo.getDtbjh()+"\'"; - } - - if (sarStandAttrInfo.getSsrq()!=null){ - value+=","+"\'"+sarStandAttrInfo.getSsrq()+"\'"; - } - sarStandAttrInfoDao.insertStandAttr(field,value); - - - - } +// SarStandAttrInfo sarStandAttrInfo = parseImportDtoToStandAttrInfo(item, standID); +// +// sarStandardsInfo.setValidFlag("0"); +// sarStandardsInfo.setStandType("FOREIGN"); +// QueryWrapper standSaveWrapper = new QueryWrapper<>(); +// standSaveWrapper +// .eq("STAND_SORT",sarStandardsInfo.getStandSort()) +// .eq("STAND_NUMBER",sarStandardsInfo.getStandNumber()) +// .eq("STAND_YEAR",sarStandardsInfo.getStandYear()); +// +// SarStandardsInfo one = sarStandardsInfoService.getOne(standSaveWrapper); +// if (one!=null){ +// sarStandardsInfo.setId(one.getId()); +// +// sarStandardsInfoService.update(sarStandardsInfo,standSaveWrapper); +// QueryWrapper standAttrWrapper = new QueryWrapper<>(); +// standAttrWrapper.eq("STAND_ID",one.getId()); +// +// sarStandAttrInfo.setStandId(one.getId()); +// sarStandAttrInfoService.update(sarStandAttrInfo,standAttrWrapper); +// }else { +// sarStandardsInfoService.save(sarStandardsInfo); +// String field="ID,STAND_ID,VALID_FLAG,DTBJH,SSRQ"; +// String value="\'"+sarStandAttrInfo.getId()+"\'"+","+ "\'"+sarStandAttrInfo.getStandId()+"\'"+","+"\'"+"0"+"\'"; +// +// +// if (sarStandAttrInfo.getDtbjh()!=null){ +// value+=","+"\'"+sarStandAttrInfo.getDtbjh()+"\'"; +// } +// +// if (sarStandAttrInfo.getSsrq()!=null){ +// value+=","+"\'"+sarStandAttrInfo.getSsrq()+"\'"; +// } +// sarStandAttrInfoDao.insertStandAttr(field,value); +// +// +// +// } }else{ @@ -360,48 +362,48 @@ public class ImportExcelServiceImpl extends ServiceImpl standSaveWrapper = new QueryWrapper<>(); - standSaveWrapper - .eq("STAND_SORT",sarStandardsInfo.getStandSort()) - .eq("STAND_NUMBER",sarStandardsInfo.getStandNumber()) - .eq("STAND_YEAR",sarStandardsInfo.getStandYear()); - - - SarStandardsInfo one = sarStandardsInfoService.getOne(standSaveWrapper); - if (one!=null){ - sarStandardsInfo.setId(one.getId()); - sarStandardsInfoService.update(sarStandardsInfo,standSaveWrapper); - - QueryWrapper standAttrWrapper = new QueryWrapper<>(); - standAttrWrapper.eq("STAND_ID",one.getId()); - sarStandAttrInfo.setStandId(one.getId()); - sarStandAttrInfoService.update(sarStandAttrInfo,standAttrWrapper); - }else { - - - sarStandardsInfoService.save(sarStandardsInfo); - - - String field="ID,STAND_ID,VALID_FLAG,DTBJH,SSRQ"; - String value="\'"+sarStandAttrInfo.getId()+"\'"+","+"\'"+sarStandAttrInfo.getStandId()+"\'"+","+"\'"+"0"+"\'"; - - - if (sarStandAttrInfo.getDtbjh()!=null){ - value+=","+"\'"+sarStandAttrInfo.getDtbjh()+"\'"; - } - - if (sarStandAttrInfo.getSsrq()!=null){ - value+=","+"\'"+sarStandAttrInfo.getSsrq()+"\'"; - } - sarStandAttrInfoDao.insertStandAttr(field,value); - - } +// SarStandAttrInfo sarStandAttrInfo = parseImportDtoToStandAttrInfo(item, standID); +// +// sarStandardsInfo.setValidFlag("0"); +// sarStandardsInfo.setStandType("INLAND"); +// +// +// QueryWrapper standSaveWrapper = new QueryWrapper<>(); +// standSaveWrapper +// .eq("STAND_SORT",sarStandardsInfo.getStandSort()) +// .eq("STAND_NUMBER",sarStandardsInfo.getStandNumber()) +// .eq("STAND_YEAR",sarStandardsInfo.getStandYear()); +// +// +// SarStandardsInfo one = sarStandardsInfoService.getOne(standSaveWrapper); +// if (one!=null){ +// sarStandardsInfo.setId(one.getId()); +// sarStandardsInfoService.update(sarStandardsInfo,standSaveWrapper); +// +// QueryWrapper standAttrWrapper = new QueryWrapper<>(); +// standAttrWrapper.eq("STAND_ID",one.getId()); +// sarStandAttrInfo.setStandId(one.getId()); +// sarStandAttrInfoService.update(sarStandAttrInfo,standAttrWrapper); +// }else { +// +// +// sarStandardsInfoService.save(sarStandardsInfo); +// +// +// String field="ID,STAND_ID,VALID_FLAG,DTBJH,SSRQ"; +// String value="\'"+sarStandAttrInfo.getId()+"\'"+","+"\'"+sarStandAttrInfo.getStandId()+"\'"+","+"\'"+"0"+"\'"; +// +// +// if (sarStandAttrInfo.getDtbjh()!=null){ +// value+=","+"\'"+sarStandAttrInfo.getDtbjh()+"\'"; +// } +// +// if (sarStandAttrInfo.getSsrq()!=null){ +// value+=","+"\'"+sarStandAttrInfo.getSsrq()+"\'"; +// } +// sarStandAttrInfoDao.insertStandAttr(field,value); +// +// } }else { item.setErrorStr("标准号无法解析"); error.add(item); @@ -423,29 +425,29 @@ public class ImportExcelServiceImpl extends ServiceImpl saveWrapper = new QueryWrapper<>(); - saveWrapper.eq("STAND_CODE", item.getStandId()); - SarBussionessStand one = sarBussionessStandService.getOne(saveWrapper); - if (one != null) { - sarBussionessStand.setId(one.getId()); - sarBussionessStandService.update(sarBussionessStand, saveWrapper); - - QueryWrapper bussAttrWrapper = new QueryWrapper<>(); - bussAttrWrapper.eq("STAND_ID", one.getId()); - sarBussStandAttrInfo.setStandId(one.getId()); - sarBussStandAttrInfoService.update(sarBussStandAttrInfo, bussAttrWrapper); - sarBussStandAttrInfoDao.updateStandInfo(one.getId(), "GLWJBUSS", sarBussStandAttrInfo.getGlwj()); - - } else { - sarBussionessStandService.save(sarBussionessStand); - sarBussStandAttrInfoService.save(sarBussStandAttrInfo); - - sarBussStandAttrInfoDao.updateStandInfo(sarBussStandAttrInfo.getStandId(), "GLWJBUSS", sarBussStandAttrInfo.getGlwj()); - } +// QueryWrapper saveWrapper = new QueryWrapper<>(); +// saveWrapper.eq("STAND_CODE", item.getStandId()); +// SarBussionessStand one = sarBussionessStandService.getOne(saveWrapper); +// if (one != null) { +// sarBussionessStand.setId(one.getId()); +// sarBussionessStandService.update(sarBussionessStand, saveWrapper); +// +// QueryWrapper bussAttrWrapper = new QueryWrapper<>(); +// bussAttrWrapper.eq("STAND_ID", one.getId()); +// sarBussStandAttrInfo.setStandId(one.getId()); +// sarBussStandAttrInfoService.update(sarBussStandAttrInfo, bussAttrWrapper); +// sarBussStandAttrInfoDao.updateStandInfo(one.getId(), "GLWJBUSS", sarBussStandAttrInfo.getGlwj()); +// +// } else { +// sarBussionessStandService.save(sarBussionessStand); +// sarBussStandAttrInfoService.save(sarBussStandAttrInfo); +// +// sarBussStandAttrInfoDao.updateStandInfo(sarBussStandAttrInfo.getStandId(), "GLWJBUSS", sarBussStandAttrInfo.getGlwj()); +// } } catch (Exception e) {