From e55cd6430b8e17f7ac60779694af824fea9a52ee Mon Sep 17 00:00:00 2001 From: yyhouc <792163605@qq.com> Date: Wed, 24 May 2023 18:50:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=84=E9=A1=B9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vordm/controller/DisasterInfoController.java | 6 ++++++ .../com/kening/vordm/controller/NewsController.java | 11 +++++++++++ .../controller/RemoteSensingSourceDataController.java | 4 ++++ .../vordm/controller/SocialMediaController.java | 4 ++++ 4 files changed, 25 insertions(+) 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 a5fe000..8e1b07a 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 @@ -456,4 +456,10 @@ public class DisasterInfoController { public R getByUserDisasterInfo(Long userId) { return R.data(disasterInfoService.getByUserDisasterInfoStatistics(userId)); } + //根据ID删除 + @DeleteMapping("/deleteByIds") + public R deleteByIds(@RequestBody List ids) { + return R.status(disasterInfoService.removeByIds(ids)); + } + } 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 4b63263..adc07af 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 @@ -20,6 +20,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.awt.*; +import java.util.List; import java.util.Map; @@ -98,4 +100,13 @@ public class NewsController { public R fileExcelUpload(@RequestParam("fileData") MultipartFile file,@RequestParam("type") Integer type,@RequestParam("disasterId") Long disasterId) { return R.data(newsService.importTemplate(file,type,disasterId)); } + + /** + * 根据IDS 删除 + * @return + */ + @DeleteMapping("/deleteByIds") + public R delete(@RequestBody List ids) { + return R.data(newsService.removeByIds(ids)); + } } 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 0d1692b..a524b69 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 @@ -76,4 +76,8 @@ public class RemoteSensingSourceDataController { public R approval(@RequestBody RemoteSensingSourceData remoteSensingSourceData){ return R.status(remoteSensingSourceDataService.updateById(remoteSensingSourceData)); } + @DeleteMapping("/remove") + public R delete(@RequestBody List ids) { + return R.status(remoteSensingSourceDataService.removeByIds(ids)); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java index 395878d..c07b118 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java @@ -80,4 +80,8 @@ public class SocialMediaController { Boolean flag=service.update(updateWrapper); return R.data(flag); } + @DeleteMapping("/deleteByIds") + public R delete(@RequestBody List ids) { + return R.data(service.removeByIds(ids)); + } } From d1a3901af18036b5a1b1ae20a0e0614dccc50f4a Mon Sep 17 00:00:00 2001 From: yyhouc <792163605@qq.com> Date: Thu, 25 May 2023 16:15:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=81=BE=E5=89=8D?= =?UTF-8?q?=E7=81=BE=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kening/vordm/entity/RemoteSensingSourceData.java | 3 +++ .../controller/RemoteSensingSourceDataController.java | 1 + .../vordm/mapper/RemoteSensingSourceDataMapper.xml | 11 +++++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java index f61fa97..6014e0b 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java @@ -210,6 +210,9 @@ public class RemoteSensingSourceData implements Serializable { //结束时间 @TableField(exist = false) private String endTime; + //标志灾前灾后字段 0-灾前，1-灾后 + @TableField(exist = false) + private Integer beforeOrAfter =1; } 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 a524b69..3a1cc45 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 @@ -55,6 +55,7 @@ public class RemoteSensingSourceDataController { if (optionsJson != null) { remoteSensingSourceData = (RemoteSensingSourceData) JSON.parseObject(optionsJson, RemoteSensingSourceData.class); } + return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData)); } 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 1027544..b8e3af0 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 @@ -89,8 +89,15 @@ open="(" separator="," close=")">#{AList} - - and r.product_time between #{remoteSensingSourceData.startTime} and #{remoteSensingSourceData.endTime} + + and r.product_time >= (select + disaster_time + from disaster_info where id = #{remoteSensingSourceData.disasterId}) + + + and r.product_time < (select + disaster_time + from disaster_info where id = #{remoteSensingSourceData.disasterId})