From da9ca5f7e2bc9123ff66d9bcedfca2368455aa88 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 25 Jul 2024 16:34:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E9=87=8D=E8=AF=95=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E8=AE=B0=E5=BD=95=E6=97=B6=E9=97=B4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zhgd/xmgl/task/HikvisionTask.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java b/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java index 6c830c737..80bc37018 100644 --- a/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java +++ b/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java @@ -106,6 +106,15 @@ public class HikvisionTask { @Scheduled(cron = "0 0/30 * * * ?") @RequestMapping("deleteLongTask") public void deleteLongTask() throws Exception { + doDeleteLongTask(false); + } + + @RequestMapping("deleteAllTask") + public void deleteAllTask() throws Exception { + doDeleteLongTask(true); + } + + private void doDeleteLongTask(boolean deleteAll) { List projects = projectMapper.selectList(new LambdaQueryWrapper() .eq(Project::getSyncHikvision, 1)); for (Project project : projects) { @@ -115,7 +124,7 @@ public class HikvisionTask { JSONArray listJa = dataJo.getJSONArray("list"); for (int i = 0; i < listJa.size(); i++) { JSONObject jo = listJa.getJSONObject(i); - if (DateUtil.compare(DateUtil.parse(jo.getString("createTime")), DateUtil.offsetMinute(new Date(), -30)) < 0) { + if (deleteAll || DateUtil.compare(DateUtil.parse(jo.getString("createTime")), DateUtil.offsetMinute(new Date(), -30)) < 0) { if (jo.getInteger("taskStatus").equals(1)) { HikvisionUtil.stopTask(project, new JoBuilder().put("taskId", jo.getString("authTaskId")).build()); } else { @@ -128,7 +137,6 @@ public class HikvisionTask { } } - } /**