From 7dafce3977afbd03c0336468f8ef085d7614dd1c Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Mon, 28 Apr 2025 15:05:20 +0800
Subject: [PATCH 1/9] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A3=9E=E8=A1=8C=E6=AC=A1=E6=95=B0=E6=97=B6=E9=95=BF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=97=E5=8F=82=E6=95=B0=E5=92=8C=E5=BC=82=E6=AD=A5=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E2=91=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IDeviceFlightRecordsService.java  |  2 +-
 .../impl/DeviceFlightRecordsServiceImpl.java  | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceFlightRecordsService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceFlightRecordsService.java
index 71012f0..b451499 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceFlightRecordsService.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceFlightRecordsService.java
@@ -8,7 +8,7 @@ import java.util.Map;
 public interface IDeviceFlightRecordsService {
 
 
-    void saveDeviceFlight(List<DeviceFlightRecordsEntity> deviceFlightRecords);
+    void saveDeviceFlight(DeviceFlightRecordsEntity deviceFlightRecords);
 
     Map<String,Integer> getDeviceFlightCount();
 
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFlightRecordsServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFlightRecordsServiceImpl.java
index 9f08d95..7176e15 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFlightRecordsServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFlightRecordsServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.dromara.sample.manage.mapper.DeviceFlightRecordsMapper;
 import org.dromara.sample.manage.model.entity.DeviceFlightRecordsEntity;
 import org.dromara.sample.manage.service.IDeviceFlightRecordsService;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -18,21 +19,20 @@ public class DeviceFlightRecordsServiceImpl extends ServiceImpl<DeviceFlightReco
 
 
     @Override
-    public void saveDeviceFlight(List<DeviceFlightRecordsEntity> deviceFlightRecords) {
+    @Async
+    public void saveDeviceFlight(DeviceFlightRecordsEntity deviceFlightRecords) {
 
-        deviceFlightRecords.forEach(deviceFlightRecord -> {
-            //查询之前的数据
-            DeviceFlightRecordsEntity deviceFlightRecordsEntities = this.baseMapper.selectOne(new LambdaQueryWrapper<DeviceFlightRecordsEntity>().eq(DeviceFlightRecordsEntity::getDeviceSn,deviceFlightRecord.getDeviceSn()));
+        //查询之前的数据
+        DeviceFlightRecordsEntity deviceFlightRecordsEntities = this.baseMapper.selectOne(new LambdaQueryWrapper<DeviceFlightRecordsEntity>().eq(DeviceFlightRecordsEntity::getDeviceSn,deviceFlightRecords.getDeviceSn()));
 
-            if (ObjectUtil.isNotEmpty(deviceFlightRecordsEntities)) {
-                deviceFlightRecordsEntities.setFlyCount(deviceFlightRecordsEntities.getFlyCount() + deviceFlightRecord.getFlyCount());
-                deviceFlightRecordsEntities.setFlyAccTime(deviceFlightRecordsEntities.getFlyAccTime() + deviceFlightRecord.getFlyAccTime());
+        if (ObjectUtil.isNotEmpty(deviceFlightRecordsEntities)) {
+            deviceFlightRecordsEntities.setFlyCount(deviceFlightRecordsEntities.getFlyCount() + deviceFlightRecords.getFlyCount());
+            deviceFlightRecordsEntities.setFlyAccTime(deviceFlightRecordsEntities.getFlyAccTime() + deviceFlightRecords.getFlyAccTime());
 
-                this.updateById(deviceFlightRecordsEntities);
-            }else {
-                this.save(deviceFlightRecord);
-            }
-        });
+            this.updateById(deviceFlightRecordsEntities);
+        }else {
+            this.save(deviceFlightRecords);
+        }
     }
 
     @Override

From bd1be26370d8cb4d285e39ee102ef4a34dd3f1a4 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Mon, 28 Apr 2025 15:09:55 +0800
Subject: [PATCH 2/9] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A3=9E=E8=A1=8C=E6=AC=A1=E6=95=B0=E6=97=B6=E9=95=BF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=97=E5=8F=82=E6=95=B0=E5=92=8C=E5=BC=82=E6=AD=A5=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E2=91=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/service/impl/DeviceFlightRecordsServiceImpl.java      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFlightRecordsServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFlightRecordsServiceImpl.java
index 7176e15..d441791 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFlightRecordsServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFlightRecordsServiceImpl.java
@@ -19,7 +19,6 @@ public class DeviceFlightRecordsServiceImpl extends ServiceImpl<DeviceFlightReco
 
 
     @Override
-    @Async
     public void saveDeviceFlight(DeviceFlightRecordsEntity deviceFlightRecords) {
 
         //查询之前的数据

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 3/9] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=AF=94=E5=AF=B9=E5=8E=86=E5=8F=B2=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E3=80=81=E6=A0=B9=E6=8D=AE=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=87=8D=E5=A4=8D=E9=A2=84=E8=AD=A6=E4=B8=AA?=
 =?UTF-8?q?=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<List<BusinessAlert>> 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<BusinessAlert, Busin
 
 
     Map<String, Object> listAppAlertCount(@Param("param") BusinessAlertBo businessAlertBo);
+
+    List<BusinessAlert> 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<BusinessAlert> 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<BusinessAlert> 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<BusinessAlert> listHandleHistory(String lng, String lat, String createTime) {
+        if (ObjectUtil.hasEmpty(lng, lat)) {
+            return ListUtil.empty();
+        }
+
+        List<BusinessAlert> 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}
     </select>
 
-
+<select id="listHandleHistory" resultType="org.dromara.business.domain.BusinessAlert">
+    SELECT job_name,max_images,images,create_time,id,handle_type,del_flag,ST_Distance_Sphere(point(lng, lat), point(#{lng},#{lat})) AS distance
+    FROM business_alert
+    WHERE  <![CDATA[ create_time >= DATE_SUB(#{createTime}, INTERVAL 60 DAY) ]]>
+      AND <![CDATA[ create_time <= #{createTime} ]]>
+      and del_flag = 0
+    HAVING <![CDATA[  distance <= 30 ]]>
+    ORDER BY create_time  desc
+</select>
 
 </mapper>

From c9f0286fd80c6b4b1a6537710b4a43f420286d44 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Mon, 28 Apr 2025 16:01:52 +0800
Subject: [PATCH 4/9] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=AF=94=E5=AF=B9=E5=8E=86=E5=8F=B2=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E3=80=81=E6=A0=B9=E6=8D=AE=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=87=8D=E5=A4=8D=E9=A2=84=E8=AD=A6=E4=B8=AA?=
 =?UTF-8?q?=E6=95=B0=E2=91=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/controller/BusinessAlertController.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 398e0f0..229dba3 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
@@ -57,10 +57,10 @@ public class BusinessAlertController extends BaseController {
 
 
     @Operation(summary ="根据经纬度获取历史预警",description = "根据经纬度获取历史预警")
-    @GetMapping("/listHandleHistory")
+    @GetMapping("/alert/listHandleHistory")
     public R<List<BusinessAlert>> listHandleHistory(
-                                              @RequestParam("lng") String lng,
-                                              @RequestParam("lat") String lat,
+                                              @RequestParam(value = "lng",required = false) String lng,
+                                              @RequestParam(value ="lat",required = false) String lat,
                                               @RequestParam("createTime") String createTime) {
         return R.ok(businessAlertService.listHandleHistory(lng,lat,createTime));
     }

From 5224a43389e0f6f9cea37ba9063ba7406155f367 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Mon, 28 Apr 2025 16:34:24 +0800
Subject: [PATCH 5/9] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=AF=94=E5=AF=B9=E5=8E=86=E5=8F=B2=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E3=80=81=E6=A0=B9=E6=8D=AE=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=87=8D=E5=A4=8D=E9=A2=84=E8=AD=A6=E4=B8=AA?=
 =?UTF-8?q?=E6=95=B0=E2=91=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/business/BusinessAlertMapper.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f9469b3..228cbca 100644
--- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
+++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
@@ -835,7 +835,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 <select id="listHandleHistory" resultType="org.dromara.business.domain.BusinessAlert">
-    SELECT job_name,max_images,images,create_time,id,handle_type,del_flag,ST_Distance_Sphere(point(lng, lat), point(#{lng},#{lat})) AS distance
+    SELECT job_name,max_images,images,create_time,id,handle_type,del_flag,ST_Distance_Sphere(point(lng, lat), point(#{lng},#{lat})) AS distance,business_type
     FROM business_alert
     WHERE  <![CDATA[ create_time >= DATE_SUB(#{createTime}, INTERVAL 60 DAY) ]]>
       AND <![CDATA[ create_time <= #{createTime} ]]>

From a54cceef0d5086046dfc128ff374ccb42c8cfee2 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Mon, 28 Apr 2025 16:39:36 +0800
Subject: [PATCH 6/9] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=AF=94=E5=AF=B9=E5=8E=86=E5=8F=B2=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E3=80=81=E6=A0=B9=E6=8D=AE=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=87=8D=E5=A4=8D=E9=A2=84=E8=AD=A6=E4=B8=AA?=
 =?UTF-8?q?=E6=95=B0=E2=91=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/business/BusinessAlertMapper.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 228cbca..507634d 100644
--- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
+++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
@@ -838,7 +838,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     SELECT job_name,max_images,images,create_time,id,handle_type,del_flag,ST_Distance_Sphere(point(lng, lat), point(#{lng},#{lat})) AS distance,business_type
     FROM business_alert
     WHERE  <![CDATA[ create_time >= DATE_SUB(#{createTime}, INTERVAL 60 DAY) ]]>
-      AND <![CDATA[ create_time <= #{createTime} ]]>
+      AND <![CDATA[ create_time < #{createTime} ]]>
       and del_flag = 0
     HAVING <![CDATA[  distance <= 30 ]]>
     ORDER BY create_time  desc

From 5af411aab1f942b77796967874703fd1c7b9ed01 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Mon, 28 Apr 2025 17:16:41 +0800
Subject: [PATCH 7/9] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E2=91=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessAlertStatisticsServiceImpl.java   | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java
index d4276b3..37b4cf6 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java
@@ -12,6 +12,7 @@ import org.dromara.business.mapper.BusinessAlertMapper;
 import org.dromara.business.service.IBusinessAlertService;
 import org.dromara.business.service.IBusinessAlertStatisticsService;
 import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.mybatis.enums.DataScopeType;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.api.RemoteDataScopeService;
@@ -775,20 +776,32 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist
     }
 
     private void createPermissions(BusinessAlertBo businessAlertBo) {
-        Long roleId = Optional.ofNullable(LoginHelper.getLoginUser())
-            .map(LoginUser::getRoles)
-            .filter(roles -> !roles.isEmpty())
-            .map(List::getFirst)
-            .map(RoleDTO::getRoleId)
-            .orElse(null);
-
-        String roleCustom = remoteDataScopeService.getRoleCustom(roleId);
-        if (roleCustom.equalsIgnoreCase("-1")){
-            businessAlertBo.setDeptIdList(ListUtil.empty());
-        }else {
-            businessAlertBo.setDeptIdList(Arrays.stream(roleCustom.split(","))
-                .map(Long::parseLong)
-                .collect(Collectors.toList()));
+        RoleDTO roleDTO = LoginHelper.getLoginUser().getRoles().getFirst();
+
+        //自定义权限
+        if (roleDTO.getDataScope().equalsIgnoreCase(DataScopeType.CUSTOM.getCode())){
+            String roleCustom = remoteDataScopeService.getRoleCustom(roleDTO.getRoleId());
+            if (roleCustom.equalsIgnoreCase("-1")){
+                businessAlertBo.setDeptIdList(ListUtil.empty());
+            }else {
+                businessAlertBo.setDeptIdList(Arrays.stream(roleCustom.split(","))
+                    .map(Long::parseLong)
+                    .collect(Collectors.toList()));
+            }
+        } else if (roleDTO.getDataScope().equalsIgnoreCase(DataScopeType.DEPT_AND_CHILD.getCode())) {
+            //部门及其以下
+            String deptAndChild = remoteDataScopeService.getDeptAndChild(LoginHelper.getDeptId());
+            if (deptAndChild.equalsIgnoreCase("-1")){
+                businessAlertBo.setDeptIdList(ListUtil.empty());
+            }else {
+                businessAlertBo.setDeptIdList(Arrays.stream(deptAndChild.split(","))
+                    .map(Long::parseLong)
+                    .collect(Collectors.toList()));
+            }
+
+        } else if (roleDTO.getDataScope().equalsIgnoreCase(DataScopeType.DEPT.getCode())) {
+            //本部门
+            businessAlertBo.setDeptIdList(List.of(LoginHelper.getDeptId()));
         }
     }
 }

From 20c6fc5ca0754880cdb59417b80d3f3a47cedd1e Mon Sep 17 00:00:00 2001
From: yq183 <645046984@qq.com>
Date: Mon, 28 Apr 2025 17:16:59 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/business/service/impl/BusinessAlertServiceImpl.java | 2 --
 1 file changed, 2 deletions(-)

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 b8a7537..d20cbab 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
@@ -677,8 +677,6 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
                 }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) {

From 3bf3345f7c6a98f363195bec9f61dc04fc878431 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Tue, 29 Apr 2025 09:32:55 +0800
Subject: [PATCH 9/9] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E2=91=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessAlertStatisticsServiceImpl.java   | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java
index 37b4cf6..6542690 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java
@@ -3,6 +3,7 @@ package org.dromara.business.service.impl;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.business.domain.BusinessAlert;
 import org.dromara.business.domain.bo.BusinessAlertBo;
@@ -45,6 +46,7 @@ import static org.dromara.common.core.constant.Constants.FLY_COUNT;
  *
  *预警统计Service业务层处理
  */
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatisticsService {
@@ -776,32 +778,37 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist
     }
 
     private void createPermissions(BusinessAlertBo businessAlertBo) {
-        RoleDTO roleDTO = LoginHelper.getLoginUser().getRoles().getFirst();
+        try {
+            RoleDTO roleDTO = LoginHelper.getLoginUser().getRoles().getFirst();
+
+            //自定义权限
+            if (roleDTO.getDataScope().equalsIgnoreCase(DataScopeType.CUSTOM.getCode())){
+                String roleCustom = remoteDataScopeService.getRoleCustom(roleDTO.getRoleId());
+                if (roleCustom.equalsIgnoreCase("-1")){
+                    businessAlertBo.setDeptIdList(ListUtil.empty());
+                }else {
+                    businessAlertBo.setDeptIdList(Arrays.stream(roleCustom.split(","))
+                        .map(Long::parseLong)
+                        .collect(Collectors.toList()));
+                }
+            } else if (roleDTO.getDataScope().equalsIgnoreCase(DataScopeType.DEPT_AND_CHILD.getCode())) {
+                //部门及其以下
+                String deptAndChild = remoteDataScopeService.getDeptAndChild(LoginHelper.getDeptId());
+                if (deptAndChild.equalsIgnoreCase("-1")){
+                    businessAlertBo.setDeptIdList(ListUtil.empty());
+                }else {
+                    businessAlertBo.setDeptIdList(Arrays.stream(deptAndChild.split(","))
+                        .map(Long::parseLong)
+                        .collect(Collectors.toList()));
+                }
 
-        //自定义权限
-        if (roleDTO.getDataScope().equalsIgnoreCase(DataScopeType.CUSTOM.getCode())){
-            String roleCustom = remoteDataScopeService.getRoleCustom(roleDTO.getRoleId());
-            if (roleCustom.equalsIgnoreCase("-1")){
-                businessAlertBo.setDeptIdList(ListUtil.empty());
-            }else {
-                businessAlertBo.setDeptIdList(Arrays.stream(roleCustom.split(","))
-                    .map(Long::parseLong)
-                    .collect(Collectors.toList()));
-            }
-        } else if (roleDTO.getDataScope().equalsIgnoreCase(DataScopeType.DEPT_AND_CHILD.getCode())) {
-            //部门及其以下
-            String deptAndChild = remoteDataScopeService.getDeptAndChild(LoginHelper.getDeptId());
-            if (deptAndChild.equalsIgnoreCase("-1")){
-                businessAlertBo.setDeptIdList(ListUtil.empty());
-            }else {
-                businessAlertBo.setDeptIdList(Arrays.stream(deptAndChild.split(","))
-                    .map(Long::parseLong)
-                    .collect(Collectors.toList()));
+            } else if (roleDTO.getDataScope().equalsIgnoreCase(DataScopeType.DEPT.getCode())) {
+                //本部门
+                businessAlertBo.setDeptIdList(List.of(LoginHelper.getDeptId()));
             }
-
-        } else if (roleDTO.getDataScope().equalsIgnoreCase(DataScopeType.DEPT.getCode())) {
-            //本部门
-            businessAlertBo.setDeptIdList(List.of(LoginHelper.getDeptId()));
+        } catch (Exception e) {
+            businessAlertBo.setDeptIdList(ListUtil.empty());
+            log.error(e.getMessage(),e);
         }
     }
 }