Merge branch 'cc_20250516_dataHandler' into 'master'

Cc 20250516 data handler

See merge request hangzhou/java/custom_zxjp!88
This commit is contained in:
苏竹红
2025-05-19 10:33:21 +00:00
6 changed files with 399 additions and 39 deletions

View File

@@ -69,7 +69,7 @@ public class DataHandlerController {
@PostMapping("/dataStageHandler")
@ApiOperation("阶段处理")
public ResponseResult<Boolean> importOaOldShopData(MultipartFile file, @RequestParam("flag") Boolean flag) {
public ResponseResult<Boolean> dataStageHandler(MultipartFile file, @RequestParam("flag") Boolean flag) {
ExcelReader reader = null;
try {
reader = ExcelUtil.getReader(file.getInputStream());
@@ -99,4 +99,28 @@ public class DataHandlerController {
dataHandlerServer.decorationDataInit();
return ResponseResult.success(true);
}
@PostMapping("/dataHandlerV20241012")
@ApiOperation("导入OA202410-12旧数据")
public ResponseResult<Boolean> dataHandlerV20241012(MultipartFile file) {
ExcelReader reader = null;
try {
reader = ExcelUtil.getReader(file.getInputStream());
} catch (IOException e) {
log.error("read file error:", e);
}
assert reader != null;
List<Map<String, Object>> dataMapList = reader.read(0, 1, Integer.MAX_VALUE);
ImportTaskDO importTaskDO = new ImportTaskDO();
importTaskDO.setFileName(file.getOriginalFilename());
importTaskDO.setFileType(FileTypeEnum.IMPORT_OA_OLD_SHOP_DATA.getFileType());
importTaskDO.setIsImport(true);
importTaskDO.setStatus(ImportTaskStatusEnum.PROGRESS.getCode());
importTaskDO.setCreateUserId(CurrentUserHolder.getUserId());
importTaskDO.setCreateName(CurrentUserHolder.getUser().getName());
importTaskDO.setCreateTime(System.currentTimeMillis());
importTaskMapper.insert(eid, importTaskDO);
dataHandlerServer.dataHandlerV20241012(dataMapList, file.getOriginalFilename(), CurrentUserHolder.getUser(), importTaskDO);
return ResponseResult.success(true);
}
}