From f842dff7066fcf7ce67a54a5be043145b969ee56 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 20 Dec 2023 15:07:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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/doorplateAddress/vo/FuncNode.java | 5 ++
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 37 ++++++++++++++++++
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 +++++
7 files changed, 85 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index 530a69f..1445e00 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -471,7 +471,42 @@
tempList.add(funcNode);
});
// 排序
- List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getUnitName())).collect(Collectors.toList());
+ sortUnit(tempList,list);
+// List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getUnitName())).collect(Collectors.toList());
+// list.addAll(sortList);
+ }
+ }
+
+ /**
+ * 单元排序
+ * @param tempList
+ * @param list
+ */
+ private void sortUnit(List<FuncNode> tempList,List<FuncNode> list) {
+ // 遍历
+ if(tempList.size()>1){
+ for (FuncNode funcNode : tempList) {
+ if (funcNode.getUnitName().contains("一")){
+ funcNode.setSort(1);
+ }
+ if (funcNode.getUnitName().contains("二")){
+ funcNode.setSort(2);
+ }
+ if (funcNode.getUnitName().contains("三")){
+ funcNode.setSort(3);
+ }
+ if (funcNode.getUnitName().contains("四")){
+ funcNode.setSort(4);
+ }
+ if (funcNode.getUnitName().contains("五")){
+ funcNode.setSort(5);
+ }
+ if (funcNode.getUnitName().contains("六")){
+ funcNode.setSort(6);
+ }
+ }
+ // 排序
+ List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getSort())).collect(Collectors.toList());
list.addAll(sortList);
}
}
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/vo/FuncNode.java b/src/main/java/org/springblade/modules/doorplateAddress/vo/FuncNode.java
index 362b8d1..4d2b9e2 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/vo/FuncNode.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/vo/FuncNode.java
@@ -54,6 +54,11 @@
private Integer addressType;
/**
+ * 排序
+ */
+ private Integer sort;
+
+ /**
* 子孙节点
*/
private List<FuncNode> children = new ArrayList<>();
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