diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index e69ccbc..67952d3 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -108,7 +108,7 @@ spring.data: # 数据库索引 database: 0 # redis 密码必须配置 -# password: root +# password: F*Nx=BZli+ZCCI-Fil+3 # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualCaseFilesController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualCaseFilesController.java index de48122..f704c8a 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualCaseFilesController.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualCaseFilesController.java @@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/productManagement/ContractualCaseFiles") +@RequestMapping("/contractreview/contractualCaseFiles") public class ContractualCaseFilesController extends BaseController { private final IContractualCaseFilesService contractualCaseFilesService; @@ -132,9 +132,9 @@ public class ContractualCaseFilesController extends BaseController { @SaCheckPermission("productManagement:ContractualCaseFiles:query") @GetMapping("/view/{id}") public void viewPdf(@NotNull(message = "案例文件ID不能为空") - @PathVariable Long id, + @PathVariable Long id, HttpServletResponse response) { contractualCaseFilesService.generateCasePdf(id, response); } -} \ No newline at end of file +} diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualRegulationArticlesController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualRegulationArticlesController.java index be59018..caa639c 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualRegulationArticlesController.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualRegulationArticlesController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/productManagement/regulationArticles") +@RequestMapping("/contractreview/regulationArticles") public class ContractualRegulationArticlesController extends BaseController { private final IContractualRegulationArticlesService contractualRegulationArticlesService; diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualRegulationNamesController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualRegulationNamesController.java index 3c60d17..62ef26c 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualRegulationNamesController.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualRegulationNamesController.java @@ -32,7 +32,7 @@ import org.dromara.productManagement.domain.vo.ContractualRegulationArticlesVo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/productManagement/ContractualRegulationNames") +@RequestMapping("/contractreview/contractualRegulationNames") public class ContractualRegulationNamesController extends BaseController { private final IContractualRegulationNamesService contractualRegulationNamesService; diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskChecklistController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskChecklistController.java index 8ff6dce..3da5058 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskChecklistController.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskChecklistController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/productManagement/ContractualTaskChecklist") +@RequestMapping("/contractreview/contractualTaskChecklist") public class ContractualTaskChecklistController extends BaseController { private final IContractualTaskChecklistService contractualTaskChecklistService; diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskResultsController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskResultsController.java index 18068b5..329c641 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskResultsController.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskResultsController.java @@ -23,7 +23,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/productManagement/ContractualTaskResults") +@RequestMapping("/contractreview/contractualTaskResults") public class ContractualTaskResultsController extends BaseController { private final IContractualTaskResultsService contractualTaskResultsService; @@ -93,4 +93,4 @@ public class ContractualTaskResultsController extends BaseController { @NotEmpty(message = "值不能为空") @PathVariable("value") String value) { return toAjax(contractualTaskResultsService.updateResultItemStatus(id, field, value)); } -} \ No newline at end of file +} diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskTypeController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskTypeController.java index 06c2a24..dc58705 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskTypeController.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskTypeController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/productManagement/ContractualTaskType") +@RequestMapping("/contractreview/contractualTaskType") public class ContractualTaskTypeController extends BaseController { private final IContractualTaskTypeService contractualTaskTypeService; diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTasksController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTasksController.java index ca54393..efe6161 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTasksController.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTasksController.java @@ -37,7 +37,7 @@ import org.dromara.productManagement.domain.StartContractReviewRequest; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/productManagement/ContractualTasks") +@RequestMapping("/contractreview/contractualTasks") public class ContractualTasksController extends BaseController { private final IContractualTasksService contractualTasksService; @@ -147,7 +147,7 @@ public class ContractualTasksController extends BaseController { /** * 启动合同审查任务 - * + * * @param request 审查请求数据 */ @PostMapping("/startReview") @@ -157,16 +157,16 @@ public class ContractualTasksController extends BaseController { if (request.getOssId() == null || request.getOssId().trim().isEmpty()) { return R.fail("文件ID不能为空"); } - + if (request.getReviewTypes() == null || request.getReviewTypes().isEmpty()) { return R.fail("审查类型不能为空"); } // 调用服务层启动审查 Map result = contractualTasksService.startContractReview(request); - + return R.ok(result); - + } catch (Exception e) { e.printStackTrace(); return R.fail("启动合同审查失败: " + e.getMessage()); diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocumentTaskResultsController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocumentTaskResultsController.java index 5c6371c..1a9459f 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocumentTaskResultsController.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocumentTaskResultsController.java @@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/productManagement/DocumentTaskResults") +@RequestMapping("/documentreview/documentTaskResults") public class DocumentTaskResultsController extends BaseController { private final IDocumentTaskResultsService documentTaskResultsService; diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocumentTasksController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocumentTasksController.java index d2faf4a..d15a6fb 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocumentTasksController.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocumentTasksController.java @@ -38,7 +38,7 @@ import org.springframework.web.multipart.MultipartFile; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/productManagement/DocumentTasks") +@RequestMapping("/documentreview/documentTasks") public class DocumentTasksController extends BaseController { private final IDocumentTasksService documentTasksService; diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/mapper/ContractualTasksMapper.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/mapper/ContractualTasksMapper.java index 670ac3a..b3e3246 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/mapper/ContractualTasksMapper.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/mapper/ContractualTasksMapper.java @@ -14,7 +14,7 @@ import java.util.List; * @author Lion Li * @date 2024-12-11 */ -public interface ContractualTasksMapper extends BaseMapperPlus { +public interface ContractualTasksMapper extends BaseMapperPlus { /** * 根据任务ID获取详细的合同任务结果 diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualRegulationNamesServiceImpl.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualRegulationNamesServiceImpl.java index 52f10c1..3a1d94c 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualRegulationNamesServiceImpl.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualRegulationNamesServiceImpl.java @@ -64,7 +64,6 @@ public class ContractualRegulationNamesServiceImpl implements IContractualRegula private final ContractualRegulationNamesMapper baseMapper; private final ContractualRegulationArticlesMapper articlesMapper; - private final IContractualRegulationArticlesService articlesService; private final ISysOssService ossService; private static final Logger log = LoggerFactory.getLogger(ContractualRegulationNamesServiceImpl.class); @@ -72,7 +71,7 @@ public class ContractualRegulationNamesServiceImpl implements IContractualRegula protected String fileRootPath; @Value("${chat.chatUrl}") protected String chatUrl; - + // Milvus配置 @Value("${milvus.host:10.1.21.250}") private String milvusHost; @@ -80,7 +79,7 @@ public class ContractualRegulationNamesServiceImpl implements IContractualRegula private int milvusPort; @Value("${milvus.collection.name:contractual_regulation_articles}") private String milvusCollectionName; - + private MilvusServiceClient milvusClient; /** @@ -255,7 +254,7 @@ public class ContractualRegulationNamesServiceImpl implements IContractualRegula } boolean allSuccess = true; - + // 逐个删除法规及其相关数据 for (Long id : ids) { try { @@ -264,11 +263,11 @@ public class ContractualRegulationNamesServiceImpl implements IContractualRegula if (!milvusDeleted) { log.warn("法规ID {} 的Milvus向量数据删除失败,但继续删除其他数据", id); } - + // 2. 删除法规条款(真实删除) int deletedArticles = articlesMapper.realDeleteByRegulationNameId(id); log.info("法规ID {} 删除了 {} 条法规条款", id, deletedArticles); - + // 3. 删除法规主记录(真实删除) int deletedRegulation = baseMapper.realDeleteById(id); if (deletedRegulation > 0) { @@ -277,7 +276,7 @@ public class ContractualRegulationNamesServiceImpl implements IContractualRegula log.warn("删除法规ID {} 失败", id); allSuccess = false; } - + } catch (Exception e) { log.error("删除法规ID {} 时出错: {}", id, e.getMessage(), e); allSuccess = false; @@ -592,7 +591,7 @@ public class ContractualRegulationNamesServiceImpl implements IContractualRegula } return milvusClient; } - + /** * 从Milvus中删除法规相关的向量数据 */ @@ -603,17 +602,17 @@ public class ContractualRegulationNamesServiceImpl implements IContractualRegula log.warn("Milvus客户端未初始化,跳过向量数据删除"); return false; } - + // 构造删除表达式 - 删除指定法规ID的所有向量 String deleteExpr = String.format("regulation_name_id == %d", regulationNameId); - + DeleteParam deleteParam = DeleteParam.newBuilder() .withCollectionName(milvusCollectionName) .withExpr(deleteExpr) .build(); - + R response = client.delete(deleteParam); - + if (response.getStatus() == R.Status.Success.getCode()) { MutationResult mutationResponse = response.getData(); long deleteCount = mutationResponse.getDeleteCnt(); @@ -623,7 +622,7 @@ public class ContractualRegulationNamesServiceImpl implements IContractualRegula log.error("从Milvus删除向量数据失败: {}", response.getMessage()); return false; } - + } catch (Exception e) { log.error("从Milvus删除向量数据时出错: {}", e.getMessage(), e); return false; diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTaskResultsServiceImpl.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTaskResultsServiceImpl.java index b51729a..388bef2 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTaskResultsServiceImpl.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTaskResultsServiceImpl.java @@ -653,6 +653,18 @@ public class ContractualTaskResultsServiceImpl implements IContractualTaskResult return arrayNode.get(0).asText(); } } + } else if (fieldName.equals("review_points_all")) { + if (jsonNode.has("review_points") && jsonNode.get("review_points").isArray()) { + JsonNode arrayNode = jsonNode.get("review_points"); + StringBuilder result = new StringBuilder(); + for (int i = 0; i < arrayNode.size(); i++) { + if (i > 0) { + result.append("\n"); + } + result.append(arrayNode.get(i).asText()); + } + return result.toString(); + } } else if (fieldName.equals("review_content")) { if (jsonNode.has("review_content") && !jsonNode.get("review_content").isNull()) { return jsonNode.get("review_content").asText(); @@ -675,13 +687,38 @@ public class ContractualTaskResultsServiceImpl implements IContractualTaskResult } XWPFParagraph paragraph = cell.addParagraph(); - XWPFRun run = paragraph.createRun(); - run.setText(text != null ? text : ""); - run.setFontFamily("Microsoft YaHei"); - run.setFontSize(12); + + if (text != null && text.contains("\n")) { + // 处理包含换行符的文本 + String[] lines = text.split("\n"); + for (int i = 0; i < lines.length; i++) { + XWPFRun run = paragraph.createRun(); + run.setText(lines[i]); + run.setFontFamily("Microsoft YaHei"); + run.setFontSize(12); + + if (isHeader) { + run.setBold(true); + } + + // 除了最后一行,其他行都添加换行符 + if (i < lines.length - 1) { + run.addBreak(); + } + } + } else { + // 处理普通文本 + XWPFRun run = paragraph.createRun(); + run.setText(text != null ? text : ""); + run.setFontFamily("Microsoft YaHei"); + run.setFontSize(12); + + if (isHeader) { + run.setBold(true); + } + } if (isHeader) { - run.setBold(true); // 设置表头背景色 cell.setColor("E6E6E6"); } @@ -729,7 +766,7 @@ public class ContractualTaskResultsServiceImpl implements IContractualTaskResult // 法规依据标签行(跨两列合并) config.addCellConfig(new CellConfiguration(2, 0).header("法规依据").mergeHorizontal(2)); // 法规依据内容行(跨两列合并) - config.addCellConfig(new CellConfiguration(3, 0).field("review_points[0]").mergeHorizontal(2)); + config.addCellConfig(new CellConfiguration(3, 0).field("review_points_all").mergeHorizontal(2)); break; case "一致性审查": @@ -792,6 +829,8 @@ public class ContractualTaskResultsServiceImpl implements IContractualTaskResult return formatReviewBasisCombined(item.getReviewBasis()); case "review_points[0]": return formatReviewBasisField(item.getReviewBasis(), "review_points[0]"); + case "review_points_all": + return formatReviewBasisField(item.getReviewBasis(), "review_points_all"); case "review_content": return formatReviewBasisField(item.getReviewBasis(), "review_content"); case "": diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTasksServiceImpl.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTasksServiceImpl.java index 8b9716f..b211237 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTasksServiceImpl.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTasksServiceImpl.java @@ -127,6 +127,7 @@ public class ContractualTasksServiceImpl extends AbstractTaskProcessor