From d46ca134f82fd106bfbbbd71aef7184805e6d7e7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 09:17:54 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 62 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 10 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 ede4050..cf2480e 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
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.SysCache;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.IdUtils;
import org.springblade.core.mp.support.Condition;
@@ -43,6 +44,7 @@
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlacePoiLabelService;
import org.springblade.modules.place.service.IPlaceRelService;
+import org.springblade.modules.place.vo.PlacePoiLabelVO;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.IPlaceService;
@@ -90,9 +92,6 @@
private IGridmanService gridmanService;
@Autowired
- private IDeptService deptService;
-
- @Autowired
private GridMapper gridMapper;
@Autowired
@@ -106,10 +105,8 @@
*/
@Override
public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null!=dept){
- place.setRegionCode(dept.getRegionCode());
- }
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
List<String> list = new ArrayList<>();
if (null!=place.getRoleName() && !place.getRoleName().equals("")){
if (place.getRoleName().equals("网格员")){
@@ -117,7 +114,7 @@
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
}
}
- List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page, place, list);
+ List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page, place, list,regionChildCodesList,isAdministrator);
// 遍历
for (PlaceVO placeVO : placeVOS) {
// 设置对应的网格名称
@@ -160,10 +157,10 @@
if (null!=one) {
placeVO.setId(one.getId());
}
- // 设置来源( 1：地址总表 2：国控采集),扫码采集
- placeVO.setSource(1);
// 绑定用户信息
bindUserHandle(placeVO);
+ // 设置完善状态
+ setPlaceStatus(placeVO);
// 更新场所信息
flag = updateById(placeVO);
// 保存场所详情及任务信息
@@ -182,6 +179,8 @@
placeVO.setHouseCode(IdUtils.getIdBy36());
// 绑定用户信息
bindUserHandle(placeVO);
+ // 设置完善状态
+ setPlaceStatus(placeVO);
// 新增场所信息
flag = save(placeVO);
// 保存场所详情及任务信息
@@ -194,6 +193,25 @@
// 位置绑定，通过定位去匹配所在网格
// 返回结果
return flag;
+ }
+
+ /**
+ * 设置场所完善状态
+ * @param placeVO
+ */
+ private void setPlaceStatus(PlaceVO placeVO) {
+ if (!Strings.isBlank(placeVO.getPrincipal())
+ && !Strings.isBlank(placeVO.getPrincipalPhone())
+ && !Strings.isBlank(placeVO.getLocation())
+ && !Strings.isBlank(placeVO.getPlaceName())
+ && !Strings.isBlank(placeVO.getImageUrls())
+ ){
+ // 已完善
+ placeVO.setStatus(2);
+ }else {
+ // 未完善
+ placeVO.setStatus(1);
+ }
}
/**
@@ -339,18 +357,27 @@
big.setPlaceId(placeVO.getId());
big.setPoiCode(Integer.parseInt(bigString));
big.setType(1);
+ if (!Strings.isBlank(placeVO.getColor())){
+ big.setColor(placeVO.getColor());
+ }
placePoiLabelService.save(big);
// 中类
PlacePoiLabel mid = new PlacePoiLabel();
mid.setPlaceId(placeVO.getId());
mid.setPoiCode(Integer.parseInt(midString));
mid.setType(2);
+ if (!Strings.isBlank(placeVO.getColor())){
+ mid.setColor(placeVO.getColor());
+ }
placePoiLabelService.save(mid);
// 小类
PlacePoiLabel min = new PlacePoiLabel();
min.setPlaceId(placeVO.getId());
min.setPoiCode(Integer.parseInt(labelId));
min.setType(3);
+ if (!Strings.isBlank(placeVO.getColor())){
+ min.setColor(placeVO.getColor());
+ }
placePoiLabelService.save(min);
}
});
@@ -365,12 +392,18 @@
big.setPlaceId(placeVO.getId());
big.setPoiCode(Integer.parseInt(bigString));
big.setType(1);
+ if (!Strings.isBlank(placeVO.getColor())){
+ big.setColor(placeVO.getColor());
+ }
placePoiLabelService.save(big);
// 中类
PlacePoiLabel mid = new PlacePoiLabel();
mid.setPlaceId(placeVO.getId());
mid.setPoiCode(Integer.parseInt(midString));
mid.setType(2);
+ if (!Strings.isBlank(placeVO.getColor())){
+ mid.setColor(placeVO.getColor());
+ }
placePoiLabelService.save(mid);
// 处理小类
if (labelCode.length() > 4) {
@@ -379,6 +412,9 @@
min.setPlaceId(placeVO.getId());
min.setPoiCode(Integer.parseInt(labelCode));
min.setType(3);
+ if (!Strings.isBlank(placeVO.getColor())){
+ min.setColor(placeVO.getColor());
+ }
placePoiLabelService.save(min);
}
}
@@ -534,6 +570,12 @@
if (null != placeVO.getHouseCode() && !placeVO.getHouseCode().equals("")) {
place.setHouseCode(placeVO.getHouseCode());
}
+ if (placeVO.getPlacePoiLabelVOList().size()>0){
+ PlacePoiLabelVO placePoiLabelVO = placeVO.getPlacePoiLabelVOList().get(0);
+ if (!Strings.isBlank(placePoiLabelVO.getColor())){
+ placeVO.setColor(placePoiLabelVO.getColor());
+ }
+ }
// 查询门牌地址信息
if (null != place.getHouseCode() && !place.getHouseCode().equals("")) {
QueryWrapper<DoorplateAddressEntity> wrapper = new QueryWrapper<>();
--
Gitblit v1.9.3