From cc372bc7eab30002a21124074c8f3359869637e1 Mon Sep 17 00:00:00 2001 From: wangys <3401275564@qq.com> Date: Fri, 19 Dec 2025 17:17:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../database/postgres/sql/createTableAI.sql | 4 ++-- .../postgres/sql/createTableWorkcase.sql | 4 ++-- .../ai/service/impl/AgentChatServiceImpl.java | 8 ++++---- .../main/resources/mapper/TbAgentMapper.xml | 10 +++++----- .../main/java/org/xyzh/api/ai/dto/TbAgent.java | 2 +- .../main/java/org/xyzh/api/ai/vo/AgentVO.java | 2 +- urbanLifelineServ/workcase/pom.xml | 18 +++++++++++++++++- 7 files changed, 32 insertions(+), 16 deletions(-) diff --git a/urbanLifelineServ/.bin/database/postgres/sql/createTableAI.sql b/urbanLifelineServ/.bin/database/postgres/sql/createTableAI.sql index 38df93d9..376e2842 100644 --- a/urbanLifelineServ/.bin/database/postgres/sql/createTableAI.sql +++ b/urbanLifelineServ/.bin/database/postgres/sql/createTableAI.sql @@ -9,7 +9,7 @@ CREATE TABLE ai.tb_agent( description VARCHAR(500) DEFAULT NULL, -- 智能体描述 link VARCHAR(500) DEFAULT NULL, -- 智能体url api_key VARCHAR(500) NOT NULL, -- dify智能体APIKEY - outer BOOLEAN DEFAULT false, -- 是否是对外智能体，未登录可用 + is_outer BOOLEAN DEFAULT false, -- 是否是对外智能体，未登录可用 introduce VARCHAR(500) NOT NULL, -- 引导词 prompt_cards JSONB DEFAULT '[]'::jsonb, -- 提示卡片数组 [{file_id:'', prompt:''}] category VARCHAR(50) NOT NULL, -- 分类 @@ -33,7 +33,7 @@ CREATE TABLE ai.tb_chat( user_id VARCHAR(50) NOT NULL, -- 用户ID user_type BOOLEAN NOT NULL DEFAULT true, -- 用户类型 true-系统内部人员 false-系统外部人员 title VARCHAR(500) NOT NULL, -- 对话标题 - channel VARCHAR(50) DEFAULT 'agent' -- 对话渠道 agent、wechat + channel VARCHAR(50) DEFAULT 'agent', -- 对话渠道 agent、wechat create_time TIMESTAMPTZ NOT NULL DEFAULT now(), -- 创建时间 update_time TIMESTAMPTZ DEFAULT NULL, -- 更新时间 delete_time TIMESTAMPTZ DEFAULT NULL, -- 删除时间 diff --git a/urbanLifelineServ/.bin/database/postgres/sql/createTableWorkcase.sql b/urbanLifelineServ/.bin/database/postgres/sql/createTableWorkcase.sql index 6bc200d3..83631b70 100644 --- a/urbanLifelineServ/.bin/database/postgres/sql/createTableWorkcase.sql +++ b/urbanLifelineServ/.bin/database/postgres/sql/createTableWorkcase.sql @@ -38,7 +38,7 @@ CREATE TABLE workcase.tb_workcase( type VARCHAR(50) NOT NULL, -- 故障类型 device VARCHAR(50) NOT NULL, -- 设备名称 device_code VARCHAR(50) NOT NULL, -- 设备代码 - imgs VARCHAR(50)[] DEFAULT '[]', -- 工单图片id + imgs VARCHAR(50)[] DEFAULT '{}', -- 工单图片id emergency VARCHAR(50) NOT NULL DEFAULT 'normal', -- 紧急程度 normal-普通 emergency-紧急 status VARCHAR(50) NOT NULL DEFAULT 'pending', -- 状态 pending-待处理 processing-处理中 done-已完成 processor VARCHAR(50) DEFAULT NULL, -- 处理人 @@ -60,7 +60,7 @@ CREATE TABLE workcase.tb_workcase_process( process_id VARCHAR(50) NOT NULL, -- 过程id action VARCHAR(50) NOT NULL, -- 动作 info：记录，assign：指派，redeploy：转派，repeal：撤销，finish：完成 message VARCHAR(200) DEFAULT NULL, -- 消息 - files VARCHAR(50)[] DEFAULT '[]', -- 携带文件 + files VARCHAR(50)[] DEFAULT '{}', -- 携带文件 processor VARCHAR(50) DEFAULT NULL, -- 处理人（指派、转派专属） remark VARCHAR(500) DEFAULT NULL, -- 备注 creator VARCHAR(50) NOT NULL, -- 过程发起人 diff --git a/urbanLifelineServ/ai/src/main/java/org/xyzh/ai/service/impl/AgentChatServiceImpl.java b/urbanLifelineServ/ai/src/main/java/org/xyzh/ai/service/impl/AgentChatServiceImpl.java index fb28044b..3dedf247 100644 --- a/urbanLifelineServ/ai/src/main/java/org/xyzh/ai/service/impl/AgentChatServiceImpl.java +++ b/urbanLifelineServ/ai/src/main/java/org/xyzh/ai/service/impl/AgentChatServiceImpl.java @@ -90,7 +90,7 @@ public class AgentChatServiceImpl implements AgentChatService { private Boolean isOuterAgent(String agentId){ // 智能体必须是outer ResultDomain agentResult = agentService.selectAgentById(agentId); - if(!agentResult.getSuccess()|| agentResult.getData() == null || !agentResult.getData().getOuter()){ + if(!agentResult.getSuccess()|| agentResult.getData() == null || !agentResult.getData().getIsOuter()){ return false; } return true; @@ -101,7 +101,7 @@ public class AgentChatServiceImpl implements AgentChatService { @Override @Transactional(rollbackFor = Exception.class) public ResultDomain createChat(TbChat chat) { - // 如果是来客（userType=false），校验智能体是否是 outer + // 如果是来客（userType=false），校验智能体是否是 isOuter if(!chat.getUserType()){ if(!isOuterAgent(chat.getAgentId())){ return ResultDomain.failure("智能体不可用"); @@ -235,7 +235,7 @@ public class AgentChatServiceImpl implements AgentChatService { // 1. 校验智能体 ResultDomain agentResult = agentService.selectAgentById(agentId); - if (!agentResult.getSuccess() || agentResult.getData() == null || !agentResult.getData().getOuter()) { + if (!agentResult.getSuccess() || agentResult.getData() == null || !agentResult.getData().getIsOuter()) { return ResultDomain.failure("智能体不存在或不可用"); } TbAgent agent = agentResult.getData(); @@ -409,7 +409,7 @@ public class AgentChatServiceImpl implements AgentChatService { public ResultDomain stopChatMessageByTaskId(TbChat filter, String taskId) { // 1. 获取智能体 ResultDomain agentResult = agentService.selectAgentById(filter.getAgentId()); - if (!agentResult.getSuccess() || agentResult.getData() == null || !agentResult.getData().getOuter()) { + if (!agentResult.getSuccess() || agentResult.getData() == null || !agentResult.getData().getIsOuter()) { return ResultDomain.failure("智能体不存在"); } TbAgent agent = agentResult.getData(); diff --git a/urbanLifelineServ/ai/src/main/resources/mapper/TbAgentMapper.xml b/urbanLifelineServ/ai/src/main/resources/mapper/TbAgentMapper.xml index a79a1af3..97b97387 100644 --- a/urbanLifelineServ/ai/src/main/resources/mapper/TbAgentMapper.xml +++ b/urbanLifelineServ/ai/src/main/resources/mapper/TbAgentMapper.xml @@ -9,7 +9,7 @@ - + @@ -22,21 +22,21 @@ - optsn, agent_id, name, description, link, api_key, outer, introduce, prompt_cards, + optsn, agent_id, name, description, link, api_key, is_outer, introduce, prompt_cards, category, creator, updater, create_time, update_time, delete_time, deleted INSERT INTO ai.tb_agent ( optsn, agent_id, name, api_key, introduce, category - , outer + , is_outer , description , link , prompt_cards , creator ) VALUES ( #{optsn}, #{agentId}, #{name}, #{apiKey}, #{introduce}, #{category} - , #{outer} + , #{isOuter} , #{description} , #{link} , #{promptCards, typeHandler=org.xyzh.ai.handler.PromptCardsTypeHandler} @@ -51,7 +51,7 @@ description = #{description}, link = #{link}, api_key = #{apiKey}, - outer = #{outer}, + is_outer = #{isOuter}, introduce = #{introduce}, prompt_cards = #{promptCards, typeHandler=org.xyzh.ai.handler.PromptCardsTypeHandler}, category = #{category}, diff --git a/urbanLifelineServ/apis/api-ai/src/main/java/org/xyzh/api/ai/dto/TbAgent.java b/urbanLifelineServ/apis/api-ai/src/main/java/org/xyzh/api/ai/dto/TbAgent.java index 4afd97e8..6146d25c 100644 --- a/urbanLifelineServ/apis/api-ai/src/main/java/org/xyzh/api/ai/dto/TbAgent.java +++ b/urbanLifelineServ/apis/api-ai/src/main/java/org/xyzh/api/ai/dto/TbAgent.java @@ -30,7 +30,7 @@ public class TbAgent extends BaseDTO{ private String apiKey; @Schema(description = "是否是对外智能体，未登录可用") - private Boolean outer; + private Boolean isOuter; @Schema(description = "引导词") private String introduce; diff --git a/urbanLifelineServ/apis/api-ai/src/main/java/org/xyzh/api/ai/vo/AgentVO.java b/urbanLifelineServ/apis/api-ai/src/main/java/org/xyzh/api/ai/vo/AgentVO.java index 55c226be..c44a1e05 100644 --- a/urbanLifelineServ/apis/api-ai/src/main/java/org/xyzh/api/ai/vo/AgentVO.java +++ b/urbanLifelineServ/apis/api-ai/src/main/java/org/xyzh/api/ai/vo/AgentVO.java @@ -36,7 +36,7 @@ public class AgentVO extends BaseVO{ private String apiKey; @Schema(description = "是否是对外智能体，未登录可用") - private Boolean outer; + private Boolean isOuter; @Schema(description = "引导词") private String introduce; diff --git a/urbanLifelineServ/workcase/pom.xml b/urbanLifelineServ/workcase/pom.xml index 532f0911..dfcafead 100644 --- a/urbanLifelineServ/workcase/pom.xml +++ b/urbanLifelineServ/workcase/pom.xml @@ -12,7 +12,7 @@ org.xyzh workcase 1.0.0 - + jar 21 21 @@ -53,6 +53,16 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-logging + + + + + org.springframework.boot + spring-boot-starter-log4j2 org.apache.dubbo @@ -61,6 +71,12 @@ org.mybatis.spring.boot mybatis-spring-boot-starter + + + org.springframework.boot + spring-boot-starter-logging + + com.baomidou