From 6965a0e0a915cb54b657c41829d6318919f4fc67 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Tue, 22 Apr 2025 09:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E9=80=9F=E4=BA=91=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=85=A8=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zc/business/controller/DcSdhsEventController.java |  7 +++----
 .../com/zc/business/mapper/DcSdhsEventMapper.java     |  2 ++
 .../com/zc/business/service/IDcSdhsEventService.java  |  2 +-
 .../business/service/impl/DcSdhsEventServiceImpl.java | 11 ++++++-----
 .../resources/mapper/business/DcSdhsEventMapper.xml   |  8 ++++++++
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java b/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java
index 38c45b75..8af22c6c 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java
@@ -64,11 +64,10 @@ public class DcSdhsEventController extends BaseController {
         return dcSdhsEventService.importData(fileName,fileUrl);
     }
 
-    @ApiOperation("根据时间范围删除数据")
+    @ApiOperation("清空历史数据")
     @PostMapping("/deleteData")
-    public AjaxResult deleteData(@ApiParam(value="开始时间", name="startTime", required=true) @RequestParam("startTime") String startTime,
-                                 @ApiParam(value="结束时间", name="endTime", required=true) @RequestParam("endTime") String endTime){
-        return dcSdhsEventService.deleteData(startTime,endTime);
+    public AjaxResult deleteData(){
+        return dcSdhsEventService.deleteData();
     }
 
 
diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcSdhsEventMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcSdhsEventMapper.java
index 3238bcc8..a468f6d0 100644
--- a/zc-business/src/main/java/com/zc/business/mapper/DcSdhsEventMapper.java
+++ b/zc-business/src/main/java/com/zc/business/mapper/DcSdhsEventMapper.java
@@ -76,6 +76,8 @@ public interface DcSdhsEventMapper
 
     boolean deleteByTimeRange(@Param("startTime") String startTime,@Param("endTime") String endTime);
 
+    boolean deleteDcSdhsEvent(@Param("eventList") List<DcSdhsEvent> eventList);
+
     List<Map<String,Object>> selectRegionAnalysis(@Param("type") String type,@Param("thisTime") String thisTime, @Param("lastTime") String lastTime);
     List<Map<String,Object>> selectEventRegionAnalysis(@Param("type") String type,@Param("thisTime") String thisTime, @Param("lastTime") String lastTime);
 
diff --git a/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java b/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java
index af422b1e..8f2003cb 100644
--- a/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java
+++ b/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java
@@ -22,7 +22,7 @@ public interface IDcSdhsEventService
 //    AjaxResult importData(MultipartFile file) throws Exception;
     AjaxResult importData(String fileName,String fileUrl) throws Exception;
 
-    AjaxResult deleteData(String startTime, String endTime);
+    AjaxResult deleteData();
 
     AjaxResult getFileInfo();
 
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java
index 6f153edb..cd4f7fc5 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java
@@ -191,17 +191,18 @@ public class DcSdhsEventServiceImpl implements IDcSdhsEventService {
     }
 
     /**
-     * @param startTime
-     * @param endTime
      * @return com.ruoyi.common.core.domain.AjaxResult
      * @Description 根据时间范围删除数据
      * @author liuwenge
      * @date 2024/9/9 11:58
      */
     @Override
-    public AjaxResult deleteData(String startTime, String endTime) {
-        dcSdhsEventMapper.deleteByTimeRange(startTime, endTime);
-
+    public AjaxResult deleteData() {
+        DcSdhsEvent dcSdhsEvent = new DcSdhsEvent();
+        List<DcSdhsEvent> eventList = dcSdhsEventMapper.selectDcSdhsEventList(dcSdhsEvent);
+        if (eventList != null && eventList.size() > 0) {
+            dcSdhsEventMapper.deleteDcSdhsEvent(eventList);
+        }
         return AjaxResult.success("删除成功");
     }
 
diff --git a/zc-business/src/main/resources/mapper/business/DcSdhsEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcSdhsEventMapper.xml
index a7beecf5..ac4872fb 100644
--- a/zc-business/src/main/resources/mapper/business/DcSdhsEventMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcSdhsEventMapper.xml
@@ -434,6 +434,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where start_time >= #{startTime} and start_time &lt;= #{endTime}
     </delete>
 
+    <delete id="deleteDcSdhsEvent">
+        delete from dc_sdhs_event where id in
+        <foreach collection="eventList" item="item" index="index"
+                 separator="," open="(" close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+
     <select id="selectAccidentModelAnalysis" resultType="com.zc.business.domain.DcSdhsEvent">
         SELECT * FROM `dc_sdhs_event`
         <where>