|
@@ -33,13 +33,17 @@ import java.util.*;
|
|
|
public class StNzydkServiceImpl extends ServiceImpl<StNzydkMapper, StNzydk> implements StNzydkService {
|
|
|
|
|
|
@Override
|
|
|
- public List<String> uploadNzydkData(MultipartFile zipFile) {
|
|
|
+ public Map<String, Object> uploadNzydkData(MultipartFile zipFile) {
|
|
|
+ Map<String, Object> resultMap = new HashMap<>();
|
|
|
List<String> errorList = new ArrayList<>();
|
|
|
+ Set<String> pcbhSet = new HashSet<>();
|
|
|
+ resultMap.put("errorList", errorList);
|
|
|
+ resultMap.put("pcbhList", pcbhSet);
|
|
|
if (zipFile.isEmpty()) {
|
|
|
String msg = "上传文件为空";
|
|
|
log.error(msg);
|
|
|
errorList.add(msg);
|
|
|
- return errorList;
|
|
|
+ return resultMap;
|
|
|
}
|
|
|
|
|
|
File tempDir = null;
|
|
@@ -63,7 +67,7 @@ public class StNzydkServiceImpl extends ServiceImpl<StNzydkMapper, StNzydk> impl
|
|
|
String msg = "解析批次信息sheet失败: " + e.getMessage();
|
|
|
log.error(msg, e);
|
|
|
errorList.add(msg);
|
|
|
- return errorList;
|
|
|
+ return resultMap;
|
|
|
}
|
|
|
if (!batchDataList.isEmpty()) {
|
|
|
Map<String, Object> batchData = batchDataList.get(0);
|
|
@@ -86,7 +90,7 @@ public class StNzydkServiceImpl extends ServiceImpl<StNzydkMapper, StNzydk> impl
|
|
|
String msg = "解析项目信息sheet失败: " + e.getMessage();
|
|
|
log.error(msg, e);
|
|
|
errorList.add(msg);
|
|
|
- return errorList;
|
|
|
+ return resultMap;
|
|
|
}
|
|
|
if (projectInfoList.isEmpty()) {
|
|
|
String msg = "未能从 '农转用项目信息' sheet 读取到数据。";
|
|
@@ -144,15 +148,19 @@ public class StNzydkServiceImpl extends ServiceImpl<StNzydkMapper, StNzydk> impl
|
|
|
log.error(msg, e);
|
|
|
errorList.add(msg);
|
|
|
}
|
|
|
+ // 收集pcbh
|
|
|
+ if (stNzydk.getPcbh() != null && !stNzydk.getPcbh().isEmpty()) {
|
|
|
+ pcbhSet.add(stNzydk.getPcbh());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- return errorList;
|
|
|
+ return resultMap;
|
|
|
|
|
|
} catch (IOException e) {
|
|
|
String msg = "文件上传或处理失败: " + e.getMessage();
|
|
|
log.error(msg, e);
|
|
|
errorList.add(msg);
|
|
|
- return errorList;
|
|
|
+ return resultMap;
|
|
|
} finally {
|
|
|
// 清理临时文件
|
|
|
if (tempDir != null && tempDir.exists()) {
|