From 52dcd6996a1f45eea7332c07cfe1c29d300c556f Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Thu, 20 Feb 2025 14:57:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/police/domain/NotePrompt.java | 27 +++++++++++++++++++
 .../impl/ModelRecordTypeServiceImpl.java      |  4 +--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/supervision/police/domain/NotePrompt.java b/src/main/java/com/supervision/police/domain/NotePrompt.java
index ba1ce2a..57f8551 100644
--- a/src/main/java/com/supervision/police/domain/NotePrompt.java
+++ b/src/main/java/com/supervision/police/domain/NotePrompt.java
@@ -1,5 +1,7 @@
 package com.supervision.police.domain;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -131,4 +133,29 @@ public class NotePrompt implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
+
+    public String findRelationValue(){
+        return filterValue("relation");
+    }
+
+    public String findHeadEntityValue(){
+        return filterValue("headEntityType");
+    }
+
+    public String findTailEntityValue(){
+        return filterValue("tailEntityType");
+    }
+
+    private String filterValue(String templateName){
+        if (CollUtil.isEmpty(this.tripleList)){
+            return null;
+        }
+        // 匹配出关系的value
+        TripleInfoDTO tripleInfoDTO1 = this.tripleList.stream()
+                .filter(tripleInfoDTO -> StrUtil.equals(tripleInfoDTO.getTemplateName(), templateName)).findFirst().orElse(null);
+        if (tripleInfoDTO1 == null){
+            return null;
+        }
+        return tripleInfoDTO1.getValue();
+    }
 }
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 7267257..3e07f07 100644
--- a/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java
@@ -158,7 +158,7 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
             boolean save;
             if (StringUtils.isEmpty(prompt.getId())) {
                 // 新增的时候,校验是否已经存在相同的三元组关系,如果已经存在了相同的三元组关系,不允许添加
-                if (checkHasSameTriple(prompt.getStartEntityType(), prompt.getRelType(), prompt.getEndEntityType(), null)) {
+                if (checkHasSameTriple(prompt.findHeadEntityValue(), prompt.findRelationValue(), prompt.findTailEntityValue(), null)) {
                     return R.fail("已存在相同的三元组关系,不允许添加");
                 }
                 save = notePromptService.save(prompt);
@@ -170,7 +170,7 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
                     notePromptTypeRelService.save(rel);
                 }
             } else {
-                if (checkHasSameTriple(prompt.getStartEntityType(), prompt.getRelType(), prompt.getEndEntityType(), prompt.getId())) {
+                if (checkHasSameTriple(prompt.findHeadEntityValue(), prompt.findRelationValue(), prompt.findTailEntityValue(), prompt.getId())) {
                     return R.fail("已存在相同的三元组关系,不允许添加");
                 }
                 save = notePromptService.updateById(prompt);