From 010341500b30f3a0e1975755452cfbd1bcbc0017 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Mon, 28 Apr 2025 15:49:46 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=AF=94=E5=AF=B9=E5=8E=86=E5=8F=B2=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E3=80=81=E6=A0=B9=E6=8D=AE=E7=BB=8F=E7=BA=AC=E5=BA=A6=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E9=87=8D=E5=A4=8D=E9=A2=84=E8=AD=A6=E4=B8=AA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusinessAlertController.java | 10 ++++++ .../business/mapper/BusinessAlertMapper.java | 3 ++ .../service/IBusinessAlertService.java | 3 ++ .../impl/BusinessAlertServiceImpl.java | 32 +++++++++++++++++++ .../mapper/business/BusinessAlertMapper.xml | 10 +++++- 5 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java index db13d60..398e0f0 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java +++ b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java @@ -56,6 +56,16 @@ public class BusinessAlertController extends BaseController { } + @Operation(summary ="根据经纬度获取历史预警",description = "根据经纬度获取历史预警") + @GetMapping("/listHandleHistory") + public R> listHandleHistory( + @RequestParam("lng") String lng, + @RequestParam("lat") String lat, + @RequestParam("createTime") String createTime) { + return R.ok(businessAlertService.listHandleHistory(lng,lat,createTime)); + } + + @SaCheckPermission("business:alert:delete") @Log(title = "删除预警", businessType = BusinessType.DELETE) @Operation(summary ="删除预警",description = "删除预警") diff --git a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java index e4c1777..97540e7 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java +++ b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java @@ -101,4 +101,7 @@ public interface BusinessAlertMapper extends BaseMapperPlus listAppAlertCount(@Param("param") BusinessAlertBo businessAlertBo); + + List listHandleHistory(@Param("lng") String lng, @Param("lat") String lat,@Param("createTime") String createTime); + } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java index 8d8405d..c3d8589 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java @@ -86,4 +86,7 @@ public interface IBusinessAlertService { BusinessAlert getTodoBusinessAlert(Long alertId); Boolean deleteFalseAlert(Long alertId); + + List listHandleHistory(String lng, String lat, String createTime); + } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java index dc67990..b8a7537 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java @@ -21,6 +21,7 @@ import org.dromara.business.utils.BatchProcessorUtil; import org.dromara.business.utils.MinioUntil; import org.dromara.business.utils.constants.MinIOConstants; import org.dromara.common.core.enums.BusinessStatusEnum; +import org.dromara.common.core.enums.FormatsType; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.MapstructUtils; @@ -119,6 +120,11 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { alert.setHandleType(BusinessStatusEnum.VERIFY.getStatus()); BeanUtils.copyProperties(alert, businessAlert); + //查询历史预警 + List businessAlertList = this.listHandleHistory(alert.getLng(), alert.getLat(), DateUtils.parseDateToStr(FormatsType.YYYY_MM_DD_HH_MM_SS, alert.getCreateTime())); + + businessAlert.setHandleNum(businessAlertList.size()); + return businessAlert; }).toList(); @@ -656,6 +662,32 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { return this.baseMapper.update(wrapper) > 0; } + @Override + public List listHandleHistory(String lng, String lat, String createTime) { + if (ObjectUtil.hasEmpty(lng, lat)) { + return ListUtil.empty(); + } + + List businessAlerts = this.baseMapper.listHandleHistory(lng, lat, createTime); + + try { + businessAlerts.forEach(businessAlert -> { + if (businessAlert.getBusinessType() == 2){ + businessAlert.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, businessAlert.getImages(), 3600).toString()); + }else { + businessAlert.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlert.getImages(), 3600).toString()); + businessAlert.setMaxImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlert.getMaxImages(), 3600).toString()); + businessAlert.setMaxMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlert.getMaxMateSourceImgUrl(), 3600).toString()); + businessAlert.setMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlert.getMateSourceImgUrl(), 3600).toString()); + } + }); + } catch (Exception e) { + log.error(e.getMessage(),e); + } + + return businessAlerts; + } + public static void main(String[] args) { System.out.println(getLastSixDays()); diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml index 0f4913e..f9469b3 100644 --- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml +++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml @@ -834,6 +834,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${ew.getCustomSqlSegment} - +