From 7ecd7c06b858cfb8cf1c3a2b7d9010241b2288da Mon Sep 17 00:00:00 2001 From: erdanergou Date: Tue, 23 May 2023 11:05:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=97=B6=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/MaterialMapper.java | 2 +- .../service/MaterialService.java | 2 +- .../service/impl/ExcelServiceImpl.java | 25 +++++++++++-------- .../service/impl/MaterialServiceImpl.java | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java index b8847928..528ffed6 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java @@ -28,7 +28,7 @@ public interface MaterialMapper { * @param map * @return */ - Material findMaterialByMnameAndVersion(Map map); + List findMaterialByMnameAndVersion(Map map); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java b/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java index e7ee66b6..9ba9aadc 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java @@ -65,7 +65,7 @@ public interface MaterialService { * @param map * @return */ - Material findMaterialByMnameAndVersion(Map map); + List findMaterialByMnameAndVersion(Map map); /** * 根据条件查询符合条件的库存 diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java index 796601b9..d40fc446 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java @@ -120,7 +120,7 @@ public class ExcelServiceImpl implements ExcelService { double temp = threadSize - maxThreadSize; maxThreadSize = (int) (Math.ceil(temp / maxThreadSize) * maxThreadSize); } - if(maxThreadSize < threadSize){ + if (maxThreadSize < threadSize) { maxThreadSize = threadSize; } @@ -246,7 +246,7 @@ public class ExcelServiceImpl implements ExcelService { double temp = threadSize - maxThreadSize; maxThreadSize = (int) (Math.ceil(temp / maxThreadSize) * maxThreadSize); } - if(maxThreadSize < threadSize){ + if (maxThreadSize < threadSize) { maxThreadSize = threadSize; } @@ -376,7 +376,7 @@ public class ExcelServiceImpl implements ExcelService { double temp = threadSize - maxThreadSize; maxThreadSize = (int) (Math.ceil(temp / maxThreadSize) * maxThreadSize); } - if(maxThreadSize < threadSize){ + if (maxThreadSize < threadSize) { maxThreadSize = threadSize; } @@ -747,7 +747,7 @@ public class ExcelServiceImpl implements ExcelService { } } ExcelFileInfoPool.removeUserExcelInventoryInfo(number); - log.info("【批量添加】批量添加数据：{}", JSON.toJSONString(excelVosForInventory) + ";导入人员" + userByPort.getName() + ":" + userByPort.getNumber()+";导入总数为："+successCount); + log.info("【批量添加】批量添加数据：{}", JSON.toJSONString(excelVosForInventory) + ";导入人员" + userByPort.getName() + ":" + userByPort.getNumber() + ";导入总数为：" + successCount); } @@ -774,7 +774,7 @@ public class ExcelServiceImpl implements ExcelService { } else { insert.put("materialTypeId", info.getParentId()); } - successNum+=materialTypeService.insertMaterialType(insert); + successNum += materialTypeService.insertMaterialType(insert); success.add(info); if ((i + 1) % 100 == 0 || excelVosForMaterialType.size() - 1 == i) { // 如果凑够100条或者已经循环完成 发送消息 @@ -788,7 +788,7 @@ public class ExcelServiceImpl implements ExcelService { } ExcelFileInfoPool.removeUserExcelMaterialTypeInfo(number); - log.info("【批量添加】批量添加数据：{}", JSON.toJSONString(excelVosForMaterialType) + ";导入人员" + userByPort.getName() + ":" + userByPort.getNumber()+";导入总数"+successNum); + log.info("【批量添加】批量添加数据：{}", JSON.toJSONString(excelVosForMaterialType) + ";导入人员" + userByPort.getName() + ":" + userByPort.getNumber() + ";导入总数" + successNum); } @@ -825,7 +825,7 @@ public class ExcelServiceImpl implements ExcelService { } OldIdList = (List) CollectionUtils.subtract(OldIdList, parentOldIdList); oldId = OldIdList.get(0); - }else{ + } else { oldId = materialTypeByNames.get(0).getOldId(); } @@ -848,7 +848,7 @@ public class ExcelServiceImpl implements ExcelService { } } ExcelFileInfoPool.removeUserExcelMaterialInfo(number); - log.info("【批量添加】批量添加数据：{}", JSON.toJSONString(excelVosForMaterial) + ";导入人员" + userByPort.getName() + ":" + userByPort.getNumber()+";导入总数"+successNum); + log.info("【批量添加】批量添加数据：{}", JSON.toJSONString(excelVosForMaterial) + ";导入人员" + userByPort.getName() + ":" + userByPort.getNumber() + ";导入总数" + successNum); } @@ -1065,6 +1065,7 @@ public class ExcelServiceImpl implements ExcelService { List errMsg = new ArrayList<>(); for (int i = 0; i < excelInfoByMaterialS.size(); i++) { ExcelInfoForMaterial excelInfoForMaterial = excelInfoByMaterialS.get(i); + log.info("处理的数据" + JSONObject.toJSONString(excelInfoForMaterial)); Map paramForMaterial = new HashMap<>(); String mname = excelInfoForMaterial.getMname(); if (mname == null) { @@ -1075,8 +1076,8 @@ public class ExcelServiceImpl implements ExcelService { } paramForMaterial.put("mname", mname); paramForMaterial.put("version", excelInfoForMaterial.getVersion()); - Material material = materialMapper.findMaterialByMnameAndVersion(paramForMaterial); - if (material != null) { + List materials = materialMapper.findMaterialByMnameAndVersion(paramForMaterial); + if (materials != null && materials.size() > 0) { String s = dataIndex.get(i); String msg = s + "出现异常,名称为：" + mname + "，型号为：" + excelInfoForMaterial.getVersion() + "的物料已存在"; errMsg.add(msg); @@ -1115,7 +1116,9 @@ public class ExcelServiceImpl implements ExcelService { continue; } } - ExcelFileInfoPool.getUserExcelMaterialInfo(userByPort.getNumber()).add(excelInfoForMaterial); + log.info("添加的数据" + JSONObject.toJSONString(excelInfoForMaterial)); + List userExcelMaterialInfo = ExcelFileInfoPool.getUserExcelMaterialInfo(userByPort.getNumber()); + userExcelMaterialInfo.add(excelInfoForMaterial); } return errMsg; } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java index 36b76a2f..1dc8ba03 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java @@ -274,7 +274,7 @@ public class MaterialServiceImpl implements MaterialService { * @return */ @Override - public Material findMaterialByMnameAndVersion(Map map) { + public List findMaterialByMnameAndVersion(Map map) { return materialMapper.findMaterialByMnameAndVersion(map); }