From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/java/com/lf/server/controller/data/upload/QueryController.java |   78 +++++++++++++++++++++++++++++++++------
 1 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/data/upload/QueryController.java b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
index e5ea773..74379cd 100644
--- a/src/main/java/com/lf/server/controller/data/upload/QueryController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
@@ -53,6 +53,40 @@
     @Autowired
     protected BaseQueryService baseQueryService;
 
+    @Autowired
+    DictService dictService;
+
+    @SysLog()
+    @ApiOperation(value = "鏍规嵁鐖禝D鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "metaid", value = "鐖禝D", dataType = "String", paramType = "query", example = "0"),
+            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
+            @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
+            @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
+    })
+    @GetMapping(value = "/selectPageAndCountByPid")
+    public ResponseMsg<List<MetaEntity>> selectPageAndCountByPid(Integer metaid, String name, Integer pageSize, Integer pageIndex) {
+        try {
+            if (pageSize < 1 || pageIndex < 1) {
+                return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+            }
+            if (null == metaid || metaid < 1) {
+                return fail("鐖禝D涓嶈兘涓虹┖涓斿ぇ浜�1", null);
+            }
+
+            int count = metaService.selectCountByPid(metaid, name);
+            if (count == 0) {
+                return success(0, null);
+            }
+
+            List<MetaEntity> rs = metaService.selectPageByPid(metaid, name, pageSize, pageSize * (pageIndex - 1));
+
+            return success(count, rs);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
     @SysLog()
     @ApiOperation(value = "鏌ヨ鎵�鏈夊崟浣�")
     @GetMapping(value = "/selectDepAll")
@@ -62,7 +96,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -75,7 +109,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -98,7 +132,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -114,7 +148,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -127,20 +161,24 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
     @SysLog()
     @ApiOperation(value = "鏌ヨ鎵�鏈夎〃")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "鐐�"),
+            @ApiImplicitParam(name = "hasGeom", value = "鍚湁Geom瀛楁", dataType = "Boolean", paramType = "query", example = "false")
+    })
     @GetMapping(value = "/selectTabs")
-    public ResponseMsg<List<TabEntity>> selectTabs() {
+    public ResponseMsg<List<TabEntity>> selectTabs(String name, Boolean hasGeom) {
         try {
-            List<TabEntity> list = baseQueryService.selectTabs();
+            List<TabEntity> list = dictService.selectDictTab(name, null == hasGeom || !hasGeom ? "gid" : "geom");
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -161,7 +199,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -195,12 +233,12 @@
             wrapper.eq("parentid", meta.getEventid());
 
             Page<Object> page = new Page<>(pageIndex, pageSize);
-            page.addOrder(OrderItem.asc("gid"));
+            page.addOrder(OrderItem.desc("gid"));
             IPage<Object> paged = baseMapper.selectPage(page, wrapper);
 
             return success(paged.getTotal(), paged.getRecords());
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -229,7 +267,23 @@
 
             return success(count, list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏍规嵁鍏冩暟鎹甀D鏌ヨ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
+    })
+    @GetMapping(value = "/selectMetaById")
+    public ResponseMsg<MetaEntity> selectMetaById(int id) {
+        try {
+            MetaEntity entity = metaService.selectById(id);
+
+            return success(entity);
+        } catch (Exception ex) {
+            return fail(ex, null);
         }
     }
 }

--
Gitblit v1.9.3