From 2a46da88c6462a504884fc6f16b2303000886024 Mon Sep 17 00:00:00 2001 From: glj Date: Tue, 25 Apr 2023 18:34:35 +0800 Subject: [PATCH 01/21] =?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 --- .../com/kening/vordm/entity/DataUpload.java | 2 ++ .../com/kening/vordm/entity/EntityData.java | 4 ++++ .../java/com/kening/vordm/entity/Hotspot.java | 4 ---- .../com/kening/vordm/entity/OtherData.java | 2 ++ .../com/kening/vordm/vo/CallForHelpVo.java | 3 +++ .../controller/AdminManagerController.java | 1 - .../controller/EntityDataController.java | 11 +++++++++ .../kening/vordm/mapper/DataUploadMapper.xml | 8 ++++--- .../vordm/mapper/DisasterInfoMapper.xml | 1 + .../kening/vordm/mapper/EntityDataMapper.xml | 6 ++++- .../mapper/GuestManageDisasterRefMapper.xml | 2 +- .../kening/vordm/mapper/OtherDataMapper.xml | 5 ++-- .../kening/vordm/mapper/VisualDataMapper.xml | 1 + .../service/impl/OtherDataServiceImpl.java | 1 + .../service/impl/PictureInfoServiceImpl.java | 24 ++++++++++++------- 15 files changed, 54 insertions(+), 21 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java index fec1c4c..d0d5c05 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java @@ -23,4 +23,6 @@ public class DataUpload extends EntityData{ private Date disasterTime; private Long disasterId; + + private String vordmId; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java index 985f1d9..f60627d 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java @@ -107,6 +107,10 @@ public class EntityData implements Serializable { */ private Integer isDeleted; + /** + * 是否发布（0未发布/1已发布） + */ + private Integer isPublish; /** * 上传人姓名 diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java index 4195787..88b5fca 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java @@ -76,10 +76,6 @@ public class Hotspot implements Serializable { @ExcelIgnore private Date reviewTime; - /** - * 是否删除 0未删除 1已删除 - */ - private Integer isDeleted; @ExcelIgnore @TableField(exist = false) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java index deb9653..2bb7457 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java @@ -18,6 +18,8 @@ public class OtherData{ private String type; + private String title; + private String remark; private Long disasterId; 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 b903d5a..3af04e0 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 @@ -72,4 +72,7 @@ public class CallForHelpVo extends DisasterInfo { * 受灾国家 */ private String vordmId; + + + private Date reviewTime; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java index 982ed30..5d6061b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java @@ -33,7 +33,6 @@ public class AdminManagerController { */ @GetMapping("/pages") public R pages(Query query, @RequestParam Map params){ - return R.data(guestManageDisasterRefService.queryPage(Condition.getPage(query),params)); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java index 9d70501..dcb1031 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java @@ -61,5 +61,16 @@ public class EntityDataController { entityData.setReviewTime(new Date()); return R.data(entityDataService.updateById(entityData)); } + + + /** + * 修改实体数据 + * @param entityData + * @return + */ + @PostMapping("/updateEntityData") + public R updateEntityData(@RequestBody EntityData entityData) { + return R.data(entityDataService.updateById(entityData)); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml index f42a1a9..7cc30fe 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml @@ -21,13 +21,15 @@ di.disaster_keyword, bdb.dict_value as disasterType, di.id as disasterId, + di.vordm_id AS vordmId, di.disaster_time as disasterTime, di.disaster_country as disasterCountry from entity_data ed - left join blade_user bu on bu.id = ed.uploader_id - left join disaster_info di on di.id = ed.disaster_id - left join blade_dict_biz bdb on di.disaster_type = dict_key + left join blade_user bu on bu.id = ed.uploader_id + left join disaster_info di on di.id = ed.disaster_id + left join blade_dict_biz bdb on di.disaster_type = dict_key where ed.disaster_id is not null + AND di.disaster_keyword IS NOT NUll group by di.id,bdb.dict_value 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 ba8aabc..d4b2aa7 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 @@ -191,6 +191,7 @@ d.upload_time, d.geometry, d.respond_status, + ud.review_time AS reviewTime, bdb.dict_value as dictValue From guest_manage_disaster_ref ud join diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml index 3b8cf9b..bc6f8f8 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml @@ -21,6 +21,9 @@ + + + @@ -29,7 +32,8 @@ ed.upload_time,ed.disaster_id,ed.visual_flag, ed.visual_lon,ed.visual_lat, ed.status,ed.uploader_id,ed.manager_id, - ed.review_time, ed.source_organization + ed.review_time, ed.source_organization, + ed.upload_type, ed.is_deleted, ed.is_publish select di.disaster_keyword, + di.vordm_id, bdb.dict_value as disasterType, di.id as disasterId, di.disaster_time as disasterTime, di.disaster_country as disasterCountry from disaster_info di - left join blade_dict_biz bdb on di.disaster_type = dict_key + left join blade_dict_biz bdb on di.disaster_type = dict_key select , - gi.username AS uploaderName, - ms.layer_name, - ms.vordm_id, - ms.name AS msName + gi.username AS uploaderName, + di.vordm_id, + di.geometry from entity_data ed left join guest_info gi on gi.id = ed.uploader_id - left join map_server ms on ms.disaster_id = ed.disaster_id + LEFT JOIN disaster_info di on di.id = ed.disaster_id ed.disaster_id = #{entityData.disasterId} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml index 81708aa..62075b2 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml @@ -24,7 +24,7 @@ diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java index d28ecc9..ab44c48 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java @@ -109,6 +109,7 @@ public class OtherDataServiceImpl extends ServiceImpl Date: Wed, 26 Apr 2023 18:31:39 +0800 Subject: [PATCH 05/21] =?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 --- .../src/main/java/com/kening/vordm/entity/DataUpload.java | 2 +- .../java/com/kening/vordm/controller/WordCloudsController.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java index 3bf1d54..95ac2d9 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java @@ -25,6 +25,6 @@ public class DataUpload extends EntityData{ private Long disasterId; private String vordmId; - + private String geometry; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordCloudsController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordCloudsController.java index 50243fa..5b2a190 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordCloudsController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordCloudsController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -32,6 +33,6 @@ public class WordCloudsController { @GetMapping("/wordCount") public R>> wordCount(@RequestParam Long disasterId){ Map> stringListMap = service.wordCount(disasterId); - return R.data(service.wordCount(disasterId)); + return R.data(stringListMap); } } From e8d25dbaf6def946852ccd510055d76d7fa5d391 Mon Sep 17 00:00:00 2001 From: liyuchen <791867849@qq.com> Date: Thu, 27 Apr 2023 16:06:13 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6-liyuchen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 af7ff3c..8b46832 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 @@ -206,7 +206,7 @@ d.respond_status = 2 - d.respond_status = 2 or d.respond_status = 3 + d.respond_status = 3 From 3328a49cee719273852c5458f5b88c136f141e9f Mon Sep 17 00:00:00 2001 From: glj Date: Thu, 4 May 2023 09:33:11 +0800 Subject: [PATCH 07/21] =?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 --- .../com/kening/vordm/vo/CallForHelpVo.java | 11 ++++++ .../com/kening/vordm/vo/DisasterInfoVo.java | 5 +++ .../controller/DisasterInfoController.java | 36 ++++++++----------- .../vordm/mapper/DisasterInfoMapper.xml | 11 ++---- .../kening/vordm/mapper/EntityDataMapper.xml | 3 ++ .../service/impl/PictureInfoServiceImpl.java | 4 +-- 6 files changed, 37 insertions(+), 33 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 3af04e0..c9f3182 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 @@ -75,4 +75,15 @@ public class CallForHelpVo extends DisasterInfo { private Date reviewTime; + + + /** + * 级别-地震 + */ + private String disasterLevel; + + /** + * 完成时间 + */ + private Date respondedTime; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java index add4353..ad0716b 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java @@ -130,6 +130,11 @@ public class DisasterInfoVo implements Serializable { */ private String userName; + /** + * 结束时间 + */ + private Date respondedTime; + @TableField(exist = false) private static final long serialVersionUID = 1L; } 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 d9291b5..1eeed63 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 @@ -2,6 +2,7 @@ package com.kening.vordm.controller; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -122,26 +123,6 @@ public class DisasterInfoController { */ @GetMapping("/select-condition") public R> getSelectCondition(DisasterInfo disasterInfo) { -// String dateType = String.valueOf(params.get("dateTyle")); -// LocalDate date = LocalDate.now(); -// if(StringUtils.isNotBlank(dateType)){ -// switch (dateType){ -// case "1" : -// //Latest week 上一周 -// date = LocalDate.now().minusWeeks(1); -// break; -// case "2": -// //Latest month 上一个月 -// date = LocalDate.now().minusMonths(1); -// break; -// case "3": -// //Latest six month 上6个月 -// date = LocalDate.now().minusMonths(6); -// break; -// default: -// break; -// } -// } String disaster_time = null; if (disasterInfo.getDisasterTime() != null) { disaster_time = DateUtil.format(disasterInfo.getDisasterTime(), "yyyy-MM-dd"); @@ -323,6 +304,9 @@ public class DisasterInfoController { DisasterInfo disasterInfo = new DisasterInfo(); BeanUtil.copyProperties(callForHelpVo, disasterInfo); disasterInfo.setUploadTime(new Date()); + if (callForHelpVo.getDisasterLevel() != null){ + disasterInfo.setDisasterLevel(callForHelpVo.getDisasterLevel()); + } Boolean flag3 = disasterInfoService.save(disasterInfo); @@ -339,8 +323,7 @@ public class DisasterInfoController { @PostMapping("review") public R review(@RequestBody DisasterInfo disasterInfo) { - - //审批通过 + //审批通过 响应状态，0未审批，1审批未通过。2审批通过并正在响应，3审批通过并且响应完成 if (disasterInfo.getRespondStatus() == 2) { String numbering = serialNumberService.generateNumbering(disasterInfo.getDisasterType()); disasterInfo.setVordmId(numbering); @@ -374,6 +357,15 @@ public class DisasterInfoController { */ @PutMapping("/updateBatch") public R updateBatch(@RequestBody List disasterInfoList) { + disasterInfoList.stream().forEach(disasterInfo -> { + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(GuestManageDisasterRef::getManagerId,disasterInfo.getId()); + GuestManageDisasterRef one = guestManageDisasterRefService.getOne(qw); + one.setStatus(1); + one.setManagerId(disasterInfo.getChiefId()); + guestManageDisasterRefService.updateById(one); + }); + return R.status(disasterInfoService.updateBatchById(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 005356c..422b5a1 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 @@ -191,6 +191,7 @@ d.upload_time, d.geometry, d.respond_status, + d.responded_time, ud.review_time AS reviewTime, bdb.dict_value as dictValue From @@ -200,15 +201,7 @@ 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 = 2 - - - d.respond_status = 2 or d.respond_status = 3 - + d.respond_status = #{callForHelpVo.respondStatus} and d.chief_id is null diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml index dd1fbb6..73feec6 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml @@ -55,6 +55,9 @@ and ed.visual_flag = #{entityData.visualFlag} + + and ed.is_publish = #{entityData.isPublish} + and ed.type = #{entityData.type} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java index bbeced8..e170f18 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java @@ -66,10 +66,10 @@ public class PictureInfoServiceImpl extends ServiceImpl Date: Thu, 4 May 2023 09:39:22 +0800 Subject: [PATCH 08/21] =?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 --- .../src/main/java/com/kening/vordm/VoRdmApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java index ccbe0f3..cd32db5 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java @@ -11,6 +11,6 @@ import org.springframework.cloud.client.SpringCloudApplication; @SpringCloudApplication public class VoRdmApplication { public static void main(String[] args) { - BladeApplication.run("glj-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); + BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); } } From 46143be9f7daafa66b4975419be3a6590d887df2 Mon Sep 17 00:00:00 2001 From: glj Date: Thu, 4 May 2023 15:23:15 +0800 Subject: [PATCH 09/21] =?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 --- .../com/kening/vordm/controller/DisasterInfoController.java | 2 +- .../main/java/com/kening/vordm/controller/ToolController.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 1eeed63..04e14d3 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 @@ -359,7 +359,7 @@ public class DisasterInfoController { public R updateBatch(@RequestBody List disasterInfoList) { disasterInfoList.stream().forEach(disasterInfo -> { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(GuestManageDisasterRef::getManagerId,disasterInfo.getId()); + qw.eq(GuestManageDisasterRef::getDisasterId,disasterInfo.getId()); GuestManageDisasterRef one = guestManageDisasterRefService.getOne(qw); one.setStatus(1); one.setManagerId(disasterInfo.getChiefId()); diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java index fb16c3d..c8b6c2e 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java @@ -38,6 +38,9 @@ public class ToolController{ if(!StringUtils.isEmpty(tool.getToolName())){ queryWrapper.like("tool_name", tool.getToolName()); } + if(!StringUtils.isEmpty(tool.getLabel())){ + queryWrapper.like("Introduction", tool.getLabel()); + } if(!StringUtils.isEmpty(tool.getLabel())){ queryWrapper.like("label", tool.getLabel()); } From f75f6404b806604ec34c47525f20a968e7e308bc Mon Sep 17 00:00:00 2001 From: glj Date: Fri, 5 May 2023 09:25:06 +0800 Subject: [PATCH 10/21] =?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 --- .../java/com/kening/vordm/controller/ToolController.java | 5 +---- .../main/java/com/kening/vordm/mapper/GuestInfoMapper.xml | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java index c8b6c2e..f38b0c5 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java @@ -39,10 +39,7 @@ public class ToolController{ queryWrapper.like("tool_name", tool.getToolName()); } if(!StringUtils.isEmpty(tool.getLabel())){ - queryWrapper.like("Introduction", tool.getLabel()); - } - if(!StringUtils.isEmpty(tool.getLabel())){ - queryWrapper.like("label", tool.getLabel()); + queryWrapper.like("Introduction", tool.getLabel()).or().like("label", tool.getLabel()); } String checkd = tool.getChecked(); if(checkd != null && checkd.equals("1")){ diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml index fb8f788..15040a8 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml @@ -28,9 +28,9 @@ - update blade_user t set t.name = #{name}, t.real_name = #{realName}, t.organization = #{organization}, - t.research_field = #{researchField}, t.occupation = #{occupation}, t.code = #{country} - where t.id = #{id} + update blade_user t set t.name = #{userVo.name}, t.real_name = #{userVo.realName}, t.organization = #{userVo.organization}, + t.research_field = #{userVo.researchField}, t.occupation = #{userVo.occupation}, t.code = #{userVo.country} + where t.id = #{userVo.id} + select show_name, count(*) as number from tool group by show_name order by number desc limit 10 + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ToolService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ToolService.java index c1517fb..82d6f73 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ToolService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ToolService.java @@ -4,6 +4,8 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.Tool; +import java.util.List; + /** * @author G1393 * @description 针对表【tool(模型工具表)】的数据库操作Service @@ -11,4 +13,6 @@ import com.kening.vordm.entity.Tool; */ public interface ToolService extends IService { + List toolRanking(); + } 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 00e4a9a..8b99414 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 @@ -154,6 +154,9 @@ public class DisasterInfoServiceImpl extends ServiceImpl page(IPage page, CallForHelpVo callForHelpVo) { + if (callForHelpVo.getRoleName().equals("admin")){ + callForHelpVo.setChiefIdEquals(null); + } return page.setRecords(this.baseMapper.page(page, callForHelpVo)); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ToolServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ToolServiceImpl.java index df8d919..130f93b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ToolServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ToolServiceImpl.java @@ -6,6 +6,8 @@ import com.kening.vordm.mapper.ToolMapper; import com.kening.vordm.service.ToolService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author G1393 * @description 针对表【tool(模型工具表)】的数据库操作Service实现 @@ -15,4 +17,8 @@ import org.springframework.stereotype.Service; public class ToolServiceImpl extends ServiceImpl implements ToolService { + @Override + public List toolRanking() { + return this.baseMapper.toolRanking(); + } } From 026eb5d0b44d98598216fa144a1eff0ab89bb90c Mon Sep 17 00:00:00 2001 From: glj Date: Fri, 5 May 2023 16:50:03 +0800 Subject: [PATCH 12/21] =?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 --- .../com/kening/vordm/service/impl/DisasterInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8b99414..53dd396 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 @@ -154,7 +154,7 @@ public class DisasterInfoServiceImpl extends ServiceImpl page(IPage page, CallForHelpVo callForHelpVo) { - if (callForHelpVo.getRoleName().equals("admin")){ + if (callForHelpVo.getRoleName() == null || callForHelpVo.getRoleName().equals("admin")){ callForHelpVo.setChiefIdEquals(null); } return page.setRecords(this.baseMapper.page(page, callForHelpVo)); From eaa4f0d66db992576e680435a73aee33316d622a Mon Sep 17 00:00:00 2001 From: glj Date: Sat, 6 May 2023 14:52:20 +0800 Subject: [PATCH 13/21] =?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 --- .../com/kening/vordm/controller/DisasterInfoController.java | 6 ++++++ .../java/com/kening/vordm/controller/NewsController.java | 1 + .../java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 4 +++- 3 files changed, 10 insertions(+), 1 deletion(-) 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 04e14d3..b229b12 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 @@ -336,6 +336,12 @@ public class DisasterInfoController { @ApiOperation(value = "提交", notes = "传入Tool") @PostMapping("/submit") public R submit(@ApiParam(value = "Tool对象", required = true) @RequestBody DisasterInfo disasterInfo) { + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(GuestManageDisasterRef::getDisasterId,disasterInfo.getId()); + GuestManageDisasterRef one = guestManageDisasterRefService.getOne(qw); + one.setStatus(1); + one.setManagerId(disasterInfo.getChiefId()); + guestManageDisasterRefService.updateById(one); return R.status(disasterInfoService.saveOrUpdate(disasterInfo)); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java index ba7d236..8f4fcd2 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java @@ -72,6 +72,7 @@ public class NewsController { IPage pages = newsService.page(Condition.getPage(query), queryWrapper); return R.data(pages); } + @PostMapping("review") public R review(String ids ,Integer status){ UpdateWrapper updateWrapper = new UpdateWrapper<>(); 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 adfd244..a6369d0 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 @@ -356,12 +356,14 @@ + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java index d6deba8..5dc30cf 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java @@ -75,6 +75,8 @@ public class EntityDataServiceImpl extends ServiceImpl qw = new LambdaQueryWrapper<>(); qw.eq(GuestInfo::getEmail, entityDataUserVo.getEmail()); @@ -91,12 +93,13 @@ public class EntityDataServiceImpl extends ServiceImpl 0); } else { diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java index e170f18..376aa16 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java @@ -39,13 +39,16 @@ public class PictureInfoServiceImpl extends ServiceImpl Date: Mon, 8 May 2023 13:50:33 +0800 Subject: [PATCH 15/21] =?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 Date: Mon, 8 May 2023 13:59:01 +0800 Subject: [PATCH 16/21] =?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 --- .../com/kening/vordm/controller/DisasterInfoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bd76a13..ad7aec5 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 @@ -80,7 +80,7 @@ public class DisasterInfoController { public R> list(CallForHelpVo CallForHelpVo, Query query) { CallForHelpVo userRole = disasterInfoService.getByNameRole("admin"); Long chiefIdEquals = CallForHelpVo.getChiefIdEquals(); - if (chiefIdEquals.equals(userRole.getRoleId())){ + if (chiefIdEquals == null || chiefIdEquals.equals(userRole.getRoleId())){ CallForHelpVo.setChiefIdEquals(null); } IPage pages = disasterInfoService.page(Condition.getPage(query), CallForHelpVo); From 688595e8c88cf03308bc4f120a0235aa518da41e Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 8 May 2023 14:07:44 +0800 Subject: [PATCH 17/21] =?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 --- .../com/kening/vordm/controller/DisasterInfoController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 ad7aec5..104cda1 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 @@ -21,6 +21,7 @@ import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springframework.web.bind.annotation.*; @@ -79,8 +80,8 @@ public class DisasterInfoController { @GetMapping("/list") public R> list(CallForHelpVo CallForHelpVo, Query query) { CallForHelpVo userRole = disasterInfoService.getByNameRole("admin"); - Long chiefIdEquals = CallForHelpVo.getChiefIdEquals(); - if (chiefIdEquals == null || chiefIdEquals.equals(userRole.getRoleId())){ + String userRole1 = AuthUtil.getUserRole(); + if (userRole1.equals("TENANT_ADMIN")){ CallForHelpVo.setChiefIdEquals(null); } IPage pages = disasterInfoService.page(Condition.getPage(query), CallForHelpVo); From 278c6f7f2032d85bcb06aaab748981dca6dd75ff Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 8 May 2023 14:11:58 +0800 Subject: [PATCH 18/21] =?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 --- .../vordm/controller/DisasterInfoController.java | 12 ++++++++++-- .../vordm/service/impl/DisasterInfoServiceImpl.java | 2 -- 2 files changed, 10 insertions(+), 4 deletions(-) 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 104cda1..a62ebfe 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 @@ -81,9 +81,17 @@ public class DisasterInfoController { public R> list(CallForHelpVo CallForHelpVo, Query query) { CallForHelpVo userRole = disasterInfoService.getByNameRole("admin"); String userRole1 = AuthUtil.getUserRole(); - if (userRole1.equals("TENANT_ADMIN")){ - CallForHelpVo.setChiefIdEquals(null); + + if (CallForHelpVo.getChiefIdEquals()!=null){ + if (userRole1.equals("TENANT_ADMIN") && !CallForHelpVo.getChiefIdEquals().equals(userRole.getRoleId())){ + CallForHelpVo.setChiefIdEquals(null); + } + }else { + if (userRole1.equals("TENANT_ADMIN")){ + 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/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index cbe0aff..719bb7c 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 @@ -153,8 +153,6 @@ public class DisasterInfoServiceImpl extends ServiceImpl page(IPage page, CallForHelpVo callForHelpVo) { - - return page.setRecords(this.baseMapper.page(page, callForHelpVo)); } From 7cc3c69023b6a8b564e1ebb5d63bdd5d1325966b Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 8 May 2023 14:15:10 +0800 Subject: [PATCH 19/21] =?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 --- .../com/kening/vordm/controller/DisasterInfoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a62ebfe..eca504f 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 @@ -83,7 +83,7 @@ public class DisasterInfoController { String userRole1 = AuthUtil.getUserRole(); if (CallForHelpVo.getChiefIdEquals()!=null){ - if (userRole1.equals("TENANT_ADMIN") && !CallForHelpVo.getChiefIdEquals().equals(userRole.getRoleId())){ + if (userRole1.equals("TENANT_ADMIN") && CallForHelpVo.getChiefIdEquals().equals(userRole.getRoleId())){ CallForHelpVo.setChiefIdEquals(null); } }else { From 525346db8768e3a63f14a0f43a922e76cf4b2d1b Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 8 May 2023 18:31:02 +0800 Subject: [PATCH 20/21] =?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 | 2 +- .../java/com/kening/vordm/vo/EntityDataUserVo.java | 2 +- .../vordm/controller/DisasterInfoController.java | 4 ++-- .../vordm/controller/EntityDataController.java | 4 ++-- .../RemoteSensingSourceDataController.java | 5 +++++ .../com/kening/vordm/mapper/DisasterInfoMapper.java | 2 +- .../com/kening/vordm/mapper/DisasterInfoMapper.xml | 10 ++++++++-- .../com/kening/vordm/mapper/EntityDataMapper.java | 2 +- .../com/kening/vordm/mapper/EntityDataMapper.xml | 5 +++++ .../java/com/kening/vordm/mapper/GuestInfoMapper.xml | 10 ++-------- .../kening/vordm/service/DisasterInfoService.java | 2 +- .../com/kening/vordm/service/EntityDataService.java | 4 ++-- .../vordm/service/impl/DisasterInfoServiceImpl.java | 4 ++-- .../vordm/service/impl/EntityDataServiceImpl.java | 12 ++++++++---- 14 files changed, 41 insertions(+), 27 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 3f42628..cfeefcb 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 @@ -102,5 +102,5 @@ public class CallForHelpVo extends DisasterInfo { */ private Long parentId; - + private String roleAlias; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java index f84c942..7b6338e 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java @@ -167,7 +167,7 @@ public class EntityDataUserVo { /** * 生产时间 */ - private Date productTime; + private String productTime; /** 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 eca504f..fb9c123 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 @@ -79,11 +79,11 @@ public class DisasterInfoController { }) @GetMapping("/list") public R> list(CallForHelpVo CallForHelpVo, Query query) { - CallForHelpVo userRole = disasterInfoService.getByNameRole("admin"); String userRole1 = AuthUtil.getUserRole(); if (CallForHelpVo.getChiefIdEquals()!=null){ - if (userRole1.equals("TENANT_ADMIN") && CallForHelpVo.getChiefIdEquals().equals(userRole.getRoleId())){ + CallForHelpVo userRole = disasterInfoService.getByUserIdRole(CallForHelpVo.getChiefIdEquals()); + if (userRole1.equals("TENANT_ADMIN") && userRole.getRoleAlias().equals("TENANT_ADMIN")){ CallForHelpVo.setChiefIdEquals(null); } }else { diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java index dcb1031..3a43e16 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java @@ -38,8 +38,8 @@ public class EntityDataController { * @return */ @GetMapping("/getEntityDataSourceOrganization") - public R> getEntityDataSourceOrganization() { - return R.data(entityDataService.getEntityDataSourceOrganization()); + public R> getEntityDataSourceOrganization(Long disasterId) { + return R.data(entityDataService.getEntityDataSourceOrganization(disasterId)); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java index d08f310..0d1692b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java @@ -71,4 +71,9 @@ public class RemoteSensingSourceDataController { qw.eq("disaster_id", disasterId); return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), qw)); } + + @PostMapping("/approval") + public R approval(@RequestBody RemoteSensingSourceData remoteSensingSourceData){ + return R.status(remoteSensingSourceDataService.updateById(remoteSensingSourceData)); + } } 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 5a8278f..bca45c7 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 @@ -81,6 +81,6 @@ public interface DisasterInfoMapper extends BaseMapper { List> disasterNum(String year); - CallForHelpVo getByNameRole(@Param("admin") String admin); + CallForHelpVo getByUserIdRole(@Param("chiefIdEquals") Long chiefIdEquals); } 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 cefe5d9..8983971 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,8 +371,14 @@ - + SELECT br.role_alias AS roleAlias, + br.id AS roleId, + br.parent_id AS parentId, + br.role_name AS roleName + FROM blade_user bu + left JOIN blade_role br on bu.role_id = br.id + WHERE bu.id = #{chiefIdEquals} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.java index 6c1df2c..3962545 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.java @@ -21,6 +21,6 @@ public interface EntityDataMapper extends BaseMapper { IPage getEntityDataList(@Param("entityData") EntityData entityData, IPage page); - List getEntityDataSourceOrganization(); + List getEntityDataSourceOrganization(@Param("disasterId") Long disasterId); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml index 73feec6..21347b9 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml @@ -71,6 +71,11 @@ diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml index 15040a8..dcceda5 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml @@ -43,11 +43,8 @@ @@ -55,11 +52,8 @@ + SELECT id,title,link,provider,disaster_id,create_time,website_id,upload_id + FROM websites + + + and disaster_id = #{websites.disasterId} + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/WebsitesService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/WebsitesService.java index a4c2cde..65aeb44 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/WebsitesService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/WebsitesService.java @@ -1,8 +1,10 @@ package com.kening.vordm.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.Websites; +import com.kening.vordm.vo.CallForHelpVo; /** * @author G1393 @@ -11,4 +13,5 @@ import com.kening.vordm.entity.Websites; */ public interface WebsitesService extends IService { + IPage websitesPage(IPage page, Websites websites); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/WebsitesServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/WebsitesServiceImpl.java index a3dfb33..632c8c6 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/WebsitesServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/WebsitesServiceImpl.java @@ -1,5 +1,7 @@ package com.kening.vordm.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.Websites; import com.kening.vordm.mapper.WebsitesMapper; @@ -15,4 +17,8 @@ import org.springframework.stereotype.Service; public class WebsitesServiceImpl extends ServiceImpl implements WebsitesService { + @Override + public IPage websitesPage(IPage page, Websites websites) { + return this.baseMapper.websitesPage(page, websites); + } }