From e2273fc5e1853f789e963cd4c3cd3de4c4016a4a Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Wed, 24 Jul 2024 15:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=AC=94=E5=BD=95=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E5=88=86=E7=B1=BB=E7=9A=84=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/supervision/police/domain/TripleInfo.java     | 10 ++++++++++
 .../service/impl/ModelRecordTypeServiceImpl.java      | 10 ++++++++++
 .../com/supervision/thread/TripleExtractThread.java   | 11 ++++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/supervision/police/domain/TripleInfo.java b/src/main/java/com/supervision/police/domain/TripleInfo.java
index 193a9c8..1fcc405 100644
--- a/src/main/java/com/supervision/police/domain/TripleInfo.java
+++ b/src/main/java/com/supervision/police/domain/TripleInfo.java
@@ -50,6 +50,16 @@ public class TripleInfo implements Serializable {
      */
     private String addNeo4j;
 
+    /**
+     * neo4j开始节点的ID
+     */
+    private Long startNodeGraphId;
+
+    /**
+     * neo4j结束节点的ID
+     */
+    private Long endNodeGraphId;
+
     /**
      * 开始节点类型(neo4j节点类型)
      */
diff --git a/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java
index e664935..94331ed 100644
--- a/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java
@@ -149,6 +149,13 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
 
             // 如果存在,则校验时间是否已经超过1天,如果超过了1天还没有执行完毕,就重新提交这个任务
             CaseTaskRecord caseTaskRecord = caseTaskRecordOpt.get();
+            // 如果未执行,则提交执行
+            if (caseTaskRecordOpt.get().getStatus() == 0) {
+                caseTaskRecord.setStatus(1);
+                caseTaskRecord.setSubmitTime(LocalDateTime.now());
+                caseTaskRecordService.updateById(caseTaskRecord);
+                return false;
+            }
             if (caseTaskRecordOpt.get().getStatus() == 1 && LocalDateTime.now().isAfter(caseTaskRecord.getSubmitTime().plusDays(1))) {
                 // 如果已经超过1天,则重新提交任务
                 caseTaskRecord.setStatus(1);
@@ -156,6 +163,7 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
                 caseTaskRecordService.updateById(caseTaskRecord);
                 return false;
             } else if (caseTaskRecordOpt.get().getStatus() == 2) {
+                // 如果执行成功,就返回true,取反之后就可以返回三元组信息了
                 return true;
             } else if (caseTaskRecordOpt.get().getStatus() == 3) {
                 caseTaskRecord.setStatus(1);
@@ -310,6 +318,8 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
                     neo4jService.saveRelation(rel);
                 }
                 tripleInfo.setAddNeo4j("1");
+                tripleInfo.setStartNodeGraphId(startNode.getId());
+                tripleInfo.setEndNodeGraphId(endNode.getId());
                 boolean updateResult = tripleInfoService.updateById(tripleInfo);
                 if (updateResult) {
                     i++;
diff --git a/src/main/java/com/supervision/thread/TripleExtractThread.java b/src/main/java/com/supervision/thread/TripleExtractThread.java
index bd989a0..6048fbe 100644
--- a/src/main/java/com/supervision/thread/TripleExtractThread.java
+++ b/src/main/java/com/supervision/thread/TripleExtractThread.java
@@ -103,7 +103,16 @@ public class TripleExtractThread implements Callable<TripleInfo> {
                     return null;
                 }
                 // 构建三元组信息
-                return new TripleInfo(headEntity.getName(), tailEntity.getName(), relation, caseId, recordId, recordSplitId, LocalDateTime.now(), prompt.getStartEntityType(), prompt.getEndEntityType());
+                TripleInfo tripleInfo = new TripleInfo();
+                tripleInfo.setStartNode(headEntity.getName());
+                tripleInfo.setEndNode(tailEntity.getName());
+                tripleInfo.setRelation(relation);
+                tripleInfo.setCaseId(caseId);
+                tripleInfo.setRecordId(recordId);
+                tripleInfo.setRecordSplitId(recordSplitId);
+                tripleInfo.setStartNodeType(prompt.getStartEntityType());
+                tripleInfo.setEndNodeType(prompt.getEndEntityType());
+                return tripleInfo;
             }
         } catch (Exception e) {
             log.error("提取三元组出现错误", e);