From 9c12722c823896d7a89ccb6f941e4cedd512377f Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 8 May 2023 13:50:33 +0800 Subject: [PATCH] =?UTF-8?q?GLJ-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kening/vordm/vo/CallForHelpVo.java | 11 +++++++++++ .../vordm/controller/DisasterInfoController.java | 5 +++++ .../com/kening/vordm/mapper/DisasterInfoMapper.java | 3 +++ .../com/kening/vordm/mapper/DisasterInfoMapper.xml | 4 ++++ .../vordm/mapper/RemoteSensingSourceDataMapper.xml | 3 +++ .../com/kening/vordm/service/DisasterInfoService.java | 2 ++ .../vordm/service/impl/DisasterInfoServiceImpl.java | 11 +++++++---- 7 files changed, 35 insertions(+), 4 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java index fc4c2ce..3f42628 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java @@ -92,4 +92,15 @@ public class CallForHelpVo extends DisasterInfo { */ private String roleName; + /** + * 角色Id + */ + private Long roleId; + + /** + * 角色父级Id + */ + private Long parentId; + + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java index b229b12..bd76a13 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java @@ -78,6 +78,11 @@ public class DisasterInfoController { }) @GetMapping("/list") public R> list(CallForHelpVo CallForHelpVo, Query query) { + CallForHelpVo userRole = disasterInfoService.getByNameRole("admin"); + Long chiefIdEquals = CallForHelpVo.getChiefIdEquals(); + if (chiefIdEquals.equals(userRole.getRoleId())){ + CallForHelpVo.setChiefIdEquals(null); + } IPage pages = disasterInfoService.page(Condition.getPage(query), CallForHelpVo); return R.data(pages); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java index 76d20ce..5a8278f 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java @@ -80,4 +80,7 @@ public interface DisasterInfoMapper extends BaseMapper { List> adminData(String year); List> disasterNum(String year); + + CallForHelpVo getByNameRole(@Param("admin") String admin); + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml index a6369d0..cefe5d9 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml @@ -371,4 +371,8 @@ + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml index e39e414..4145c09 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml @@ -74,6 +74,9 @@ r.disaster_id = #{remoteSensingSourceData.disasterId} + + and r.status = #{remoteSensingSourceData.status} + and r.product_resolution >= #{remoteSensingSourceData.productResolutionMin} and r.product_resolution < #{remoteSensingSourceData.productResolutionMax} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java index f48d4c3..3fd1b73 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java @@ -72,4 +72,6 @@ public interface DisasterInfoService extends IService { Integer getByUserDisasterInfo(Long userId, Long disasterId); UserVo getByUserDisasterInfoStatistics(Long userId); + + CallForHelpVo getByNameRole(String anmin); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index 53dd396..cbe0aff 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -20,7 +20,6 @@ import org.springblade.common.cache.CacheNames; import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DigestUtil; import org.springblade.core.tool.utils.StringUtil; import org.springframework.scheduling.annotation.Async; @@ -154,9 +153,8 @@ public class DisasterInfoServiceImpl extends ServiceImpl page(IPage page, CallForHelpVo callForHelpVo) { - if (callForHelpVo.getRoleName() == null || callForHelpVo.getRoleName().equals("admin")){ - callForHelpVo.setChiefIdEquals(null); - } + + return page.setRecords(this.baseMapper.page(page, callForHelpVo)); } @@ -239,6 +237,11 @@ public class DisasterInfoServiceImpl extends ServiceImpl