20250910-理解技术交底书生成结果

src/main/java/cn/cslg/pas/common/utils/DataUtils.java

@@ -279,5 +279,17 @@ public class DataUtils {
       return  html;
     }
 
+    public static String getTextBeforeLastSignal(String input,String signal) {
+        if (input == null || input.isEmpty()) {
+            return input; // 处理空字符串或null值
+        }
+
+        int lastDotIndex = input.lastIndexOf(signal);
 
+        if (lastDotIndex == -1) {
+            return input; // 没有点号，返回整个字符串
+        }
+
+        return input.substring(0, lastDotIndex);
+    }
 }

src/main/java/cn/cslg/pas/service/dify/ConfessionSessionService.java

@@ -4,6 +4,7 @@ import cn.cslg.pas.common.model.cronModel.SystemFile;
 import cn.cslg.pas.common.model.dify.confessionSession.*;
 import cn.cslg.pas.common.model.dify.generateDiscoveryResult.UpdateDiscoveryResultDTO;
 import cn.cslg.pas.common.utils.CacheUtils;
+import cn.cslg.pas.common.utils.DataUtils;
 import cn.cslg.pas.common.utils.FormatUtil;
 import cn.cslg.pas.common.utils.LoginUtils;
 import cn.cslg.pas.domain.dify.AssoConfessionConversation;
@@ -66,7 +67,7 @@ public class ConfessionSessionService extends ServiceImpl<ConfessionSessionMappe
         } catch (Exception e) {
         }
         if (name != null && !name.isEmpty()) {
-            name = name.split("\\.")[0];
+            name = DataUtils.getTextBeforeLastSignal(name,".");
         }
         ConfessionSession confessionSession = new ConfessionSession();
         confessionSession.setGuid(guid);

src/main/java/cn/cslg/pas/service/dify/GenerateDiscoveryResultService.java

@@ -3,6 +3,7 @@ package cn.cslg.pas.service.dify;
 import cn.cslg.pas.common.model.dify.ChatMessageDTO;
 import cn.cslg.pas.common.model.dify.DifyChatMessageDTO;
 import cn.cslg.pas.common.model.dify.generateDiscoveryResult.DiscoryResultVO;
+import cn.cslg.pas.common.utils.LoginUtils;
 import cn.cslg.pas.domain.dify.ConfessionSession;
 import cn.cslg.pas.service.common.DifyService;
 import com.alibaba.fastjson2.JSONObject;
@@ -22,7 +23,8 @@ public class GenerateDiscoveryResultService {
     private String fileDownloadUrl;
     @Autowired
     private ConfessionSessionService confessionSessionService;
-
+    @Autowired
+    private LoginUtils loginUtils;
     public DiscoryResultVO generateResult(ChatMessageDTO chatMessageDTO) throws Exception {
         DiscoryResultVO discoryResultVO = null;
         Integer confessionSessionId = chatMessageDTO.getConfessionSessionId();
@@ -31,9 +33,9 @@ public class GenerateDiscoveryResultService {
         String fileId = confessionSession.getGuid();
         String path = fileDownloadUrl + fileId;
         String gInstructionKey = "app-ekzGTtvRnSq2aSqwZqKG5EH3";
-        Integer userId = 1;
+
         DifyChatMessageDTO difyChatMessageDTO = new DifyChatMessageDTO();
-        difyChatMessageDTO.setUser(userId.toString());
+        difyChatMessageDTO.setUser(loginUtils.getId().toString());
         difyChatMessageDTO.setResponseMode("blocking");
         difyChatMessageDTO.setQuery("内容结束");
 //        difyChatMessageDTO.setConversationId();

src/main/resources/application-dev.yml

@@ -92,5 +92,5 @@ DIFY:
   checkApiKey: aa
   cliamKey: app-jF3akhYKgljPLdpeIpTNbs6f
   gInstructionKey: app-7ImBmlr7kvBTSvBj1mTvgKyp
-  discoveryResultKey: app-ekzGTtvRnSq2aSqwZqKG5EH3
+  discoveryResultKey: app-G5gnZ4s7GlMEIft79fk7hUR7
   url: http://192.168.2.24/v1/