diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java index d290fe15..e4622e9d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java @@ -162,7 +162,7 @@ public class DocumentSplitController { @RequiresPermissions("split:sarFileSplitInfo:splitFile") @ApiOperationSupport(order = 6) public Result batchSplit(@ApiParam("文件id") @RequestBody JSONObject jsonObject) { - documentSplitService.batchSplit(jsonObject); + documentSplitService.batchSplit(jsonObject, null); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -494,8 +494,8 @@ public class DocumentSplitController { */ @AutoLog(value = "标准拆分详情-查询所有拆分错误的标准") @ApiOperation(value = "标准拆分详情-查询所有拆分错误的标准") - @GetMapping("/showAllBadSplit") - public Result showAllBadSplit() { - return Result.OK(MessageUtils.getMessage(ResultCommon.OK), documentSplitService.showAllBadSplit()); + @GetMapping("/fixAllBadSplit") + public Result fixAllBadSplit() { + return Result.OK(MessageUtils.getMessage(ResultCommon.OK), documentSplitService.fixAllBadSplit()); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java index 4d122b0f..6bf6f35d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java @@ -224,7 +224,7 @@ public interface IDocumentSplitService extends IService { * 文档拆分-批量拆分 * @param jsonObject */ - void batchSplit(JSONObject jsonObject); + void batchSplit(JSONObject jsonObject, String author); /** * 重新处理条文详情 @@ -246,5 +246,5 @@ public interface IDocumentSplitService extends IService { */ void deleteBatchTitle(String ids); - String showAllBadSplit(); + String fixAllBadSplit(); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index e4ca7456..d2a778bb 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -475,7 +475,7 @@ public class DocumentSplitServiceImpl extends ServiceImpl list = sarFileSplitItemsValEOService.list(); Map> valMap = list.stream().collect(Collectors.groupingBy(SarFileSplitItemsValEO::getItemId)); List imageOneList = list.stream().filter(val -> val.getItemContent().startsWith("图1")).collect(Collectors.toList()); @@ -1870,11 +1874,29 @@ public class DocumentSplitServiceImpl extends ServiceImpl infoList = sarFileSplitInfoService.list(infoEOLambdaQueryWrapper); log.info("共发现{}条没有拆出图片的企标", infoList.size()); + // 开始重新拆分 + int count = 1; + List failedList = new ArrayList<>(); for (SarFileSplitInfoEO info : infoList) { - log.info("企标编号:{},拆分id:{}", info.getSerialNumber(), info.getId()); + try { + log.info("正在处理第{}条,企标编号{}", count, info.getSerialNumber()); + String fileId = info.getFileId(); + String infoId = info.getId(); + String author = info.getAuthor(); + // 删除拆分记录 + sarFileSplitInfoService.deleteByIds(Collections.singletonList(infoId)); + // 重新拆分 + JSONObject jsonObject = new JSONObject(); + jsonObject.put("ids", fileId); + documentSplitService.batchSplit(jsonObject, author); + log.info("第{}条处理完毕", count++); + } catch (Exception e) { + failedList.add(info.getId()); + } } - return infoList.stream().map(SarFileSplitInfoEO::getId).collect(Collectors.joining(",")); + return failedList.size() + "条企标拆分失败"; } }