From 93f185dc3bda6de1928a0616b8a1550b3e81a35d Mon Sep 17 00:00:00 2001
From: PeterZhong <mail@peterzhong.site>
Date: Mon, 28 Jul 2025 23:36:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E8=A1=A8=E5=B7=A5=E5=85=B7=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore               |  2 +-
 client/tool/ArcGisPro.cs | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b22170..9616d92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
 ./vs/
 ./bin/
 ./obj/
-./Properties/launchSettings.json
+./Properties/
 *.sln.iml
 *.DotSettings
 *.dotCover
diff --git a/client/tool/ArcGisPro.cs b/client/tool/ArcGisPro.cs
index 8e2ce0a..4ae7166 100644
--- a/client/tool/ArcGisPro.cs
+++ b/client/tool/ArcGisPro.cs
@@ -137,8 +137,8 @@ public class ArcGisPro
         return result;
     }
 
-    [McpServerTool, Description("获取要素类的属性表内容，可以查看属性表中的至多前20条记录的内容")]
-    public static async Task<JsonRpcResultEntity> GetFeatureDatasetAttributeTable(string datasetPath, string dataName, string rowsLimit)
+    [McpServerTool, Description("获取要素类的属性表内容，可以查看属性表中的至多前20条记录的内容，传入Where子句筛选特定数据，例如“OBJECTID > 10”")]
+    public static async Task<JsonRpcResultEntity> GetFeatureDatasetAttributeTable(string datasetPath, string dataName, string whereClause)
     {
         JsonRpcResultEntity result = new JsonRpcResultEntity();
         await QueuedTask.Run(async () =>
@@ -147,7 +147,7 @@ public class ArcGisPro
             {
                 using Geodatabase gdb = new Geodatabase(new FileGeodatabaseConnectionPath(new Uri(datasetPath)));
                 FeatureClass featureClass = gdb.OpenDataset<FeatureClass>(dataName);
-                List<Dictionary<string, string>> attributeTable = await GetAttributeTableAsync(featureClass,Convert.ToInt32(rowsLimit));
+                List<Dictionary<string, string>> attributeTable = await GetAttributeTableAsync(featureClass,whereClause);
                 result = new JsonRpcSuccessEntity()
                 {
                     Id = 1,
@@ -170,15 +170,15 @@ public class ArcGisPro
         return result;
     }
     
-    private static async Task<List<Dictionary<string, string>>> GetAttributeTableAsync(FeatureClass featureClass,int limit = 5)
+    private static async Task<List<Dictionary<string, string>>> GetAttributeTableAsync(FeatureClass featureClass,String whereClause)
     {
-        if (limit > 20)
-            limit = 20;
+        int limit = 20;
         return await QueuedTask.Run(() =>
         {
             var result = new List<Dictionary<string, string>>();
-
-            using (var cursor = featureClass.Search())
+            QueryFilter queryFilter = new QueryFilter();
+            queryFilter.WhereClause = whereClause;
+            using (var cursor = featureClass.Search(queryFilter))
             {
                 int i = 0;
                 while (cursor.MoveNext())
@@ -198,7 +198,10 @@ public class ArcGisPro
 
                         // 处理 DBNull 值
                         if (value is DBNull)
-                            value = null;
+                            value = "";
+                        
+                        if (value == null)
+                            value = "";
 
                         record[field.Name] = value.ToString();
                     }