From cfc85721dbae0c8398890d3b79cf6f2a3cca04be Mon Sep 17 00:00:00 2001 From: liyuchen <791867849@qq.com> Date: Mon, 17 Apr 2023 17:18:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=81=BE=E5=AE=B3=E4=BB=A3=E7=A0=81-liyuchen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/entity/DisasterInfo.java | 5 ++++ .../com/kening/vordm/vo/CallForHelpVo.java | 5 ++++ .../controller/DisasterInfoController.java | 20 +++++++++++++ .../vordm/mapper/DisasterInfoMapper.xml | 29 ++++++++++++++----- .../vordm/service/DisasterInfoService.java | 2 ++ .../service/impl/DisasterInfoServiceImpl.java | 15 ++++++++++ 6 files changed, 69 insertions(+), 7 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java index e6e720b..eb08c49 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java @@ -116,6 +116,11 @@ public class DisasterInfo implements Serializable { */ private String sponsorOrganization; + /** + * 灾害管理者id + */ + private Long chiefId; + /** * 管理用户 */ 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 d934621..8c6e33a 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 @@ -38,6 +38,11 @@ public class CallForHelpVo extends DisasterInfo { */ private String researchField; + /** + * 灾害管理员id-查询条件 + */ + private Long chiefIdEquals; + /** * 创建时间 */ 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 c34125f..4b60c5c 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 @@ -338,4 +338,24 @@ public class DisasterInfoController { public R statistics(){ return R.data(disasterInfoService.statistics()); } + + /** + * 批量更新灾害的chief管理者 + * @param disasterInfoList + * @return + */ + @PutMapping("/updateBatch") + public R updateBatch(@RequestBody List disasterInfoList){ + return R.status(disasterInfoService.updateBatchById(disasterInfoList)); + } + + /** + * 批量更新灾害的chief管理者 + * @param disasterInfoList + * @return + */ + @PutMapping("/removeManage") + public R removeManage(@RequestBody List disasterInfoList){ + return R.status(disasterInfoService.removeManage(disasterInfoList)); + } } 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 3a3300f..e553f6f 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 @@ -145,22 +145,37 @@ d.disaster_type, d.disaster_time, d.disaster_keyword, + d.disaster_country, + d.disaster_level, d.upload_time, d.geometry, - d.respond_status + d.respond_status, + bdb.dict_value as dictValue From guest_manage_disaster_ref ud join guest_info u on u.id = ud.sponsor_id JOIN disaster_info d on d.id = ud.disaster_id + left join blade_dict_biz bdb on d.disaster_type = bdb.dict_key - - d.respond_status = 1 or d.respond_status = 0 + + + d.respond_status = 1 or d.respond_status = 0 + + + d.respond_status = 2 + + + d.respond_status = 2 or d.respond_status = 3 + - - d.respond_status = 2 + + and d.chief_id is null - - d.respond_status = 2 or d.respond_status = 3 + + and d.chief_id = #{callForHelpVo.chiefIdEquals} + + + and bdb.dict_value like concat('%', #{callForHelpVo.disasterType},'%') order by d.upload_time desc 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 7efeeec..e72ad83 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 @@ -61,4 +61,6 @@ public interface DisasterInfoService extends IService { * @return */ Map statistics(); + + boolean removeManage(List disasterInfoList); } 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 117cd3e..946fb50 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 @@ -2,6 +2,7 @@ package com.kening.vordm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Maps; import com.kening.vordm.entity.DisasterData; @@ -168,6 +169,20 @@ public class DisasterInfoServiceImpl extends ServiceImpl 0); } + /** + * 移除管理灾害权限 + * @param disasterInfoList + * @return + */ + @Override + public boolean removeManage(List disasterInfoList) { + for (DisasterInfo disasterInfo : disasterInfoList) { + update(Wrappers.lambdaUpdate() + .eq(DisasterInfo::getId, disasterInfo.getId()) + .set(DisasterInfo::getChiefId, null)); + } + return Boolean.TRUE; + } /** * 后台管理系统-控制台灾害各项统计