From 71cb6a003669c7701295debcd97c97449e41493f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
<7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sun, 15 Jun 2025 11:26:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/ruoyi/quartz/task/RyTask.java | 18 +-
.../resources/mapper/quartz/TaskMapper.xml | 2 +-
ruoyi-ui/public/favicon.ico | Bin 0 -> 13942 bytes
ruoyi-ui/public/logo/logo.png | Bin 452033 -> 23729 bytes
ruoyi-ui/src/api/device/iotConfig.js | 52 ++
ruoyi-ui/src/api/device/iotConfigPoint.js | 44 ++
ruoyi-ui/src/api/device/iotDatas.js | 44 ++
ruoyi-ui/src/api/device/iotWarning.js | 44 ++
ruoyi-ui/src/assets/logo/logo.png | Bin 452033 -> 23729 bytes
ruoyi-ui/src/assets/logo/logo_min.png | Bin 47188 -> 471009 bytes
ruoyi-ui/src/directive/index.js | 5 +-
.../src/directive/permission/notHasPermi.js | 28 +
.../src/layout/components/Sidebar/Logo.vue | 12 +-
ruoyi-ui/src/views/device/iotConfig/index.vue | 456 ++++++++++++++
.../src/views/device/iotConfigPoint/index.vue | 590 ++++++++++++++++++
ruoyi-ui/src/views/device/iotDatas/index.vue | 444 +++++++++++++
.../src/views/device/iotWarning/index.vue | 303 +++++++++
.../views/device/towerDataWarning/index.vue | 31 +-
ruoyi-ui/vue.config.js | 4 +-
.../web/controller/TowerCraneController.java | 23 +-
.../java/com/ruoyi/domain/vo/TowerReqVo.java | 29 -
.../controller/DevIotConfigController.java | 2 +-
.../DevIotConfigPointController.java | 2 +-
.../controller/DevIotDatasController.java | 2 +-
.../controller/DevIotWarningController.java | 2 +-
.../service/impl/DevIotConfigServiceImpl.java | 7 +
.../yanzhu/jh/publics/PublicsController.java | 14 +-
.../mapper/device/DevIotDatasMapper.xml | 2 -
.../device/DevTowerDataWarningMapper.xml | 1 +
.../mapper/project/SurProjectMapper.xml | 2 +-
30 files changed, 2069 insertions(+), 94 deletions(-)
create mode 100644 ruoyi-ui/public/favicon.ico
create mode 100644 ruoyi-ui/src/api/device/iotConfig.js
create mode 100644 ruoyi-ui/src/api/device/iotConfigPoint.js
create mode 100644 ruoyi-ui/src/api/device/iotDatas.js
create mode 100644 ruoyi-ui/src/api/device/iotWarning.js
create mode 100644 ruoyi-ui/src/directive/permission/notHasPermi.js
create mode 100644 ruoyi-ui/src/views/device/iotConfig/index.vue
create mode 100644 ruoyi-ui/src/views/device/iotConfigPoint/index.vue
create mode 100644 ruoyi-ui/src/views/device/iotDatas/index.vue
create mode 100644 ruoyi-ui/src/views/device/iotWarning/index.vue
delete mode 100644 yanzhu-deviceApi/src/main/java/com/ruoyi/domain/vo/TowerReqVo.java
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 84e085d0..def55cde 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -43,15 +43,15 @@ public class RyTask
*/
public void expiredTowerData()
{
- Calendar cal = Calendar.getInstance();
- Date date = new Date();
- cal.setTime(date);
- cal.add(Calendar.DATE,-15);
- String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,cal.getTime());
- Long maxId = taskService.findTowerMaxIdByDate(dateStr);
- if(maxId!=null){
- taskService.deleteDevTowerDataRunByMaxId(maxId);
- }
+// Calendar cal = Calendar.getInstance();
+// Date date = new Date();
+// cal.setTime(date);
+// cal.add(Calendar.DATE,-15);
+// String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,cal.getTime());
+// Long maxId = taskService.findTowerMaxIdByDate(dateStr);
+// if(maxId!=null){
+ taskService.deleteDevTowerDataRunByMaxId(0L);
+// }
}
/**
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/TaskMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/TaskMapper.xml
index 25322924..69972013 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/TaskMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/TaskMapper.xml
@@ -150,7 +150,7 @@
- delete from dev_tower_data_run where id #{id} and
+ delete from dev_tower_data_run where create_time CURDATE() - INTERVAL 15 DAY;