dify调整代码提交

src/main/java/com/jeeplus/modules/knowledgeSharing/dify/DifyApiClient.java

@@ -26,6 +26,8 @@ import java.io.InputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * 知识分享Controller
@@ -40,7 +42,7 @@ public class DifyApiClient {
     //private static final String API_URL = "http://localhost/v1/chat-messages"; // 替换为实际的 Dify API 端点
 
     //开发
-    private static final String API_KEY = "dataset-TinelGDdnlrXJPyFe38iA0Zh";
+    private static final String API_KEY = "dataset-l14k3yI7Pcxh39AJYCEY9Cin";
     private static final String API_URL = "http://3081089em4.wicp.vip:21548/v1/datasets";
 
 
@@ -358,11 +360,11 @@ public class DifyApiClient {
                 }
             } catch (Exception e) {
                 System.out.println(e.getMessage());
-                throw new RuntimeException(e);
+                return new JSONObject((Map<?, ?>) null);
             }
         } catch (Exception e) {
             System.out.println(e.getMessage());
-            throw new RuntimeException(e);
+            return new JSONObject((Map<?, ?>) null);
         }
     }
 

src/main/java/com/jeeplus/modules/knowledgeSharing/dify/KnowledgeDifyController.java

@@ -41,33 +41,33 @@ public class KnowledgeDifyController extends BaseController {
             model.addAttribute("columnId", knowledgeSharingInfo.getColumnId());
         }
         model.addAttribute("typeInfoList", typeInfoList);
-        model.addAttribute("difySrc", difySrc + "LlXD0YzBLGPKBlqb");
+        model.addAttribute("difySrc", difySrc + "Yl0XaVnhykBRU2Xl");
         //根据不同的栏目id 跳转不同的dify聊天窗口
         if (StringUtils.isNotBlank(knowledgeSharingInfo.getColumnId())) {
             switch (knowledgeSharingInfo.getColumnId()){
                 case "1":   //学习园地
-                    model.addAttribute("difySrc", difySrc + "6A7qteLy6CtDSHVf");
+                    model.addAttribute("difySrc", difySrc + "MAXa7BI5d7BtdXr1");
                     break;
                 case "9":   //国家标准及规范
-                    model.addAttribute("difySrc", difySrc + "2NV1GQvNY9IxM1lA");
+                    model.addAttribute("difySrc", difySrc + "HhQuWqY9A4mOGGzn");
                     break;
                 case "7":   //行业标准及规范
-                    model.addAttribute("difySrc", difySrc + "vKk88XwbCBfgaiQH");
+                    model.addAttribute("difySrc", difySrc + "L9vkpQTFx8f9wPpO");
                     break;
                 case "8":   //公司内部发文和通知
-                    model.addAttribute("difySrc", difySrc + "V7fLUXpZ4w73ftgG");
+                    model.addAttribute("difySrc", difySrc + "vjEZXkfISzHB5j2Q");
                     break;
                 case "2":   //请教专家
-                    model.addAttribute("difySrc", difySrc + "jpxMOy6u9zXQ5Uuz");
+                    model.addAttribute("difySrc", difySrc + "TAQ8Gs4mD7xYDB1j");
                     break;
                 case "6":   //案例讨论
-                    model.addAttribute("difySrc", difySrc + "LzY2NuohCsayFwmG");
+                    model.addAttribute("difySrc", difySrc + "HLFucu0newO1Wvug");
                     break;
-                case "10":   //项目案例资料
-                    model.addAttribute("difySrc", difySrc + "J2a3lQCLhywC8vYV");
+                case "10":   //材价库
+                    model.addAttribute("difySrc", difySrc + "oseq5jPj6Y4rYCz6");
                     break;
                 default:
-                    model.addAttribute("difySrc", difySrc + "LlXD0YzBLGPKBlqb");
+                    model.addAttribute("difySrc", difySrc + "Yl0XaVnhykBRU2Xl");
                     break;
             }
         }

src/main/java/com/jeeplus/modules/knowledgeSharing/service/KnowledgeSharingDetailsService.java

@@ -89,19 +89,23 @@ public class KnowledgeSharingDetailsService extends CrudService<KnowledgeSharing
             //判断文件是否同步至dify
             String nameOnly = clientAttachment.getAttachmentName().substring(0, clientAttachment.getAttachmentName().lastIndexOf("."));
             JSONObject docItem = DifyApiClient.findKnowledgeBaseById(1, 999, datasetId, nameOnly);
