From 8300bfcfd58e84d27163ba94b8e026cfcf4f90a6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 16 九月 2023 08:37:48 +0800
Subject: [PATCH] 添加坐标系初始化

---
 src/main/java/com/moon/server/service/all/BaseQueryService.java |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/moon/server/service/all/BaseQueryService.java b/src/main/java/com/moon/server/service/all/BaseQueryService.java
index cba44ef..8a3d016 100644
--- a/src/main/java/com/moon/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/moon/server/service/all/BaseQueryService.java
@@ -61,12 +61,30 @@
                 continue;
             }
 
-            String field = str.substring(0, start).trim();
+            String field = convertFiled(str.substring(0, start).trim());
             String express = str.substring(start + 1, end).trim().toLowerCase();
             String value = str.substring(end + 1).trim();
 
             addWrapper(wrapper, field, express, getObjectVal(express, value));
         }
+    }
+
+    /**
+     * 瀛楁杞崲
+     */
+    private String convertFiled(String field) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0, c = field.length(); i < c; i++) {
+            char ch = field.charAt(i);
+            if (Character.isUpperCase(ch)) {
+                sb.append('_');
+                sb.append(Character.toLowerCase(ch));
+            }else {
+                sb.append(ch);
+            }
+        }
+
+        return sb.toString();
     }
 
     /**
@@ -191,7 +209,7 @@
 
         Integer srid = basicMapper.selectSrid(tab);
         if (null == srid) {
-            return StaticData.I4490;
+            return StaticData.I104903;
         }
         redisService.put(key, srid, 5, TimeUnit.MINUTES);
 
@@ -265,17 +283,17 @@
     }
 
     @Override
-    public Integer selectTabsForCount(String tab, String field) {
+    public Integer selectTabsForCount(String tab, String typesFilter, String field) {
         tab = StringHelper.getLikeUpperStr(tab);
 
-        return baseQueryMapper.selectTabsForCount(tab, field);
+        return baseQueryMapper.selectTabsForCount(tab, typesFilter, field);
     }
 
     @Override
-    public List<TabEntity> selectTabsByPage(String tab, String field, String filters, Integer limit, Integer offset) {
+    public List<TabEntity> selectTabsByPage(String tab, String typesFilter, String field, String filters, Integer limit, Integer offset) {
         tab = StringHelper.getLikeUpperStr(tab);
 
-        return baseQueryMapper.selectTabsByPage(tab, field, filters, limit, offset);
+        return baseQueryMapper.selectTabsByPage(tab, typesFilter, field, filters, limit, offset);
     }
 
     @Override

--
Gitblit v1.9.3