From 8d8c7da4e91028fc877f101dcd244bef3e18c197 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sun, 12 Nov 2023 07:34:21 +0800
Subject: [PATCH] 标签报事+通知公告
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 94 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 78 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 6114a48..ea3f411 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
@@ -22,6 +22,9 @@
import org.springblade.common.node.TreeNode;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
+import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
+import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.entity.PlacePoiLabel;
@@ -37,6 +40,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -58,9 +62,29 @@
@Autowired
private IPlaceExtService placeExtService;
+ @Autowired
+ private IDoorplateAddressService doorplateAddressService;
+
+ @Autowired
+ private IGridService gridService;
+
+ /**
+ * 自定义列表查询
+ * @param page
+ * @param place
+ * @return
+ */
@Override
public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
- return page.setRecords(baseMapper.selectPlacePage(page, place));
+ List<String> list = new ArrayList<>();
+ if (null!=place.getRoleName() && !place.getRoleName().equals("")){
+ if (place.getRoleName().equals("网格员")){
+ // 查询对应的房屋地址code
+ list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+ }
+ }
+ place.setCreateUser(AuthUtil.getUserId());
+ return page.setRecords(baseMapper.selectPlacePage(page, place,list));
}
/**
@@ -90,6 +114,8 @@
bindUserHandle(placeVO);
// 新增场所信息
boolean save = save(placeVO);
+ // 保存场所详情及任务信息
+ savePlaceExtAndTaskInfo(placeVO);
// 场所标签信息绑定
placeLabelBind(placeVO);
// 返回结果
@@ -128,7 +154,6 @@
if (user != null) {
//如果用户存在，则该用户id绑定场所
placeVO.setPrincipalUserId(user.getId());
- return user;
} else {
//如果用户不存在，则新增一个用户
newUser.setAccount(placeVO.getPhone());
@@ -144,23 +169,29 @@
placeVO.setPrincipalUserId(newUser.getId());
//给人员打上场所负责人的标签
baseMapper.saveUserLabel(newUser.getId(),1002);
- // 用户插入后同时给场所详情表插入一条该场所信息
- if (submit){
- PlaceExtEntity placeExtEntity = new PlaceExtEntity();
- placeExtEntity.setPlaceId(placeVO.getId());
- // 判断是否已存在，已存在则不新增
- QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted",0)
- .eq("place_id",placeVO.getId());
- PlaceExtEntity one = placeExtService.getOne(wrapper);
- if (null == one) {
- //新增
- placeExtService.savePlaceExt(placeExtEntity);
- }
- }
}
}
return newUser;
+ }
+
+ /**
+ * 保存场所详情及任务信息
+ * @param placeVO
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void savePlaceExtAndTaskInfo(PlaceVO placeVO) {
+ PlaceExtEntity placeExtEntity = new PlaceExtEntity();
+ placeExtEntity.setPlaceId(placeVO.getId());
+ // 判断是否已存在，已存在则不新增
+ QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0)
+ .eq("place_id",placeVO.getId());
+ PlaceExtEntity one = placeExtService.getOne(wrapper);
+ if (null == one) {
+ placeExtEntity.setPlaceId(placeVO.getId());
+ //新增
+ placeExtService.savePlaceExt(placeExtEntity);
+ }
}
/**
@@ -208,4 +239,35 @@
}
return null;
}
+
+ /**
+ * 场所表 自定义详情查询
+ * @param place
+ * @return
+ */
+ @Override
+ public PlaceVO getDetail(PlaceEntity place) {
+ // 查询场所信息
+ PlaceVO placeVO = baseMapper.getDetail(place);
+ if (null!= placeVO) {
+ if (null != placeVO.getHouseCode() && !placeVO.getHouseCode().equals("")){
+ place.setHouseCode(placeVO.getHouseCode());
+ }
+ // 查询门牌地址信息
+ if (null != place.getHouseCode() && !place.getHouseCode().equals("")) {
+ QueryWrapper<DoorplateAddressEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("address_code", place.getHouseCode());
+ List<DoorplateAddressEntity> list = doorplateAddressService.list(wrapper);
+ if (list.size() > 0) {
+ placeVO.setDoorplateAddressEntity(list.get(0));
+ }
+ // 查询网格数据
+ placeVO.setGrid(gridService.getGridDetailByHouseCode(place.getHouseCode()));
+ }else {
+ // 通过定位点落面分析网格位置，反向推出社区派出所相关数据
+ }
+ }
+ // 返回
+ return placeVO;
+ }
}
--
Gitblit v1.9.3