FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_3

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-09-09 10:59:42 +08:00
parent 0cdf343a09 721f13febc
commit 60e28c19dc
2 changed files with 118 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java
+4 -5
View File
@@ -47,11 +47,10 @@ public class ImportExcelController extends BaseController<ImportDto> {
@PostMapping("/import")
public void deleteList(MultipartFile file, MultipartFile file2, HttpServletResponse response, HttpServletRequest request) throws IOException {
Map<String, List<ImportDto>> mapMap=importExcelService.getExcelData(file,file2);
List<ImportDto> errorList = importExcelService.storageExclData(mapMap);
// ResponseMessage responseMessage=new ResponseMessage();
// responseMessage.setMessage(mapMap.toString());
// responseMessage.isOk();
List<ImportDto> errorList = importExcelService.storageExclData(mapMap);
// List<ImportDto> guonei= mapMap.get("GNBZ");
// List<ImportDto> haiwai = mapMap.get("HWBZ");
// List<ImportDto> qibiao = mapMap.get("QYBZ");
OutputStream os = null;
Workbook workbook = null;
try {
adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
+114 -112
View File
@@ -75,16 +75,19 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
",NB/T,CJ/T,YS/T,SJ/T,BB/T,SN/T,SB/T,MH/T,DB11,SZDB/Z,HKG,T/ZSA,CSAE,T/CAS,T/CADA,T/CHTS,T/ITS,T/BJQC";
private final static String QB = "Q/QCBFC,Q/FT,Q/FL,Q/QCFLC,Q/BQB,Q/SGT," +
"Q-AMSN,QB-NE,Q-IOUM,Q房/AYJ,KNT";
private final static String DATE = "-2008,—2008,-2009,—2009,-2010,—2010,-2011,—2011,-2012,—2012,-2013,—2013," +
"- 2008,— 2008,- 2009,— 2009,- 2010,— 2010,- 2011,— 2011,- 2012,— 2012,- 2013,— 2013" +
",-2014,—2014,-2015,—2015,-2016,—2016,-2017,—2017,-2018,—2018,-2019,—2019,-2020,—2020,-2021,—2021" +
",- 2014,— 2014,- 2015,— 2015,- 2016,— 2016,- 2017,— 2017,- 2018,— 2018,- 2019,— 2019,- 2020,— 2020,- 2021,— 2021";
// file 为主 file2 为附件
@Override
public Map<String, List<ImportDto>> getExcelData(MultipartFile file, MultipartFile file2) {
List<String> 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<ImportExcelDao, ImportDt
datas.forEach(items -> {
//判断是否是正确的数据
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<ImportExcelDao, ImportDt
return res;
}
private boolean inDate(String as) {
List<String> dates = new ArrayList<>(Arrays.asList(DATE.split(",")));
private boolean inDate(String as,List<String> dates) {
if (null != as && !"".equals(as)) {
for (String s : dates) {
if (s.equals(as.trim())) {
@@ -296,48 +298,48 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
String standID = UUIDUtils.randomUUID20();
SarStandardsInfo sarStandardsInfo = parseImportDtoToStandardsInfo(item, standID);
//
//
if (sarStandardsInfo!=null)
{
SarStandAttrInfo sarStandAttrInfo = parseImportDtoToStandAttrInfo(item, standID);
sarStandardsInfo.setValidFlag("0");
sarStandardsInfo.setStandType("FOREIGN");
QueryWrapper<SarStandardsInfo> 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<SarStandAttrInfo> 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<SarStandardsInfo> 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<SarStandAttrInfo> 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<ImportExcelDao, ImportDt
SarStandardsInfo sarStandardsInfo = parseImportDtoToStandardsInfo(item, standID);
if (sarStandardsInfo!=null){
SarStandAttrInfo sarStandAttrInfo = parseImportDtoToStandAttrInfo(item, standID);
sarStandardsInfo.setValidFlag("0");
sarStandardsInfo.setStandType("INLAND");
QueryWrapper<SarStandardsInfo> 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<SarStandAttrInfo> 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<SarStandardsInfo> 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<SarStandAttrInfo> 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<ImportExcelDao, ImportDt
if (sarBussionessStand!=null) {
SarBussStandAttrInfo sarBussStandAttrInfo = parseImportDtoToSarBussStandAttrInfo(item, standId);
// SarBussStandAttrInfo sarBussStandAttrInfo = parseImportDtoToSarBussStandAttrInfo(item, standId);
//
//
try {
QueryWrapper<SarBussionessStand> 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<SarBussStandAttrInfo> 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<SarBussionessStand> 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<SarBussStandAttrInfo> 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) {