From 01cf8140ee6ea6a98ff12d5ef973b050fbf75bf1 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 16 Mar 2024 15:23:02 +0800
Subject: [PATCH] 场所添加字段+从业人员添加字段
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 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 110d71b..96bf11a 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
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.param.CommonParamSet;
@@ -63,6 +64,8 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
@@ -142,7 +145,7 @@
}
if (roleName.equals("民警")) {
// 查询对应的社区编号
- communityList = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
+ communityList = SysCache.getPoliceRegionChildCodesByDeptId(AuthUtil.getDeptId());
}
}
// 查询街道
@@ -536,8 +539,7 @@
});
// 排序
sortUnit(tempList, list);
-// List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getUnitName())).collect(Collectors.toList());
-// list.addAll(sortList);
+
}
}
@@ -564,13 +566,43 @@
} else if (funcNode.getUnitName().contains("六")) {
funcNode.setSort(6);
} else {
- funcNode.setSort(1);
+ if (!containsNumber(funcNode.getUnitName())) {
+ funcNode.setSort(1);
+ }else {
+ funcNode.setSort(getNumber(funcNode.getUnitName()));
+ }
}
}
// 排序
List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getSort())).collect(Collectors.toList());
list.addAll(sortList);
}
+ }
+
+ /**
+ * 判断是否包含数字
+ * @param str
+ * @return
+ */
+ public static boolean containsNumber(String str) {
+ Pattern pattern = Pattern.compile(".*\\d+.*");
+ Matcher matcher = pattern.matcher(str);
+ return matcher.matches();
+ }
+
+ /**
+ * 取出字符串中的数字
+ * @param str
+ * @return
+ */
+ public static int getNumber(String str){
+ StringBuilder sb = new StringBuilder();
+ for (char c : str.toCharArray()) {
+ if (Character.isDigit(c)) {
+ sb.append(c);
+ }
+ }
+ return Integer.parseInt(sb.toString());
}
/**
@@ -744,7 +776,10 @@
houseEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
houseEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
houseEntity.setDistrictName(doorplateAddressEntity.getAoiName());
+ houseEntity.setLng(doorplateAddressEntity.getX());
+ houseEntity.setLat(doorplateAddressEntity.getY());
houseEntity.setHouseName(doorplateAddressEntity.getAddressName());
+ houseEntity.setAddress(doorplateAddressEntity.getAddressName());
houseEntity.setFloor(doorplateAddressEntity.getFloor());
houseEntity.setBuilding(doorplateAddressEntity.getBuildingName());
houseEntity.setUnit(doorplateAddressEntity.getUnitName());
--
Gitblit v1.9.3