diff --git a/bin/script/send_modbus_and_register.py b/bin/script/send_modbus_and_register.py index 139992a9..5cd70dea 100644 --- a/bin/script/send_modbus_and_register.py +++ b/bin/script/send_modbus_and_register.py @@ -8,7 +8,7 @@ TARGET_PORT = 8888 # 请根据实际情况修改 # 元数组 modbus 指令 MODBUS_DATA_HEX = ( - "7e80D920B9A6DB717e", + "7e80DCDC9891706E7e", "0103204135317841ab8e39bf27bccd3f1fb19ac2b231bbc0b6f82040ae3207c3f9f80efa23", "020320413b9fa441acd34dc0024a003fa2a59ac2af34a0c18e17ea413167dbc3f9c7fe6d40", "0303204139565641ab21ddbff6af333fe26800c2aec626c18685244176ee82c3f9bd7568c8", diff --git a/fastbee-admin/src/main/java/com/fastbee/web/task/LogCleanTask.java b/fastbee-admin/src/main/java/com/fastbee/web/task/LogCleanTask.java index a742b693..d0ae5e0c 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/task/LogCleanTask.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/task/LogCleanTask.java @@ -1,5 +1,6 @@ package com.fastbee.web.task; +import com.fastbee.iot.platform.service.IPlatformPushLogService; import com.fastbee.iot.service.IAlertLogService; import com.fastbee.iot.service.IEventLogService; import com.fastbee.notify.service.INotifyLogService; @@ -38,6 +39,9 @@ public class LogCleanTask { @Autowired private INotifyLogService notifyLogService; + @Autowired + private IPlatformPushLogService platformPushLogService; + // 之后还有清理的表往下写 /** @@ -79,6 +83,8 @@ public class LogCleanTask { notifyLogService.cleanNotifyLog(days); //log.info("已清理 notify_log 表 {} 天前的数据", days); + platformPushLogService.cleanPushLog(days); + log.info("========== 日志清理任务执行完成 =========="); } catch (Exception e) { log.error("日志清理任务执行失败", e); diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/system/LogCleanController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/system/LogCleanController.java index 5d66c39c..32804e54 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/system/LogCleanController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/system/LogCleanController.java @@ -4,6 +4,7 @@ import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.enums.BusinessType; +import com.fastbee.iot.platform.service.IPlatformPushLogService; import com.fastbee.iot.service.IAlertLogService; import com.fastbee.iot.service.IEventLogService; import com.fastbee.notify.service.INotifyLogService; @@ -48,6 +49,9 @@ public class LogCleanController extends BaseController { @Autowired private INotifyLogService notifyLogService; + @Autowired + private IPlatformPushLogService platformPushLogService; + /** * 清理日志数据 * @@ -86,6 +90,8 @@ public class LogCleanController extends BaseController { // 清理通知日志 notifyLogService.cleanNotifyLog(days); + platformPushLogService.cleanPushLog(days); + logger.info("日志清理完成,保留最近 {} 天的记录", days); return success(String.format("日志清理完成,已删除 %d 天前的历史数据", days)); } catch (Exception e) { diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/mapper/PlatformPushLogMapper.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/mapper/PlatformPushLogMapper.java index eb8109a3..4c4156f6 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/mapper/PlatformPushLogMapper.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/mapper/PlatformPushLogMapper.java @@ -14,4 +14,5 @@ public interface PlatformPushLogMapper extends BaseMapperX { void cleanPushLog(); + void deletePushLogBeforeDays(int days); } diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/IPlatformPushLogService.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/IPlatformPushLogService.java index 13a0cbaf..dca63f61 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/IPlatformPushLogService.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/IPlatformPushLogService.java @@ -23,4 +23,5 @@ public interface IPlatformPushLogService extends IService { */ void cleanPushLog(); + void cleanPushLog(int days); } diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/impl/PlatformPushLogServiceImpl.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/impl/PlatformPushLogServiceImpl.java index 48890077..9814ce22 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/impl/PlatformPushLogServiceImpl.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/impl/PlatformPushLogServiceImpl.java @@ -121,4 +121,9 @@ public class PlatformPushLogServiceImpl extends ServiceImpl truncate table platform_push_log + + + DELETE FROM platform_push_log + WHERE create_time < DATE_SUB(NOW(), INTERVAL #{days} DAY) + +