diff --git a/src/main/java/com/supervision/police/controller/PromptController.java b/src/main/java/com/supervision/police/controller/PromptController.java index fe4307f..2c0fdc9 100644 --- a/src/main/java/com/supervision/police/controller/PromptController.java +++ b/src/main/java/com/supervision/police/controller/PromptController.java @@ -48,4 +48,5 @@ public class PromptController { public R getById(@RequestBody NotePrompt notePrompt) { return R.ok(promptService.getById(notePrompt.getId())); } + } diff --git a/src/main/java/com/supervision/police/domain/NotePrompt.java b/src/main/java/com/supervision/police/domain/NotePrompt.java index 994b245..2a9cc5d 100644 --- a/src/main/java/com/supervision/police/domain/NotePrompt.java +++ b/src/main/java/com/supervision/police/domain/NotePrompt.java @@ -13,6 +13,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; @TableName(value = "note_prompt", autoResultMap = true) @@ -33,7 +34,7 @@ public class NotePrompt implements Serializable { * prompt关联的类型 */ @TableField(exist = false) - private List typeList; + private List typeList = new ArrayList<>(); /** * 提示词 @@ -72,7 +73,7 @@ public class NotePrompt implements Serializable { @TableField(exist = false) - private List tripleList; + private List tripleList = new ArrayList<>(); /** * 创建人ID 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 ed06f29..9127d6a 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java @@ -104,7 +104,7 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl buildTripleInfo(NotePrompt notePrompt) { + public static List buildTripleInfo(NotePrompt notePrompt) { List list = new ArrayList<>(); TripleInfoDTO dto = new TripleInfoDTO(); dto.setType("头节点"); diff --git a/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java b/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java index 1e46dda..b28989e 100644 --- a/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/NotePromptServiceImpl.java @@ -3,6 +3,7 @@ package com.supervision.police.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -37,6 +38,8 @@ import java.nio.charset.StandardCharsets; import java.util.*; import java.util.stream.Collectors; +import static com.supervision.police.service.impl.ModelRecordTypeServiceImpl.buildTripleInfo; + @Slf4j @Service @RequiredArgsConstructor @@ -185,6 +188,15 @@ public class NotePromptServiceImpl extends ServiceImpl notePromptTypeRels = notePromptTypeRelService.list(new LambdaQueryWrapper().eq(NotePromptTypeRel::getPromptId, notePrompt.getId())); + if (notePromptTypeRels != null && !notePromptTypeRels.isEmpty()) { + notePromptDTO.setTypeList(notePromptTypeRels.stream().map(NotePromptTypeRel::getTypeId).collect(Collectors.toList())); + } + String evidenceCategoryId = notePromptDTO.getEvidenceCategoryId(); if (StringUtils.isNotEmpty(evidenceCategoryId)) { EvidenceCategory category = evidenceCategoryService.getById(evidenceCategoryId);