From 7c87aa9ae2175bda32beae3e989cf930f89188ae Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Mon, 11 Nov 2024 10:51:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=8E=9F=E5=AD=90=E6=8C=87=E6=A0=87-?=
 =?UTF-8?q?=E5=9B=BE=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89cypher=E8=AF=AD=E5=8F=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/police/dto/ModelCaseDTO.java  |  3 +++
 .../service/impl/ModelIndexServiceImpl.java   | 26 ++++---------------
 src/main/resources/application.yml            |  4 +--
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/supervision/police/dto/ModelCaseDTO.java b/src/main/java/com/supervision/police/dto/ModelCaseDTO.java
index 7d348e6..ef62228 100644
--- a/src/main/java/com/supervision/police/dto/ModelCaseDTO.java
+++ b/src/main/java/com/supervision/police/dto/ModelCaseDTO.java
@@ -114,6 +114,9 @@ public class ModelCaseDTO {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime updateTime;
 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime caseAnalysisSuccessTime;
+
     public void floatLawActorInfo() {
         if (Objects.nonNull(lawActor)){
             this.caseActorName = lawActor.getName();
diff --git a/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
index 33b9a9b..980fc5c 100644
--- a/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
@@ -75,9 +75,6 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
     @Value("${case.evidence.table}")
     private List<String> allowedTables;
 
-    @Value("${case.atomic.query}")
-    private String queryTemplate;
-
     @Override
     @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
     public R<?> selectAll(ModelIndexReqVO modelIndex, Integer page, Integer size) {
@@ -234,11 +231,11 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
             Assert.notEmpty(notePrompt.getEvidenceCategoryId(), "提示词分类为空");
             modelAtomicIndex.setCategoryId(notePrompt.getEvidenceCategoryId());
         }else if (StringUtils.equals(IndexRuleConstants.OPERAND_TYPE_GRAPH, modelAtomicIndex.getIndexSource())) {
-            Assert.notEmpty(modelAtomicIndex.getPromptId(), "提示词id不能为空");
-            NotePrompt notePrompt = notePromptService.getBaseMapper().selectById(modelAtomicIndex.getPromptId());
-            Assert.notNull(notePrompt, "提示词信息不存在");
-            String query = promptGenerateGraphQuery(notePrompt, queryTemplate);
-            modelAtomicIndex.setQueryLang(query);
+            Assert.notEmpty(modelAtomicIndex.getQueryLang(), "查询语句不能为空");
+//            NotePrompt notePrompt = notePromptService.getBaseMapper().selectById(modelAtomicIndex.getPromptId());
+//            Assert.notNull(notePrompt, "提示词信息不存在");
+//            String query = promptGenerateGraphQuery(notePrompt, queryTemplate);
+//            modelAtomicIndex.setQueryLang(query);
         }
     }
 
@@ -256,19 +253,6 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
         }
     }
 
-    private String promptGenerateGraphQuery(NotePrompt prompt, String queryTemplate) {
-
-        if (null == prompt || !StrUtil.equals("2", prompt.getType())) {
-            return null;
-        }
-        return StrUtil.format(queryTemplate,
-                new HashMap<String, Object>() {{
-                    put("startEntityType", prompt.getStartEntityType());
-                    put("relType", prompt.getRelType());
-                    put("endEntityType", prompt.getEndEntityType());
-                }});
-    }
-
     @Override
     @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
     public List<CaseAtomicIndexDTO> listCaseAtomicIndex(String caseId, String indexSource) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f8606ab..6b1e6e5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -16,7 +16,7 @@ mybatis-plus:
   mapper-locations: classpath*:mapper/*.xml
   configuration:
     map-underscore-to-camel-case: true
-   # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
 server:
   port: 8097
@@ -25,8 +25,6 @@ server:
 case:
   evidence:
     table: case_evidence
-  atomic:
-    query: "MATCH (m:`{startEntityType}`), (n:`{endEntityType}`) where m.name=$lawActor and m.caseId = n.caseId = $caseId and m.picType = n.picType = '1' OPTIONAL MATCH (m)-[r:`{relType}`]->(n)RETURN id(m) as startId, id(n) as endId, id(r) as relId, n.recordSplitId as recordSplitId, m.recordId as recordId"
 fu-hsi-config:
   case-analysis-method: new
   thread-pool: