From 3baa9f07477107d66bc15611eb04c6927c56d27d Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 23 七月 2024 16:44:59 +0800
Subject: [PATCH] 异常停车记录初始化清楚修改提交
---
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankAbnormalParkAlarmMapper.java | 2 ++
ard-work/src/main/resources/mapper/sy/ArdTankAbnormalParkAlarmMapper.xml | 5 +++++
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 2 +-
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLoadLogMapper.java | 2 ++
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankAbnormalParkAlarmServiceImpl.java | 11 ++++++++---
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankAbnormalParkAlarmService.java | 2 +-
ard-work/src/main/resources/mapper/sy/ArdTankLoadLogMapper.xml | 4 ++++
7 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
index 28f36b3..ed0c2b9 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -204,7 +204,7 @@
thread.start();
}
};
- lockStateTimer.scheduleAtFixedRate(lockStateTask,date,2500);
+ lockStateTimer.scheduleAtFixedRate(lockStateTask,date,1000);
}
/**
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankAbnormalParkAlarmMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankAbnormalParkAlarmMapper.java
index 2e01bc5..f7d67fa 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankAbnormalParkAlarmMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankAbnormalParkAlarmMapper.java
@@ -62,4 +62,6 @@
public List<ArdTankAbnormalParkAlarm> selectArdTankAbnormalParkAlarmByCarIdNoEndTime(String carId);
public int deleteArdTankAbnormalParkAlarmByCarIdAndEndTimeIsNull(String carId);
+
+ public int deleteArdTankAbnormalParkAlarmByEndTime();
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLoadLogMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLoadLogMapper.java
index bc0ce9f..1b99685 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLoadLogMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLoadLogMapper.java
@@ -67,4 +67,6 @@
public int deleteArdTankLoadLogByCarId(String carId);
public List<ArdTankLoadLog> selectArdTankLoadLogByCarIdAndEndTimeIsNotNull(String carId);
+
+ public int deleteArdTankLoadLogByEndTime();
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankAbnormalParkAlarmService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankAbnormalParkAlarmService.java
index 577cb4b..b2a5403 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankAbnormalParkAlarmService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankAbnormalParkAlarmService.java
@@ -56,5 +56,5 @@
*/
public int deleteArdTankAbnormalParkAlarmById(String id);
- //public int deleteArdTankAbnormalParkAlarmByEndTime();
+ public int deleteArdTankAbnormalParkAlarmByEndTime();
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankAbnormalParkAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankAbnormalParkAlarmServiceImpl.java
index 03146fe..5cc3611 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankAbnormalParkAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankAbnormalParkAlarmServiceImpl.java
@@ -375,9 +375,14 @@
return ardTankAbnormalParkAlarmMapper.deleteArdTankAbnormalParkAlarmById(id);
}
- /*@Override
+ @Override
public int deleteArdTankAbnormalParkAlarmByEndTime() {
int result = ardTankAbnormalParkAlarmMapper.deleteArdTankAbnormalParkAlarmByEndTime();
- return result;
- }*/
+ try{
+ return result;
+ }finally {
+ ardTankLoadLogMapper.deleteArdTankLoadLogByEndTime();
+ }
+
+ }
}
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankAbnormalParkAlarmMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankAbnormalParkAlarmMapper.xml
index 7fcb444..82c0e8f 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankAbnormalParkAlarmMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankAbnormalParkAlarmMapper.xml
@@ -90,4 +90,9 @@
delete from ard_tank_abnormal_park_alarm atapa
where atapa.car_id = #{carId} and atapa.end_time is null
</delete>
+
+ <delete id="deleteArdTankAbnormalParkAlarmByEndTime" >
+ delete from ard_tank_abnormal_park_alarm atapa
+ where atapa.end_time is null
+ </delete>
</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankLoadLogMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankLoadLogMapper.xml
index 0a44fbb..9741ff3 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankLoadLogMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankLoadLogMapper.xml
@@ -87,4 +87,8 @@
<select id="selectArdTankLoadLogByCarIdAndEndTimeIsNotNull" parameterType="java.lang.String" resultMap="ArdTankLoadLogResult">
select * from ard_tank_load_log atll where atll.car_id = #{carId} and atll.end_time is not null
</select>
+
+ <delete id="deleteArdTankLoadLogByEndTime" >
+ delete from ard_tank_load_log atll where atll.end_time is not null
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3