Merge branch 'dev_1.0.0' into ocr_branch

README.md

@@ -7,11 +7,23 @@
 
 # Release Notes
 
+# 发布时间 2024-09-03
+# 变更记录
+- 修复三元组提取进度问题不准确的问题
+- 解除首页页面限制
+- 优化原子指标提示
+- 解除模型分析需要有数据变动校验限制
+
+# 安装包
+- /data/archives/fu-hsi/20240903/fu-hsi-service-1.0.0.tar.gz
+- /data/archives/fu-hsi/20240903/dist
+
+
 # 发布时间 2024-08-29
 # 变更记录
  - 案件笔录列表调整，仅展示子列表
  - 字典值配置生效
 
 # 安装包
-- /data/archives/fu-hsi/20240728/fu-hsi-service-1.0.0.tar.gz
-- /data/archives/fu-hsi/20240728/dist
+- /data/archives/fu-hsi/20240828/fu-hsi-service-1.0.0.tar.gz
+- /data/archives/fu-hsi/20240828/dist

src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java

@@ -79,10 +79,6 @@ public class ModelServiceImpl implements ModelService {
     @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
     public R<?> analyseCase(AnalyseCaseDTO analyseCaseDTO) {
 
-        CaseStatus caseDateStatus = this.getCaseDateStatus(analyseCaseDTO.getCaseId());
-        String check = caseDateStatus.check();
-        Assert.isTrue(StrUtil.isEmpty(check), check);
-
         ModelCase modelCase = modelCaseMapper.selectById(analyseCaseDTO.getCaseId());
         // 获取案件行为人ID
         CasePerson casePerson = casePersonMapper.selectOne(new LambdaQueryWrapper<CasePerson>()

src/main/java/com/supervision/thread/TripleExtractTask.java

@@ -121,8 +121,11 @@ public class TripleExtractTask implements Callable<TripleInfo> {
         paramMap.put("tailEntityType", prompt.getEndEntityType());
         paramMap.put("question", noteRecordSplit.getQuestion());
         paramMap.put("answer", noteRecordSplit.getAnswer());
+        log.info("开始尝试提取三元组：{}-{}-{},mainActor:{}", prompt.getStartEntityType(), prompt.getRelType(), prompt.getEndEntityType(), mainActor == null ? "" : mainActor.getName());
         if (mainActor != null && HEAD_ENTITY_TYPE_ACTOR.equals(prompt.getStartEntityType())) {
             paramMap.put("requirement", "当前案件的行为人是" + mainActor.getName() + "，只尝试提取" + mainActor.getName() + "为头结点的三元组。");
+        } else {
+            paramMap.put("requirement", "");
         }
         String format = StrUtil.format(prompt.getPrompt(), paramMap);