From 1b603d3b281d022baed62967d7d7eba63b454ec2 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 29 十月 2022 16:06:31 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/all/BaseQueryService.java |   74 +++++++++++++++++++++++++++++-------
 1 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/lf/server/service/all/BaseQueryService.java b/src/main/java/com/lf/server/service/all/BaseQueryService.java
index e718b70..66d0589 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -1,10 +1,10 @@
 package com.lf.server.service.all;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lf.server.helper.AesHelper;
 import com.lf.server.helper.ClassHelper;
 import com.lf.server.helper.StringHelper;
+import com.lf.server.mapper.all.BasicMapper;
 import com.lf.server.mapper.all.GeomBaseMapper;
 import org.springframework.stereotype.Service;
 
@@ -20,17 +20,17 @@
      * @param name Mapper鍚�
      * @return BaseMapper
      */
-    public BaseMapper getBaseMapper(String name) {
+    public BasicMapper getBasicMapper(String name) {
         if (StringHelper.isEmpty(name)) {
             return null;
         }
 
         Object obj = ClassHelper.getBean(name.trim() + "Mapper");
-        if (!(obj instanceof BaseMapper)) {
+        if (!(obj instanceof BasicMapper)) {
             return null;
         }
 
-        return (BaseMapper) obj;
+        return (BasicMapper) obj;
     }
 
     /**
@@ -53,8 +53,10 @@
     }
 
     /**
-     * @param wrapper
-     * @param filter
+     * 娣诲姞杩囨护鏉′欢
+     *
+     * @param wrapper QueryWrapper
+     * @param filter  鍘熷杩囨护鏉′欢瀛楃涓�
      */
     public void addFilterWrapper(QueryWrapper wrapper, String filter) {
         if (StringHelper.isEmpty(filter)) {
@@ -75,11 +77,38 @@
             String field = 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, value);
+
+            addWrapper(wrapper, field, express, getObjectVal(value));
         }
     }
 
-    private void addWrapper(QueryWrapper wrapper, String field, String express, String value) {
+    /**
+     * 鑾峰彇鍊煎璞�
+     *
+     * @param value 鍊�
+     * @return 瀵硅薄
+     */
+    private Object getObjectVal(String value) {
+        if (StringHelper.isInteger(value)) {
+            return Long.parseLong(value);
+        }
+
+        if (StringHelper.isNumeric(value)) {
+            return Double.parseDouble(value);
+        }
+
+        return value.replace("'", "");
+    }
+
+    /**
+     * 娣诲姞鍖呰鍣�
+     *
+     * @param wrapper QueryWrapper
+     * @param field   瀛楁
+     * @param express 琛ㄨ揪寮�
+     * @param value   鍊�
+     */
+    private void addWrapper(QueryWrapper wrapper, String field, String express, Object value) {
         switch (express) {
             case "like":
                 wrapper.like(field, value);
@@ -108,18 +137,33 @@
     }
 
     /**
-     * 娣诲姞绌洪棿鏌ヨ鏉′欢
+     * 娣诲姞绌洪棿杩囨护鏉′欢
      *
-     * @param baseMapper 鐖禡apper
-     * @param wrapper    QueryWrapper
-     * @param wkt        WKT锛堣憲鍚嶆枃鏈級
-     * @param srid       绌洪棿寮曠敤鏍囪瘑绗�
+     * @param basicMapper 鐖禡apper
+     * @param wrapper     QueryWrapper
+     * @param wkt         WKT锛堣憲鍚嶆枃鏈級
+     * @param srid        绌洪棿寮曠敤鏍囪瘑绗�
      * @throws Exception 寮傚父
      */
-    public void addGeomWrapper(BaseMapper baseMapper, QueryWrapper wrapper, String wkt, Integer srid) throws Exception {
-        if (baseMapper instanceof GeomBaseMapper && !StringHelper.isEmpty(wkt) && srid != null) {
+    public void addGeomWrapper(BasicMapper basicMapper, QueryWrapper wrapper, String wkt, Integer srid) throws Exception {
+        if (basicMapper instanceof GeomBaseMapper && !StringHelper.isEmpty(wkt) && srid != null) {
             wkt = AesHelper.decrypt(wkt);
             wrapper.apply(String.format("ST_Intersects(geom, ST_PolygonFromText('%s', %d))", wkt, srid));
         }
     }
+
+    /**
+     * 鏍规嵁Mapper鑾峰彇琛ㄥ悕
+     *
+     * @param basicMapper Mapper
+     * @return 琛ㄥ悕
+     */
+    public String getTabName(BasicMapper basicMapper) {
+        Object obj = ClassHelper.createEntityByMapper(basicMapper);
+        if (obj == null) {
+            return null;
+        }
+
+        return null;
+    }
 }

--
Gitblit v1.9.3