-            JSONArray data = docItem.getJSONArray("data");
-            List<KnowledgeBaseDoc> knowledgeBaseDocArrayList = JSON.parseArray(data.toString(), KnowledgeBaseDoc.class);
-            if (knowledgeBaseDocArrayList != null && !knowledgeBaseDocArrayList.isEmpty()) {
-                clientAttachment.setSyncDifySync("1");
-            } else {
-                clientAttachment.setSyncDifySync("0");
-            }
+            if(docItem.isNull("data")){
+
+            }else{
+                JSONArray data = docItem.getJSONArray("data");
+                List<KnowledgeBaseDoc> knowledgeBaseDocArrayList = JSON.parseArray(data.toString(), KnowledgeBaseDoc.class);
+                if (knowledgeBaseDocArrayList != null && !knowledgeBaseDocArrayList.isEmpty()) {
+                    clientAttachment.setSyncDifySync("1");
+                } else {
+                    clientAttachment.setSyncDifySync("0");
+                }
 
-            if (clientAttachment.getCollectFlag().equals("1")) {
-                for (Workattachment workattachment : knowledgeSharingInfo.getWorkAttachments()) {
-                    if (clientAttachment.getId().equals(workattachment.getId())) {
-                        workattachment.setCollectFlag("1");
-                        break;
+                if (clientAttachment.getCollectFlag().equals("1")) {
+                    for (Workattachment workattachment : knowledgeSharingInfo.getWorkAttachments()) {
+                        if (clientAttachment.getId().equals(workattachment.getId())) {
+                            workattachment.setCollectFlag("1");
+                            break;
+                        }
                     }
                 }
             }
@@ -158,7 +162,7 @@ public class KnowledgeSharingDetailsService extends CrudService<KnowledgeSharing
                 columnName = "案例讨论";
                 break;
             case "10":
-                columnName = "项目案例资料";
+                columnName = "材价库";
                 break;
             default:
                 columnName = "学习园地";
@@ -177,7 +181,7 @@ public class KnowledgeSharingDetailsService extends CrudService<KnowledgeSharing
      * 根据id获取dify的分类id
      */
     public String getTypeIdByCaseBase(String columnId) throws Exception {
-        String columnName = "项目案例资料";
+        String columnName = "材价库";
         KnowledgeBase knowledgeBase = new KnowledgeBase();
         knowledgeBase.setName(columnName);
         JSONObject jsonObject = DifyApiClient.selectKnowledgeBaseList(1, 999, knowledgeBase);

src/main/java/com/jeeplus/modules/knowledgeSharing/web/KnowledgeBaseController.java

@@ -84,33 +84,33 @@ public class KnowledgeBaseController {
         String difySrc = "http://3081089em4.wicp.vip:21548/chatbot/";
 
         model.addAttribute("columnId", knowledgeSharingInfo.getColumnId());
-        model.addAttribute("difySrc", difySrc + "LlXD0YzBLGPKBlqb");
+        model.addAttribute("difySrc", difySrc + "Yl0XaVnhykBRU2Xl");
         //根据不同的栏目id 跳转不同的dify聊天窗口
         if (StringUtils.isNotBlank(knowledgeSharingInfo.getColumnId())) {
             switch (knowledgeSharingInfo.getColumnId()){
                 case "1":   //学习园地
-                    model.addAttribute("difySrc", difySrc + "6A7qteLy6CtDSHVf");
+                    model.addAttribute("difySrc", difySrc + "MAXa7BI5d7BtdXr1");
                     break;
                 case "9":   //国家标准及规范
-                    model.addAttribute("difySrc", difySrc + "2NV1GQvNY9IxM1lA");
+                    model.addAttribute("difySrc", difySrc + "HhQuWqY9A4mOGGzn");
                     break;
                 case "7":   //行业标准及规范
-                    model.addAttribute("difySrc", difySrc + "vKk88XwbCBfgaiQH");
+                    model.addAttribute("difySrc", difySrc + "L9vkpQTFx8f9wPpO");
                     break;
                 case "8":   //公司内部发文和通知
-                    model.addAttribute("difySrc", difySrc + "V7fLUXpZ4w73ftgG");
+                    model.addAttribute("difySrc", difySrc + "vjEZXkfISzHB5j2Q");
                     break;
                 case "2":   //请教专家
-                    model.addAttribute("difySrc", difySrc + "jpxMOy6u9zXQ5Uuz");
+                    model.addAttribute("difySrc", difySrc + "TAQ8Gs4mD7xYDB1j");
                     break;
                 case "6":   //案例讨论
-                    model.addAttribute("difySrc", difySrc + "LzY2NuohCsayFwmG");
+                    model.addAttribute("difySrc", difySrc + "HLFucu0newO1Wvug");
                     break;
-                case "10":   //项目案例资料
-                    model.addAttribute("difySrc", difySrc + "J2a3lQCLhywC8vYV");
+                case "10":   //材价库
+                    model.addAttribute("difySrc", difySrc + "oseq5jPj6Y4rYCz6");
                     break;
                 default:
-                    model.addAttribute("difySrc", difySrc + "LlXD0YzBLGPKBlqb");
+                    model.addAttribute("difySrc", difySrc + "Yl0XaVnhykBRU2Xl");
                     break;
             }
         }

src/main/java/com/jeeplus/modules/sys/web/WorkattachmentController.java

@@ -402,7 +402,7 @@ public class WorkattachmentController extends BaseController {
 						columnName = "案例讨论";
 						break;
 					case "10":
-						columnName = "项目案例资料";
+						columnName = "材价库";
 						break;
 					default:
 						columnName = "学习园地";

src/main/webapp/webpage/modules/sys/sysIndex.jsp

@@ -22,13 +22,13 @@
 <%-- 添加dify AI对话窗口 --%>
     <script>
         window.difyChatbotConfig = {
-            token: 'LlXD0YzBLGPKBlqb',
+            token: 'Yl0XaVnhykBRU2Xl',
             baseUrl: 'http://3081089em4.wicp.vip:21548'
         }
     </script>
     <script
             src="http://3081089em4.wicp.vip:21548/embed.min.js"
-            id="LlXD0YzBLGPKBlqb"
+            id="Yl0XaVnhykBRU2Xl"
             defer>
     </script>
     <style>