From 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 10:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 68 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 15 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 d22f6a2..adb701b 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
@@ -152,7 +152,7 @@
}
if (roleName.equals("民警")) {
// 查询对应的社区编号
- communityList = SysCache.getPoliceRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ communityList = SysCache.getPoliceRegionChildCodesByDeptId(AuthUtil.getDeptId(),null);
}
}
// 查询街道
@@ -225,7 +225,7 @@
list.add(houseNode);
TreeStringNode placeNode = new TreeStringNode();
- placeNode.setName("场所");
+ placeNode.setName("经营场所");
placeNode.setId("2");
placeNode.setHasChildren(true);
placeNode.setChildren(placeNodeList);
@@ -740,8 +740,8 @@
houseParam.setUserId(userId);
if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
if (houseParam.getRoleName().equals("民警") && !userId.equals("1726859808689696770")) {
- // 查询对应的房屋地址code
- stringList = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
+ // 查询对应社区编号集合
+ stringList = SysCache.getPoliceRegionChildCodesByDeptId(AuthUtil.getDeptId(),null);
}
}
return stringList;
@@ -800,6 +800,21 @@
houseEntity.setUpdateTime(new Date());
// 设置来源 1：地址总表 2：国控采集
houseEntity.setSource(1);
+ // 根据位置设置网格，警格编号
+ String point = "'POINT(" + doorplateAddressEntity.getX() + " " + doorplateAddressEntity.getY() + ")'";
+ //点坐标解析网格
+ List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
+ if (gridEntityList.size()>0){
+ GridEntity gridEntity = gridEntityList.get(0);
+ houseEntity.setGridId(gridEntity.getId());
+ houseEntity.setGridCode(gridEntity.getGridCode());
+ }
+ //点坐标解析警格
+ List<PoliceAffairsGridEntity> policeAffairsGridEntityList = policeAffairsGridService.spatialAnalysis(point);
+ if (policeAffairsGridEntityList.size()>0){
+ PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntityList.get(0);
+ houseEntity.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
+ }
// 加入集合
houseList.add(houseEntity);
}
@@ -891,6 +906,21 @@
placeEntity.setIsNine(2);
// 默认为现场采集
placeEntity.setIsScene(1);
+ // 根据位置设置网格，警格编号
+ String point = "'POINT(" + addressEntity.getX() + " " + addressEntity.getY() + ")'";
+ //点坐标解析网格
+ List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
+ if (gridEntityList.size()>0){
+ GridEntity gridEntity = gridEntityList.get(0);
+ placeEntity.setGridId(gridEntity.getId());
+ placeEntity.setGridCode(gridEntity.getGridCode());
+ }
+ //点坐标解析警格
+ List<PoliceAffairsGridEntity> policeAffairsGridEntityList = policeAffairsGridService.spatialAnalysis(point);
+ if (policeAffairsGridEntityList.size()>0){
+ PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntityList.get(0);
+ placeEntity.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
+ }
// 加入集合
// placeList.add(placeEntity);
// 保存
@@ -943,9 +973,10 @@
if (null != doorplateAddressVO) {
// 不限制
doorplateAddressVO.setIsJur(1);
- if (!Strings.isBlank(doorplateAddress.getRoleName())) {
+ String roleName = SpringUtils.getRequestParam("roleName");
+ if (!Strings.isBlank(roleName)) {
// 判断是否有权限
- if (doorplateAddress.getRoleName().equals("网格员")) {
+ if (roleName.equals("wgy")) {
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId(),doorplateAddress.getAddressCode());
if (list.size() == 0) {
// 无权限
@@ -953,11 +984,11 @@
} else {
doorplateAddressVO.setIsJur(1);
}
- } else if (doorplateAddress.getRoleName().equals("民警")) {
+ } else if (roleName.equals("mj")) {
// 无权限
doorplateAddressVO.setIsJur(2);
// 查询对应的社区code
- list = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
+ list = SysCache.getPoliceRegionChildCodesByDeptId(AuthUtil.getDeptId(),null);
if (null != list && list.size() > 0) {
boolean contains = list.contains(doorplateAddressVO.getNeiCode());
if (contains) {
@@ -1065,14 +1096,21 @@
wrapper.eq("house_code", doorplateAddressEntity.getAddressCode());
GridRangeEntity one = gridRangeService.getOne(wrapper);
if (null == one) {
- GridRangeEntity gridRangeEntity = new GridRangeEntity();
- gridRangeEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
- gridRangeEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
- gridRangeEntity.setBuilding(doorplateAddressEntity.getBuildingCode());
// 设置网格
- setGridInfo(doorplateAddressEntity,gridRangeEntity);
- // 加入集合
- gridRangeEntityList.add(gridRangeEntity);
+ String point = "'POINT(" + doorplateAddressEntity.getX() + " " + doorplateAddressEntity.getY() + ")'";
+ //点坐标解析网格
+ List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
+ if (gridEntityList.size()>0){
+ GridRangeEntity gridRangeEntity = new GridRangeEntity();
+ gridRangeEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
+ gridRangeEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
+ gridRangeEntity.setBuilding(doorplateAddressEntity.getBuildingCode());
+ GridEntity gridEntity = gridEntityList.get(0);
+ gridRangeEntity.setGridId(gridEntity.getId());
+ gridRangeEntity.setGridCode(gridEntity.getGridCode());
+ // 加入集合
+ gridRangeEntityList.add(gridRangeEntity);
+ }
}
}
// 批量插入
--
Gitblit v1.9.3