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 0c92f6b..fa6109c 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 @@ -2,6 +2,7 @@ package org.dromara.business.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.nacos.client.utils.TenantUtil; import io.swagger.v3.oas.annotations.Operation; @@ -119,10 +120,12 @@ public class BusinessAlertController extends BaseController { */ @Operation(summary ="预警推送-实时预警模块专用",description = "预警推送-实时预警模块专用") @GetMapping("/pushAlert") - public R pushAlert(Long alertId,String deptId,String deptName) { + public R pushAlert(Long alertId,@RequestParam(required = false) String deptId,@RequestParam(required = false)String deptName) { BusinessAlert businessAlert= businessAlertService.getBusinessAlert(alertId); - businessAlert.setDeptName(deptName); - businessAlert.setDeptId(deptId); + if(!ObjectUtil.hasEmpty(deptId,deptName)){ + businessAlert.setDeptName(deptName); + businessAlert.setDeptId(deptId); + } businessAlert.setCreateTime(new Date()); //businessAlert.setJobName(deptName + businessAlert.getLabelCn() + DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",businessAlert.getCreateTime())); businessAlertService.updateBusinessAlert(businessAlert); 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 2f664e6..9b0b85d 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 @@ -100,8 +100,21 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { alert.setCreateTime(new Date()); if(ObjectUtil.isNull(alert.getJobName())){ alert.setJobName(alert.getLabelCn()+ DateUtils.getTime()); + alert.setDeptId("106"); + alert.setDeptName("金山街道"); } - alert.setJobName(alert.getLabelCn()+ DateUtils.getTime()); + if(ObjectUtil.equals("车辆",alert.getLabelEn())){ + alert.setLat("34.22403"); + alert.setLng("117.13597"); + + }else if(ObjectUtil.equals("烟雾",alert.getLabelEn())){ + alert.setLat("34.22825"); + alert.setLng("117.14087"); + }else if(ObjectUtil.equals("垃圾",alert.getLabelEn())){ + alert.setLat("34.2264"); + alert.setLng("117.13919"); + } + this.baseMapper.insert(alert); return alert; }