From 11502c7f9f26edda0733c43a17b5b773ee8447e4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 五月 2026 16:47:47 +0800
Subject: [PATCH] refactor(account): 财务模块更新
---
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
index 8d0caee..3aaac94 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
@@ -6,8 +6,7 @@
import com.ruoyi.device.mapper.MaintenanceTaskMapper;
import com.ruoyi.device.pojo.MaintenanceTask;
import com.ruoyi.device.service.MaintenanceTaskService;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.inspectiontask.pojo.TimingTask;
import com.ruoyi.inspectiontask.service.impl.TimingTaskServiceImpl;
import com.ruoyi.project.system.domain.SysUser;
@@ -34,11 +33,11 @@
private final MaintenanceTaskScheduler maintenanceTaskScheduler;
@Override
- public R<?> listPage(Page page, MaintenanceTask maintenanceTask) {
+ public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
Page<MaintenanceTask> taskPage = maintenanceTaskMapper.selectPage(page, null);
// 2. 濡傛灉娌℃湁鏁版嵁锛岀洿鎺ヨ繑鍥炵┖鍒嗛〉
if (taskPage.getRecords().isEmpty()) {
- return R.ok(taskPage);
+ return AjaxResult.success(taskPage);
}
// 3. 鏀堕泦鎵�鏈夐渶瑕佹煡璇㈢殑鐢ㄦ埛ID
@@ -63,11 +62,11 @@
task.setRegistrant(userNickNameMap.getOrDefault(task.getRegistrantId(), "鏈煡鐢ㄦ埛"));
}
});
- return R.ok(taskPage);
+ return AjaxResult.success(taskPage);
}
@Override
- public R<?> add(MaintenanceTask maintenanceTask) {
+ public AjaxResult add(MaintenanceTask maintenanceTask) {
maintenanceTask.setActive(true);
// 璁＄畻棣栨鎵ц鏃堕棿
TimingTask task = new TimingTask();
@@ -79,31 +78,31 @@
if (insert > 0) {
maintenanceTaskScheduler.scheduleMaintenanceTask(maintenanceTask);
}
- return R.ok(null, "娣诲姞鎴愬姛");
+ return AjaxResult.success("娣诲姞鎴愬姛");
}
@Override
- public R<?> updateByMaintenanceTaskId(MaintenanceTask maintenanceTask) {
+ public AjaxResult updateByMaintenanceTaskId(MaintenanceTask maintenanceTask) {
MaintenanceTask maintenanceTask1 = maintenanceTaskMapper.selectById(maintenanceTask.getId());
if (maintenanceTask1 == null) {
- return R.fail(HttpStatus.WARN, "娌℃湁姝ゆ暟鎹�");
+ return AjaxResult.warn("娌℃湁姝ゆ暟鎹�");
}
BeanUtils.copyProperties(maintenanceTask, maintenanceTask1);
int update = maintenanceTaskMapper.updateById(maintenanceTask1);
if (update > 0) {
maintenanceTaskScheduler.rescheduleMaintenanceTask(maintenanceTask1);
}
- return R.ok(null, "鏇存柊鎴愬姛");
+ return AjaxResult.success("鏇存柊鎴愬姛");
}
@Override
- public R<?> delete(List<Long> ids) {
+ public AjaxResult delete(List<Long> ids) {
int delete = maintenanceTaskMapper.deleteBatchIds(ids);
if (delete > 0) {
ids.forEach(id -> {
maintenanceTaskScheduler.unscheduleMaintenanceTask(id);
});
}
- return R.ok(null, "鍒犻櫎鎴愬姛");
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
}
}
--
Gitblit v1.9.3