临时提交

slibra-admin/src/main/java/com/slibra/web/controller/business/GRPCController.java

@@ -74,13 +74,15 @@ public class GRPCController extends BaseController {
      * 调⽤大模型决策接口
      * @return
      */
-    @PostMapping(value = "/decisionStream")
-    public void decisionStream(HttpServletResponse response, @RequestBody ChatReq chatReq)
+    @GetMapping(value = "/decisionStream")
+//    public void decisionStream(HttpServletResponse response, @RequestBody ChatReq chatReq)
+    public void decisionStream(HttpServletResponse response,  ChatReq chatReq)
     {
         log.info("进入了调⽤大模型决策接口");
         StringBuilder sb = new StringBuilder();
-        String feedback = chatReq.getFeedback();
+        //决策和问答不一样 没有历史的概念 所以sessionId都是新的  次数都是1
         String sessionId = IdUtils.simpleUUID();
+        String feedback = chatReq.getFeedback();
         // 获取输出流
         OutputStream outputStream = null;
         ManagedChannel channel = null;
@@ -118,7 +120,18 @@ public class GRPCController extends BaseController {
             System.out.println(sb.toString());
             //保存聊天记录
             if(!"{}".equals(feedback)){//
-
+                //将问答更新到数据库中
+                chatReq.setSessionId(sessionId);
+                chatReq.setAnswer(sb.toString());
+                chatReq.setType(0);//0问答 1决策
+                chatReq.setShowVal("");//todo 这个需要单独处理
+                chatReq.setCounts(1);//问答次数
+                String userId = SecurityUtils.getUserId().toString();
+                String username = SecurityUtils.getUsername();
+                chatReq.setUserId(userId);
+                chatReq.setCreateBy(username);
+                chatReq.setCreateTime(DateUtils.getNowDate());
+                this.chatRecordMapper.insertTXinyiChatRecord(chatReq);
             }
         // 关闭输出流
         try {
@@ -271,8 +284,9 @@ public class GRPCController extends BaseController {
      * ⼤模型问答的调⽤参数
      * @return
      */
-    @PostMapping(value = "/inferStreamCommon")
-    public void inferStreamCommon(HttpServletResponse response, @RequestBody ChatReq chatReq)
+    @GetMapping(value = "/inferStreamCommon")
+//    public void inferStreamCommon(HttpServletResponse response, @RequestBody ChatReq chatReq)
+    public void inferStreamCommon(HttpServletResponse response, ChatReq chatReq)
     {
         log.info("进入了调⽤⼤模型问答的调⽤参数");
         StringBuilder sb = new StringBuilder();
@@ -328,8 +342,9 @@ public class GRPCController extends BaseController {
      * 调⽤大模型决策接口-第二次
      * @return
      */
-    @PostMapping(value = "/decisionStreamTwo")
-    public void decisionStreamTwo(HttpServletResponse response, @RequestBody ChatReq chatReq)
+    @GetMapping(value = "/decisionStreamTwo")
+//    public void decisionStreamTwo(HttpServletResponse response, @RequestBody ChatReq chatReq)
+    public void decisionStreamTwo(HttpServletResponse response)
     {
         log.info("进入了调⽤大模型决策接口-第二次");
         StringBuilder sb = new StringBuilder();

slibra-quartz/src/main/java/com/slibra/quartz/task/RyTask.java

@@ -79,7 +79,7 @@ public class RyTask
         lastDateHour = lastDateHour + ":00";
         //开始时间
         LocalDateTime startTime = LocalDateTime.parse(lastDateHour.replaceAll("/", "-").replace(" ", "T"));
-        startTime = startTime.plusMinutes(1L);//加一分钟  从上次最后一条记录的下一分钟开始
+        startTime = startTime.plusMinutes(60L);//加一分钟  从上次最后一条记录的下一分钟开始
         /*LocalDateTime startTime = LocalDateTime.parse("2024-02-26T00:00:00");
         LocalDateTime endTime = LocalDateTime.parse("2024-02-27T00:00:00");*/