From c9b71ca2cd9a71a7b9f2e5669f60bfaece4ad67b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 19 Mar 2024 10:18:42 +0800
Subject: [PATCH] 集成test4j 图片识别

---
 src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java |   75 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index 6399f23..08d98a6 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -23,12 +23,14 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;
 import org.springblade.common.cache.SysCache;
+import org.springblade.common.param.CommonParamSet;
 import org.springblade.common.utils.IdUtils;
 import org.springblade.common.utils.NodeTreeUtil;
 import org.springblade.common.utils.SpringUtils;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.grid.entity.GridEntity;
 import org.springblade.modules.grid.entity.GridRangeEntity;
 import org.springblade.modules.grid.service.IGridRangeService;
 import org.springblade.modules.grid.service.IGridService;
@@ -47,6 +49,8 @@
 import org.springblade.modules.label.entity.LabelEntity;
 import org.springblade.modules.label.service.ILabelService;
 import org.springblade.modules.label.vo.LabelVO;
+import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
+import org.springblade.modules.police.service.IPoliceAffairsGridService;
 import org.springblade.modules.system.entity.Region;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IRegionService;
@@ -87,9 +91,13 @@
 
 	@Override
 	public IPage<HouseVO> selectHousePage(IPage<HouseVO> page, HouseVO house) {
-		List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
-		Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
-		List<HouseVO> houseVOS = baseMapper.selectHousePage(page, house, regionChildCodesList, isAdministrator);
+//		List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+//		Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
+		CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseVO.class,house);
+
+		List<HouseVO> houseVOS = baseMapper.selectHousePage(page, house,
+			commonParamSet.getRegionChildCodesList(),commonParamSet.getGridCodeList(), commonParamSet.getIsAdministrator()
+			);
 		return page.setRecords(houseVOS);
 	}
 
@@ -706,4 +714,65 @@
 		}
 		return list;
 	}
+
+	/**
+	 * 房屋网格处理
+	 * @return
+	 */
+	@Override
+	public Object houseGridHandle() {
+		// 查询未处理的数据
+		List<HouseEntity> houseEntityList = baseMapper.getNotBindGridOrJwGridList(1);
+		// 遍历
+		for (HouseEntity houseEntity : houseEntityList) {
+			String point = "'POINT(" + houseEntity.getLng() + " " + houseEntity.getLat() + ")'";
+			List<GridEntity> gridEntityList = SpringUtils.getBean(IGridService.class).spatialAnalysis(point);
+			if (gridEntityList.size()>0){
+				houseEntity.setGridCode(gridEntityList.get(0).getGridCode());
+				houseEntity.setGridId(gridEntityList.get(0).getId());
+				// 更新
+				updateById(houseEntity);
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * 房屋警格处理
+	 * @return
+	 */
+	@Override
+	public Object houseJwGridHandle() {
+		// 查询未处理的数据
+		List<HouseEntity> houseEntityList = baseMapper.getNotBindGridOrJwGridList(2);
+		// 遍历
+		for (HouseEntity houseEntity : houseEntityList) {
+			String point = "'POINT(" + houseEntity.getLng() + " " + houseEntity.getLat() + ")'";
+			List<PoliceAffairsGridEntity> policeAffairsGridEntityList = SpringUtils.getBean(IPoliceAffairsGridService.class).spatialAnalysis(point);
+			if (policeAffairsGridEntityList.size()>0){
+				houseEntity.setJwGridCode(policeAffairsGridEntityList.get(0).getJwGridCode());
+				// 更新
+				updateById(houseEntity);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 房屋画像统计-按房屋标签统计
+	 * @param house
+	 * @return
+	 */
+	@Override
+	public List<Map<String,Object>> getHouseLabelStatistic(HouseVO house) {
+		CommonParamSet commonParamSet = new CommonParamSet<>().invoke(HouseVO.class, house);
+		// 按房屋标签统计
+		List<Map<String,Object>> list = baseMapper.getHouseLabelStatistic(house,
+			commonParamSet.getIsAdministrator(),
+			commonParamSet.getRegionChildCodesList(),
+			commonParamSet.getGridCodeList());
+		// 返回
+		return list;
+	}
 }

--
Gitblit v1.9.3