diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeChat.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeChat.java index bef84732..7473cf25 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeChat.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeChat.java @@ -32,7 +32,7 @@ public class DashScopeChat { private final ChatClient chatClient; - private static final String DEFAULT_PROMPT = "你是一个博学的智能聊天助手,请根据用户提问回答!"; + private static final String DEFAULT_PROMPT = "你叫煤球,是一个博学的智能聊天助手,请根据用户提问回答!"; private static final String DEFAULT_FILE_DIR = System.getProperty("user.dir") + "/chat-memory"; @@ -96,7 +96,7 @@ public class DashScopeChat { } // 构建生成标题的提示词 String prompt = String.format(""" - 请为下面这段用户与AI的对话生成一个简短的标题(不超过10个字): + 请为下面这段用户与AI的对话生成一个简短的标题(不超过10个字),并且以陈述句的形式进行总结: 用户:%s AI:%s """, userMessage, aiResponse); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceImgServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceImgServiceImpl.java index 9bbf35f7..cf6a172a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceImgServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceImgServiceImpl.java @@ -218,26 +218,23 @@ public class OthYs7DeviceImgServiceImpl extends ServiceImpl levelList = violationLevelService.lambdaQuery() .in(HseViolationLevel::getProjectId, projectIds) .list(); - if (CollUtil.isEmpty(levelList)) { - log.error("未设置安全等级"); - return; - } Map> level = new HashMap<>(); - Map> levelMap = levelList.stream() - .collect(Collectors.groupingBy(HseViolationLevel::getProjectId)); - for (Map.Entry> entry : levelMap.entrySet()) { - List recognizerTypeEnums = entry.getValue().stream().map(l -> { - List levels = StringUtils.splitList(l.getViolationType()); - return RecognizerTypeEnum.listFromCodes(levels); - }).filter(CollUtil::isNotEmpty) - .flatMap(Collection::stream) - .distinct() - .toList(); - level.put(entry.getKey(), recognizerTypeEnums); + if (CollUtil.isNotEmpty(levelList)) { + Map> levelMap = levelList.stream() + .collect(Collectors.groupingBy(HseViolationLevel::getProjectId)); + for (Map.Entry> entry : levelMap.entrySet()) { + List recognizerTypeEnums = entry.getValue().stream().map(l -> { + List levels = StringUtils.splitList(l.getViolationType()); + return RecognizerTypeEnum.listFromCodes(levels); + }).filter(CollUtil::isNotEmpty) + .flatMap(Collection::stream) + .distinct() + .toList(); + level.put(entry.getKey(), recognizerTypeEnums); + } } if (CollUtil.isEmpty(level)) { log.error("未设置安全等级"); - return; } for (OthYs7DeviceImgCreateByCapture img : imgList) { OthYs7DeviceImg othYs7DeviceImg = new OthYs7DeviceImg(); @@ -253,9 +250,13 @@ public class OthYs7DeviceImgServiceImpl extends ServiceImpl recTypes = level.get(img.getProjectId()); + List recTypes = new ArrayList<>(); + if (CollUtil.isNotEmpty(level)) { + recTypes = level.get(img.getProjectId()); + } if (CollUtil.isEmpty(recTypes)) { - log.error("未设置安全等级"); + log.error("项目:{},未设置安全等级", img.getProjectId()); + saveList.add(othYs7DeviceImg); continue; } RecognizeVo recognizeVo = null; @@ -301,12 +302,14 @@ public class OthYs7DeviceImgServiceImpl extends ServiceImpl