From 00c92078694f7ea593cc7f35eaad716d7bf2e524 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 20 Dec 2023 13:55:31 +0800
Subject: [PATCH] 新增网格查询并排序
---
src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java | 10 ++++++++++
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 9 +++++++++
src/main/java/org/springblade/modules/grid/mapper/GridMapper.java | 7 +++++++
src/main/java/org/springblade/modules/grid/service/IGridService.java | 7 +++++++
src/main/java/org/springblade/modules/grid/controller/GridController.java | 11 +++++++++++
5 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/controller/GridController.java b/src/main/java/org/springblade/modules/grid/controller/GridController.java
index af398e7..85a7e66 100644
--- a/src/main/java/org/springblade/modules/grid/controller/GridController.java
+++ b/src/main/java/org/springblade/modules/grid/controller/GridController.java
@@ -186,4 +186,15 @@
public R gridInfoByHouseCode( @RequestParam("houseCode") String houseCode) {
return R.data(gridService.gridInfoByHouseCode(houseCode));
}
+
+
+ /**
+ * 网格集合查询
+ * @param grid
+ * @return
+ */
+ @GetMapping("/getGridList")
+ public R getGridList(GridVO grid) {
+ return R.data(gridService.getGridList(grid));
+ }
}
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.java b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.java
index 19e17f0..c7a51c7 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.java
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.java
@@ -96,4 +96,11 @@
List<GridmanEntity> gridInfo(String houseCode);
List<DoorplateAddressEntity> gridAoiName(Integer id);
+
+ /**
+ * 网格集合查询
+ * @param grid
+ * @return
+ */
+ List<GridEntity> getGridList(@Param("grid") GridVO grid);
}
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
index cfed231..aaa8961 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -130,5 +130,14 @@
</select>
+ <!--网格集合查询-->
+ <select id="getGridList" resultType="org.springblade.modules.grid.entity.GridEntity">
+ SELECT * from jczz_grid
+ where is_deleted = 0
+ <if test="grid.communityCode!=null and grid.communityCode!=''">
+ and community_code = #{grid.communityCode}
+ </if>
+ order by sort asc
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/grid/service/IGridService.java b/src/main/java/org/springblade/modules/grid/service/IGridService.java
index 8309dfa..75c5d68 100644
--- a/src/main/java/org/springblade/modules/grid/service/IGridService.java
+++ b/src/main/java/org/springblade/modules/grid/service/IGridService.java
@@ -102,4 +102,11 @@
Object getGridTree(GridVO grid);
Object gridInfoByHouseCode(String houseCode);
+
+ /**
+ * 网格集合查询
+ * @param grid
+ * @return
+ */
+ Object getGridList(GridVO grid);
}
diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
index c4efa62..aa38cc3 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
@@ -284,4 +284,14 @@
objectObjectHashMap.put("doorplateAddress", result);
return objectObjectHashMap;
}
+
+ /**
+ * 网格集合查询
+ * @param grid
+ * @return
+ */
+ @Override
+ public Object getGridList(GridVO grid) {
+ return baseMapper.getGridList(grid);
+ }
}
--
Gitblit v1.9.3