| | |
| | | obsoleteOldVersionsByCompositeKey(deviceVersionMap); |
| | | |
| | | if (!notFoundEquipmentCodes.isEmpty()) { |
| | | String successMsg = fileName + "部分导入成功,设备数:" + standards.size() + |
| | | ",项目数:" + allItems.size(); |
| | | String successMsg = fileName + "部分导入成功,设备数:" + standards.size(); |
| | | String errorMsg = "以下设备编码未找到:" + String.join(", ", notFoundEquipmentCodes); |
| | | return Result.ok(successMsg + ";但" + errorMsg); |
| | | } |
| | | |
| | | return Result.ok(fileName + "导入成功,设备数:" + standards.size() + ",项目数:" + allItems.size()); |
| | | |
| | | // 修改点:只返回设备数量 |
| | | return Result.ok(fileName + "导入成功,设备数:" + standards.size()); |
| | | |
| | | } catch (ImportException e) { |
| | | return Result.error(fileName + ":" + e.getMessage()); |