修改DCS模板

ask-data-ai/ask-data-ai-biz/src/main/java/com/ask/tools/ExcelTools.java

@@ -124,7 +124,7 @@ public class ExcelTools {
         return jsonObject.toString();
     }
 
-    @Tool(description = "获取天津智深DCS卡件日报")
+    @Tool(description = "获取天津智深DCS卡件日报", returnDirect = true)
     public String getDcsFile(@ToolParam(description = "时间(yyyy-M-d)") String dateStr) {
 
         var ref = new Object() {
@@ -132,15 +132,15 @@ public class ExcelTools {
                     "\n" +
                             "| 产线  | 计划产量 | 实际产量 | 成品率 |\n" +
                             "| --- | --- | --- | --- |\n" +
-                            "| iICTS | @天津智深数据.iICTS_MoQty | @天津智深数据.iICTS_CompletionQty | @天津智深数据.iICTS_OKRate |\n" +
-                            "| iAS | @天津智深数据.日iAS计划数量 | @天津智深数据.iAS_CompletionQty | @天津智深数据.iAS_OKRate |\n" +
-                            "| iSMTS | @天津智深数据.iSMTS_MoQty | @天津智深数据.iSMTS_CompletionQty | @天津智深数据.iSMTS_OKRate |\n" +
-                            "| iDIPS | @天津智深数据.iDIPS_MoQty | @天津智深数据.iDIPS_CompletionQty | @天津智深数据.iDIPS_OKRate |\n" +
-                            "| iFCTS | @天津智深数据.iFCTS_MoQty | @天津智深数据.iFCTS_CompletionQty | @天津智深数据.iFCTS_OKRate |\n" +
-                            "| iCCS | @天津智深数据.iCCS_MoQty | @天津智深数据.iCCS_CompletionQty | @天津智深数据.iDIPS_OKRate |\n" +
-                            "| iPS | @天津智深数据.iPS_MoQty | @天津智深数据.iPS_CompletionQty | \\-  |\n" +
-                            "| iBS | @天津智深数据.iBS_MoQty | @天津智深数据.iBS_CompletionQty | @天津智深数据.iBS_OKRate |\n" +
-                            "| **总计** | @天津智深数据.今日_PlanQty | @天津智深数据.今日生产成品 | \\-  |\n" +
+                            "| iICTS | iICTS_MoQty | iICTS_CompletionQty | iICTS_OKRate |\n" +
+                            "| iAS | 日iAS计划数量 | iAS_CompletionQty | iAS_OKRate |\n" +
+                            "| iSMTS | iSMTS_MoQty | iSMTS_CompletionQty | iSMTS_OKRate |\n" +
+                            "| iDIPS | iDIPS_MoQty | iDIPS_CompletionQty | iDIPS_OKRate |\n" +
+                            "| iFCTS | iFCTS_MoQty | iFCTS_CompletionQty | iFCTS_OKRate |\n" +
+                            "| iCCS | iCCS_MoQty | iCCS_CompletionQty | iDIPS_OKRate |\n" +
+                            "| iPS | iPS_MoQty | iPS_CompletionQty | \\-  |\n" +
+                            "| iBS | iBS_MoQty | iBS_CompletionQty | iBS_OKRate |\n" +
+                            "| **总计** | 今日_PlanQty | 今日生产成品 | \\-  |\n" +
                             "\n" +
                             "下载连接：[@fileName](@fileUrl)";
         };
@@ -253,17 +253,11 @@ public class ExcelTools {
 
         Map<String, Double> result = askHistoryCollectDataList.stream()
                 .collect(Collectors.toMap(
-                        AskHistoryCollectData::getPath, // 获取 path 作为键
-                        AskHistoryCollectData::getValue, // 获取 value 作为值
-                        (existingValue, newValue) -> existingValue // 如果有重复的键，这里决定如何处理。这里选择保留现有的值。
+                        data -> data.getPath().replace("@天津智深数据.", ""), // 去掉 @
+                        AskHistoryCollectData::getValue,
+                        (existingValue, newValue) -> existingValue // 保留第一个值
                 ));
-        params.forEach(param -> {
-            paramMap.put(param, "");
-            if (result.containsKey(param)) {
-                paramMap.put(param, result.get(param));
-            }
-
-        });
+        paramMap.putAll(result);
         return paramMap;
     }