From 7cdbc90a2bcab9123bf4a2f026b6ba1edec8b78b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 11:23:37 +0800
Subject: [PATCH] 注释过滤
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 c664e85..b329bc2 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
@@ -18,12 +18,14 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.common.utils.SpringUtils;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
@@ -53,8 +55,10 @@
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.IDictBizService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -1126,7 +1130,8 @@
*/
@Override
public IPage<PlaceVO> selectNinePlacePage(IPage<PlaceVO> page, PlaceVO place) {
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ // todo
+ List<String> regionChildCodesList = new ArrayList<>();//SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
List<String> list = new ArrayList<>();
if (null != place.getRoleName() && !place.getRoleName().equals("")) {
@@ -1143,7 +1148,8 @@
@Override
public List<NinePlaceExcel> export(PlaceVO place) {
place.setIsNine(1);
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ // todo
+ List<String> regionChildCodesList = new ArrayList<>();//SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
List<String> list = new ArrayList<>();
if (null != place.getRoleName() && !place.getRoleName().equals("")) {
@@ -1153,6 +1159,15 @@
}
}
List<NinePlaceExcel> aa = baseMapper.export(place, list, regionChildCodesList, isAdministrator);
+ IDictBizService bean = SpringUtils.getBean(IDictBizService.class);
+ List<DictBiz> nineType = bean.list(Wrappers.<DictBiz>lambdaQuery().eq(DictBiz::getCode, "nineType").eq(DictBiz::getIsDeleted, 0));
+ for (NinePlaceExcel ninePlaceExcel : aa) {
+ for (DictBiz dictBiz : nineType) {
+ if (StringUtils.isNotBlank(ninePlaceExcel.getNineType()) && ninePlaceExcel.getNineType().equals(dictBiz.getDictKey())) {
+ ninePlaceExcel.setNineType(dictBiz.getDictValue());
+ }
+ }
+ }
return aa;
}
@@ -1165,14 +1180,14 @@
List<PlaceEntity> list = baseMapper.getPlaceNotJwGridCode();
// 遍历
for (PlaceEntity placeEntity : list) {
- if (!Strings.isBlank(placeEntity.getLng())){
+ if (!Strings.isBlank(placeEntity.getLng())) {
// 空间分析
//点坐标解析
- String point = "'POINT(" + placeEntity.getLng() + " " + placeEntity.getLat() +")'";
+ String point = "'POINT(" + placeEntity.getLng() + " " + placeEntity.getLat() + ")'";
//String point = "'POINT(" + villageInfoExcel.getLatitude() + " " + villageInfoExcel.getLongitude() +")'";
List<PoliceAffairsGridEntity> policeAffairsGridEntities
= SpringUtil.getBean(IPoliceAffairsGridService.class).spatialAnalysis(point);
- if (policeAffairsGridEntities.size()>0){
+ if (policeAffairsGridEntities.size() > 0) {
PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntities.get(0);
placeEntity.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
// 更新
--
Gitblit v1.9.3