From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 96 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index c144e79..f09fd5d 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -118,11 +118,27 @@
public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
// 公共参数设置
CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceVO.class, place);
+ if (StringUtils.isNotBlank(place.getPoiCodes())) {
+ place.setPoiCodeList(Arrays.asList(place.getPoiCodes().split(",")));
+ }
List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page,
place,
commonParamSet.getGridCodeList(),
commonParamSet.getRegionChildCodesList(),
commonParamSet.getIsAdministrator());
+ // 返回
+ return page.setRecords(placeVOS);
+ }
+
+ /**
+ * 查询场所集合信息
+ * @param page
+ * @param place
+ * @return
+ */
+ @Override
+ public IPage<PlaceVO> getPlacePage(IPage<PlaceVO> page, PlaceVO place) {
+ List<PlaceVO> placeVOS = baseMapper.getPlacePage(page, place);
// 返回
return page.setRecords(placeVOS);
}
@@ -206,7 +222,7 @@
// 保存从业人员
savePlacePractitioner(placeVO);
// 判断是否校园
- if (placeVO.getLabel().startsWith("1601")) {
+ if (placeVO.getLabel().startsWith("16010")) {
// 校园的新增一个主体用户和一个通用用户
addSchoolUser(placeVO);
}
@@ -724,12 +740,13 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public User addSchoolUser(PlaceVO placeVO) {
+ public void addSchoolUser(PlaceVO placeVO) {
User newUser = new User();
- if (StringUtils.isNotBlank(placeVO.getPlaceName())) {
-// placeVO.setPrincipal(placeVO.getPrincipal());
-// placeVO.setPrincipalPhone(placeVO.getPrincipalPhone());
- //如果用户不存在，则新增一个用户
+ // 查询账号是否存在，存在则不创建
+ long count = userService.count(Wrappers.<User>lambdaQuery()
+ .eq(User::getAccount, placeVO.getPlaceName() + "主体"));
+ // 如果用户不存在，则新增一个用户
+ if (StringUtils.isNotBlank(placeVO.getPlaceName()) && count <= 0) {
newUser.setAccount(placeVO.getPlaceName() + "主体");
newUser.setName(placeVO.getPlaceName() + "-主体");
newUser.setRealName(placeVO.getPlaceName() + "-主体");
@@ -737,8 +754,7 @@
newUser.setDeptId("1727979636479037441");
// 校园主体，
newUser.setRoleId("1780786647371706370");
-
- //默认密码为 123456
+ // 默认密码为 123456
newUser.setPassword("123456");
// 设置机构
// 用户新增
@@ -756,12 +772,7 @@
placeVO.setUniversalAccount(newUser.getId());
// 更新场所信息
updateById(placeVO);
- //绑定id
-// placeVO.setPrincipalUserId(newUser.getId());
- //给人员打上场所负责人的标签
-// baseMapper.saveUserLabel(newUser.getId(), 1002);
}
- return newUser;
}
/**
@@ -1121,7 +1132,8 @@
placeEntity.setSource(1);
// 设置经纬度及地址
DoorplateAddressEntity doorplateAddressEntity
- = doorplateAddressService.getOne(Wrappers.<DoorplateAddressEntity>lambdaQuery().eq(DoorplateAddressEntity::getAddressCode, placeExcel.getHouseCode()));
+ = doorplateAddressService.getOne(Wrappers.<DoorplateAddressEntity>lambdaQuery()
+ .eq(DoorplateAddressEntity::getAddressCode, placeExcel.getHouseCode()).last("limit 1"));
if (null!=doorplateAddressEntity){
placeEntity.setLng(doorplateAddressEntity.getX());
placeEntity.setLat(doorplateAddressEntity.getY());
@@ -1143,8 +1155,7 @@
* @param placeEntity
*/
private void importGridHandle(ImportPlaceExcel placeExcel, PlaceEntity placeEntity) {
- if (!Strings.isBlank(placeExcel.getCommunityName()) &&
- !Strings.isBlank(placeExcel.getGridName())) {
+ if (Strings.isNotBlank(placeExcel.getCommunityName()) && Strings.isNotBlank(placeExcel.getGridName())) {
// 查询对应的网格信息
GridEntity gridEntity = gridService.getGridInfoByParam(placeExcel.getCommunityName(), placeExcel.getGridName());
if (null != gridEntity) {
@@ -1160,6 +1171,43 @@
updateWrapper.eq("house_code", placeEntity.getHouseCode());
gridRangeService.update(gridRangeEntity, updateWrapper);
}
+ } else if (StringUtils.isNotBlank(placeEntity.getLat()) && StringUtils.isNotBlank(placeEntity.getLng())) {
+ // 点落面
+ setGridInfo(placeEntity);
+ }
+ }
+
+ /**
+ * 设置警格网格信息
+ *
+ * @param placeEntity
+ */
+ public void setGridInfo(PlaceEntity placeEntity) {
+ // 根据位置设置网格，警格编号
+ IGridService gridService = SpringUtils.getBean(IGridService.class);
+ IPoliceAffairsGridService policeAffairsGridService = SpringUtils.getBean(IPoliceAffairsGridService.class);
+ String point = "'POINT(" + placeEntity.getLng() + " " + placeEntity.getLat() + ")'";
+ // 点坐标解析网格
+ List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
+ if (gridEntityList.size() > 0) {
+ GridEntity gridEntity = gridEntityList.get(0);
+ // 设置场所范围
+ placeEntity.setGridId(gridEntity.getId());
+ placeEntity.setGridCode(gridEntity.getGridCode());
+ // 更新网格范围绑定
+ GridRangeEntity gridRangeEntity = new GridRangeEntity();
+ gridRangeEntity.setGridId(gridEntity.getId());
+ gridRangeEntity.setGridCode(gridEntity.getGridCode());
+ gridRangeEntity.setHouseCode(placeEntity.getHouseCode());
+ UpdateWrapper<GridRangeEntity> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("house_code", placeEntity.getHouseCode());
+ gridRangeService.update(gridRangeEntity, updateWrapper);
+ }
+ // 点坐标解析警格
+ List<PoliceAffairsGridEntity> policeAffairsGridEntityList = policeAffairsGridService.spatialAnalysis(point);
+ if (policeAffairsGridEntityList.size() > 0) {
+ PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntityList.get(0);
+ placeEntity.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
}
}
@@ -1810,4 +1858,36 @@
commonParamSet.getIsAdministrator()
);
}
+
+ /**
+ * 查询附近场所
+ *
+ * @param lat
+ * @param lng
+ * @return
+ */
+ @Override
+ public List<PlaceVO> getNearbyPlaceList(String lat, String lng) {
+ return baseMapper.getNearbyPlaceList(lat, lng);
+ }
+
+ /**
+ * 更新场所颜色
+ *
+ * @param placeId
+ * @param color
+ * @return
+ */
+ @Override
+ public boolean updatePoiLabelColor(Long placeId, String color) {
+ List<PlacePoiLabel> list = placePoiLabelService.list(Wrappers.<PlacePoiLabel>lambdaQuery()
+ .eq(PlacePoiLabel::getPlaceId, placeId).eq(PlacePoiLabel::getType, 3));
+ for (PlacePoiLabel placePoiLabel : list) {
+ if (null != placePoiLabel) {
+ placePoiLabel.setColor(color);
+ return placePoiLabelService.updateById(placePoiLabel);
+ }
+ }
+ return false;
+ }
}
--
Gitblit v1.9.3