From 88e2df19ba9d0b9414cd093b570e8d797959547e Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 06 四月 2023 15:36:26 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/all/BaseQueryController.java |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index dee265b..0736c5c 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lf.server.annotation.SysLog;
+import com.lf.server.entity.all.BaseGeoEntity;
 import com.lf.server.entity.all.ResponseMsg;
 import com.lf.server.entity.all.StaticData;
 import com.lf.server.entity.ctrl.DownloadReqEntity;
@@ -109,14 +110,15 @@
             @ApiImplicitParam(name = "wkt", value = "WKT锛堣憲鍚嶆枃鏈級", dataType = "String", paramType = "query", example = ""),
             //@ApiImplicitParam(name = "srid", value = "绌洪棿寮曠敤鏍囪瘑绗�", dataType = "Integer", paramType = "query", example = "4326"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1"),
-            @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10")
+            @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
+            @ApiImplicitParam(name = "hasGeom", value = "鏄�/鍚﹀寘鍚┖闂翠俊鎭�", dataType = "Integer", paramType = "query", example = "1")
     })
     @GetMapping(value = "/selectByPage")
     @PostMapping(value = "/selectByPage")
-    public ResponseMsg<List<Object>> selectByPage(String name, String depcode, String dirs, String filter, String wkt, Integer pageIndex, Integer pageSize) {
+    public ResponseMsg<List<Object>> selectByPage(String name, String depcode, String dirs, String filter, String wkt, Integer pageIndex, Integer pageSize, Integer hasGeom) {
         try {
             BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
-            if (baseMapper == null) {
+            if (null == baseMapper) {
                 return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
             }
 
@@ -132,13 +134,51 @@
                 wrapper.apply(dirs);
             }
 
+            boolean hasWkt = null != hasGeom && hasGeom > 0 && baseMapper instanceof GeomBaseMapper;
+            if (hasWkt) {
+                wrapper.select("ST_AsText(geom) as geom, *");
+            }
+
             Page<Object> page = new Page<>(pageIndex, pageSize);
             page.addOrder(OrderItem.desc("gid"));
             IPage<Object> paged = baseMapper.selectPage(page, wrapper);
+            if (hasWkt && null != paged.getRecords()) {
+                copeWkt(paged.getRecords());
+            }
 
             return success(paged.getTotal(), paged.getRecords());
         } catch (Exception ex) {
             return fail(ex, null);
+        }
+    }
+
+    /**
+     * 澶勭悊WKT
+     */
+    private void copeWkt(List<?> list) {
+        for (int i = 0, c = list.size(); i < c; i++) {
+            Object obj = list.get(i);
+            setWktEncrypt(obj);
+        }
+    }
+
+    /**
+     * 璁剧疆WKT鍔犲瘑
+     */
+    private void setWktEncrypt(Object obj) {
+        if (obj instanceof BaseGeoEntity) {
+            BaseGeoEntity entity = (BaseGeoEntity) obj;
+            if (StringHelper.isEmpty(entity.getGeom())) {
+                return;
+            }
+
+            try {
+                String wkt = AesHelper.encrypt(entity.getGeom());
+                entity.setGeom(wkt);
+            } catch (Exception ex) {
+                entity.setGeom(null);
+                log.error(ex.getMessage(), ex);
+            }
         }
     }
 
@@ -222,13 +262,13 @@
     public ResponseMsg<String> selectWktById(String name, Integer gid) {
         try {
             GeomBaseMapper baseMapper = ClassHelper.getGeoBaseMapper(name);
-            if (baseMapper == null) {
-                return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+            if (null == baseMapper) {
+                return fail("鏌ヨ瀵硅薄涓嶅瓨鍦ㄦ垨涓嶆槸绌洪棿琛�", null);
             }
 
             String tab = BaseQueryService.getTabName(baseMapper);
             if (StringHelper.isNull(tab)) {
-                return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+                return fail("鏌ヨ瀵硅薄鐨勮〃鍚嶄笉瀛樺湪", null);
             }
 
             String wkt = baseMapper.selectWktById(tab, gid);
@@ -251,16 +291,19 @@
     @GetMapping(value = "/selectByGid")
     public ResponseMsg<Object> selectByGid(String name, int gid) {
         try {
-            GeomBaseMapper baseMapper = ClassHelper.getGeoBaseMapper(name);
-            if (baseMapper == null) {
+            BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
+            if (null == baseMapper) {
                 return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
             }
 
             QueryWrapper wrapper = new QueryWrapper();
-            wrapper.select("ST_AsText(geom) as geom, *");
+            if (baseMapper instanceof GeomBaseMapper) {
+                wrapper.select("ST_AsText(geom) as geom, *");
+            }
             wrapper.eq("gid", gid);
 
             Object obj = baseMapper.selectOne(wrapper);
+            setWktEncrypt(obj);
 
             return success(null == obj ? 0 : 1, obj);
         } catch (Exception ex) {

--
Gitblit v1.9.3