From 97f976bbc5afc633b3ca2bcb2807966f29a1e090 Mon Sep 17 00:00:00 2001 From: WangJing Date: Tue, 22 Jul 2025 16:48:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?"=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8F=8A=E8=AF=AD=E8=A8=80=E5=88=87=E6=8D=A2"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 91 + .../library/components/VabApp/index.vue | 2 +- chat-client/package-lock.json | 5571 ++++++++--------- chat-client/package.json | 1 + chat-client/src/i18n/index.ts | 4 +- chat-server/pom.xml | 13 + .../src/main/resources/application.yml | 2 +- web-server/.idea/compiler.xml | 6 +- web-server/.idea/jarRepositories.xml | 10 + web-server/.idea/misc.xml | 8 +- web-server/common/pom.xml | 16 + .../TEST-com.bjtds.common.CommonTest.xml | 41 +- web-server/eureka-server/pom.xml | 17 + web-server/face-proc/pom.xml | 2 + web-server/infrastructure/pom.xml | 15 + web-server/zuul-server/pom.xml | 15 + 16 files changed, 2996 insertions(+), 2818 deletions(-) create mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..1d970ef --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + {} + { + "isMigrated": true +} + + + + { + "associatedIndex": 5 +} + + + + { + "keyToString": { + "ModuleVcsDetector.initialDetectionPerformed": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.git.unshallow": "true", + "git-widget-placeholder": "main", + "last_opened_file_path": "D:/xiaotieAI/ai-manus", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.stylelint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.stylelint": "", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "project.structure.last.edited": "SDKs", + "project.structure.proportion": "0.0", + "project.structure.side.proportion": "0.2", + "settings.editor.selected.configurable": "reference.projectsettings.compiler.javacompiler", + "vue.rearranger.settings.migration": "true" + } +} + + + + + + + + + + 1753147269297 + + + + + + \ No newline at end of file diff --git a/chat-client/library/components/VabApp/index.vue b/chat-client/library/components/VabApp/index.vue index 7838832..cd56774 100644 --- a/chat-client/library/components/VabApp/index.vue +++ b/chat-client/library/components/VabApp/index.vue @@ -1,7 +1,7 @@ diff --git a/chat-server/src/main/java/com/bjtds/brichat/controller/PrologueController.java b/chat-server/src/main/java/com/bjtds/brichat/controller/PrologueController.java new file mode 100644 index 0000000..c7733f0 --- /dev/null +++ b/chat-server/src/main/java/com/bjtds/brichat/controller/PrologueController.java @@ -0,0 +1,51 @@ +package com.bjtds.brichat.controller; + +import com.bjtds.brichat.entity.sys.ApiKey; +import com.bjtds.brichat.entity.sys.PrologueQuestion; +import com.bjtds.brichat.entity.sys.SystemRemark; +import com.bjtds.brichat.service.PrologueService; +import com.bjtds.brichat.util.ResultUtils; +import com.netflix.discovery.converters.Auto; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +@Api(tags = "开场白配置") +@RestController +@Slf4j +@CrossOrigin(value = "*",maxAge = 3600) +@RequestMapping("/prologue") +public class PrologueController { + + @Autowired + private PrologueService prologueService; + + @GetMapping("/getRemark") + public ResultUtils getRemark(@RequestParam String chatType) { + SystemRemark systemRemark = prologueService.getRemark(chatType); + return ResultUtils.success(systemRemark); + } + + @PostMapping("/saveRemark") + public ResultUtils saveRemark(@RequestBody SystemRemark remark) { + return ResultUtils.success(prologueService.saveOrUpdate(remark)); + } + + @GetMapping("/getRecommendations") + public ResultUtils getRecommendations(@RequestParam String chatType) { + List questions = prologueService.getRecommendations(chatType); + return ResultUtils.success(questions); + } + + @DeleteMapping("/deleteRecommendation") + public ResultUtils deleteRecommendation(@RequestParam Integer id) { + return ResultUtils.success(prologueService.deleteRecommendQuestionById(id)); + } + +} diff --git a/chat-server/src/main/java/com/bjtds/brichat/entity/sys/PrologueQuestion.java b/chat-server/src/main/java/com/bjtds/brichat/entity/sys/PrologueQuestion.java new file mode 100644 index 0000000..df1db49 --- /dev/null +++ b/chat-server/src/main/java/com/bjtds/brichat/entity/sys/PrologueQuestion.java @@ -0,0 +1,25 @@ +package com.bjtds.brichat.entity.sys; + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class PrologueQuestion { + private Integer id; + + // 聊天类型（1 表示诊断助手，2 表示通用问答...） + private String chatType; + + // 推荐问题内容 + private String questionContent; + + // 更新时间 + private LocalDateTime updatedAt; + +} diff --git a/chat-server/src/main/java/com/bjtds/brichat/entity/sys/SystemRemark.java b/chat-server/src/main/java/com/bjtds/brichat/entity/sys/SystemRemark.java new file mode 100644 index 0000000..d095359 --- /dev/null +++ b/chat-server/src/main/java/com/bjtds/brichat/entity/sys/SystemRemark.java @@ -0,0 +1,25 @@ +package com.bjtds.brichat.entity.sys; + +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor + +public class SystemRemark { + private Integer id; + + // 聊天类型（1 表示诊断助手，2 表示通用问答...） + private String chatType; + + // 开场白内容 + private String content; + + // 更新时间 + private LocalDateTime updatedAt; +} diff --git a/chat-server/src/main/java/com/bjtds/brichat/mapper/opengauss/PrologueMapper.java b/chat-server/src/main/java/com/bjtds/brichat/mapper/opengauss/PrologueMapper.java new file mode 100644 index 0000000..bfc933c --- /dev/null +++ b/chat-server/src/main/java/com/bjtds/brichat/mapper/opengauss/PrologueMapper.java @@ -0,0 +1,19 @@ +package com.bjtds.brichat.mapper.opengauss; + +import com.bjtds.brichat.entity.sys.PrologueQuestion; +import com.bjtds.brichat.entity.sys.SystemRemark; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface PrologueMapper { + + SystemRemark findByChatType(String chatType); + + Boolean updateRemark(SystemRemark remark); + + List getQuestionsbyChatType(String chatType); + + Boolean deleteQuesById(Integer id); +} diff --git a/chat-server/src/main/java/com/bjtds/brichat/service/PrologueService.java b/chat-server/src/main/java/com/bjtds/brichat/service/PrologueService.java new file mode 100644 index 0000000..61ce143 --- /dev/null +++ b/chat-server/src/main/java/com/bjtds/brichat/service/PrologueService.java @@ -0,0 +1,18 @@ +package com.bjtds.brichat.service; + + +import com.bjtds.brichat.entity.sys.PrologueQuestion; +import com.bjtds.brichat.entity.sys.SystemRemark; + +import java.util.List; + +public interface PrologueService { + + SystemRemark getRemark(String chatType); + + Boolean saveOrUpdate(SystemRemark remark); + + List getRecommendations(String chatType); + + Boolean deleteRecommendQuestionById(Integer id); +} diff --git a/chat-server/src/main/java/com/bjtds/brichat/service/impl/PrologueServiceImpl.java b/chat-server/src/main/java/com/bjtds/brichat/service/impl/PrologueServiceImpl.java new file mode 100644 index 0000000..0db08c8 --- /dev/null +++ b/chat-server/src/main/java/com/bjtds/brichat/service/impl/PrologueServiceImpl.java @@ -0,0 +1,45 @@ +package com.bjtds.brichat.service.impl; + +import com.bjtds.brichat.entity.sys.PrologueQuestion; +import com.bjtds.brichat.entity.sys.SystemRemark; +import com.bjtds.brichat.mapper.opengauss.PrologueMapper; +import com.bjtds.brichat.service.PrologueService; +import com.netflix.discovery.converters.Auto; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +@Slf4j +@Service +public class PrologueServiceImpl implements PrologueService { + + @Autowired + private PrologueMapper prologueMapper; + + @Override + public SystemRemark getRemark(String chatType) { + return prologueMapper.findByChatType(chatType); + } + + @Override + public Boolean saveOrUpdate(SystemRemark remark) { + SystemRemark re = new SystemRemark(); + re.setContent(remark.getContent()); + re.setChatType(remark.getChatType()); + re.setUpdatedAt(LocalDateTime.now()); + return prologueMapper.updateRemark(re); + } + + @Override + public List getRecommendations(String chatType) { + return prologueMapper.getQuestionsbyChatType(chatType); + } + + @Override + public Boolean deleteRecommendQuestionById(Integer id) { + return prologueMapper.deleteQuesById(id); + } +} diff --git a/chat-server/src/main/resources/application-beijing.yml b/chat-server/src/main/resources/application-beijing.yml index d875e11..b8f4057 100644 --- a/chat-server/src/main/resources/application-beijing.yml +++ b/chat-server/src/main/resources/application-beijing.yml @@ -48,4 +48,4 @@ dify: email: bjtds@bjtds.com # 请替换为实际的 Dify 服务邮箱，若不需要调用 server相关接口可不填 password: 123456Aa # 请替换为实际的 Dify 服务密码，若不需要调用 server相关接口可不填 dataset: - api-key: ${dify-dataset-api-key:dataset-0Hij9IwoWYbJe1vvwVh8y7DS} # 请替换为实际的知识库api-key, 若不需要调用知识库可不填 \ No newline at end of file + api-key: ${dify-dataset-api-key:dataset-zVa4uJBUem96P19o8iBtyihQ} # 请替换为实际的知识库api-key, 若不需要调用知识库可不填 \ No newline at end of file diff --git a/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/PrologueMapper.xml b/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/PrologueMapper.xml new file mode 100644 index 0000000..ec7e8c6 --- /dev/null +++ b/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/PrologueMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + update bripg.t_chat_prologue + set content= #{content} , updated_at =#{updatedAt} + where chat_type = #{chatType} + + + DELETE FROM bripg.t_chat_recommendations + WHERE id = #{id} + + + + + \ No newline at end of file diff --git a/web-server/infrastructure/src/main/resources/application-opengauss.yml b/web-server/infrastructure/src/main/resources/application-opengauss.yml index 74404dc..c7b8c2e 100644 --- a/web-server/infrastructure/src/main/resources/application-opengauss.yml +++ b/web-server/infrastructure/src/main/resources/application-opengauss.yml @@ -13,7 +13,7 @@ spring: # url: jdbc:opengauss://${db-host:192.168.8.241}:${db-port:15000}/${db-name:bridb} # username: ${db-username:bripg} # password: ${db-passwd:Chuangrui139*} - url: jdbc:opengauss://${db-host:192.168.8.253}:${db-port:6600}/${db-name:bridb} + url: jdbc:opengauss://${db-host:192.168.1.211}:${db-port:6600}/${db-name:bridb} username: ${db-username:bripg} password: ${db-passwd:Chuangrui139*} servlet: diff --git a/web-server/zuul-server/src/main/resources/application-opengauss.yml b/web-server/zuul-server/src/main/resources/application-opengauss.yml index 9616618..797405c 100644 --- a/web-server/zuul-server/src/main/resources/application-opengauss.yml +++ b/web-server/zuul-server/src/main/resources/application-opengauss.yml @@ -17,7 +17,7 @@ spring: # password: ${db-passwd:Chuangrui139*} # #pg版本 - url: jdbc:opengauss://${db-host:192.168.8.253}:${db-port:6600}/${db-name:bridb} + url: jdbc:opengauss://${db-host:192.168.1.211}:${db-port:6600}/${db-name:bridb} username: ${db-username:bripg} password: ${db-passwd:Chuangrui139*} # hikari: