From bfc816fe3757d7c0b1f95a18e8ec9fbc3e717ae1 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 13:58:15 +0800
Subject: [PATCH] feat: 设备保养加上保养项目
---
src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java | 2 +-
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java | 19 +++++++++++++++++--
src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java | 2 +-
src/main/resources/mybatis/mybatis-config.xml | 4 ++--
src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java | 2 +-
doc/河南鹤壁天沐钢化玻璃厂.sql | 5 ++++-
src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java | 3 +++
7 files changed, 29 insertions(+), 8 deletions(-)
diff --git "a/doc/\346\262\263\345\215\227\351\271\244\345\243\201\345\244\251\346\262\220\351\222\242\345\214\226\347\216\273\347\222\203\345\216\202.sql" "b/doc/\346\262\263\345\215\227\351\271\244\345\243\201\345\244\251\346\262\220\351\222\242\345\214\226\347\216\273\347\222\203\345\216\202.sql"
index 3becd82..a1325ec 100644
--- "a/doc/\346\262\263\345\215\227\351\271\244\345\243\201\345\244\251\346\262\220\351\222\242\345\214\226\347\216\273\347\222\203\345\216\202.sql"
+++ "b/doc/\346\262\263\345\215\227\351\271\244\345\243\201\345\244\251\346\262\220\351\222\242\345\214\226\347\216\273\347\222\203\345\216\202.sql"
@@ -157,4 +157,7 @@
ADD COLUMN `product_model_id` bigint NULL COMMENT '浜у搧瑙勬牸ID' AFTER `inspect_id`;
ALTER TABLE `product-inventory-management-hbtmblc`.`device_ledger`
- ADD COLUMN `product_process_id` bigint NULL COMMENT '宸ュ簭ID' AFTER `type`;
\ No newline at end of file
+ ADD COLUMN `product_process_id` bigint NULL COMMENT '宸ュ簭ID' AFTER `type`;
+
+ALTER TABLE `maintenance_task` ADD COLUMN `maintenance_location` VARCHAR ( 255 ) CHARACTER
+ SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '璁惧淇濆吇浣嶇疆';
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java b/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
index fd8398c..fcbef30 100644
--- a/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
+++ b/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
@@ -30,7 +30,7 @@
@GetMapping("/listPage")
@ApiOperation(value = "璁惧淇濆吇瀹氭椂浠诲姟鍒楄〃")
- public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
+ public AjaxResult listPage(Page<MaintenanceTask> page, MaintenanceTask maintenanceTask) {
return maintenanceTaskService.listPage(page,maintenanceTask);
}
diff --git a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
index a6f4432..512ce58 100644
--- a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
+++ b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
@@ -106,4 +106,7 @@
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty("璁惧淇濆吇浣嶇疆")
+ private String maintenanceLocation;
+
}
diff --git a/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java b/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java
index 19cb6ed..80ff64b 100644
--- a/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java
+++ b/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java
@@ -12,7 +12,7 @@
* @date : 2025/12/22 14:56
*/
public interface MaintenanceTaskService extends IService<MaintenanceTask> {
- AjaxResult listPage(Page page, MaintenanceTask maintenanceTask);
+ AjaxResult listPage(Page<MaintenanceTask> page, MaintenanceTask maintenanceTask);
AjaxResult add(MaintenanceTask maintenanceTask);
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
index f9ed796..e781672 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
@@ -42,7 +42,7 @@
private ProductProcessMapper productProcessMapper;
@Override
- public IPage<DeviceLedgerDto> queryPage(Page<?> page, DeviceLedgerDto deviceLedger) {
+ public IPage<DeviceLedgerDto> queryPage(Page page, DeviceLedgerDto deviceLedger) {
return deviceLedgerMapper.queryPage(page, deviceLedger);
}
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 0c00da7..c17d590 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
@@ -1,7 +1,9 @@
package com.ruoyi.device.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.device.mapper.MaintenanceTaskMapper;
import com.ruoyi.device.pojo.MaintenanceTask;
@@ -39,8 +41,21 @@
private MaintenanceTaskScheduler maintenanceTaskScheduler;
@Override
- public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
- Page<MaintenanceTask> taskPage = maintenanceTaskMapper.selectPage(page, null);
+ public AjaxResult listPage(Page<MaintenanceTask> page, MaintenanceTask maintenanceTask) {
+ LambdaQueryWrapper<MaintenanceTask> queryWrapper = new LambdaQueryWrapper<>();
+ if (maintenanceTask != null) {
+ if (StringUtils.isNotEmpty(maintenanceTask.getTaskName())) {
+ queryWrapper.like(MaintenanceTask::getTaskName, maintenanceTask.getTaskName());
+ }
+ if (StringUtils.isNotEmpty(maintenanceTask.getMaintenanceLocation())) {
+ queryWrapper.like(MaintenanceTask::getMaintenanceLocation, maintenanceTask.getMaintenanceLocation());
+ }
+ if (StringUtils.isNotEmpty(maintenanceTask.getStatus())) {
+ queryWrapper.eq(MaintenanceTask::getStatus, maintenanceTask.getStatus());
+ }
+ }
+ queryWrapper.orderByDesc(MaintenanceTask::getCreateTime);
+ Page<MaintenanceTask> taskPage = maintenanceTaskMapper.selectPage(page, queryWrapper);
// 2. 濡傛灉娌℃湁鏁版嵁锛岀洿鎺ヨ繑鍥炵┖鍒嗛〉
if (taskPage.getRecords().isEmpty()) {
return AjaxResult.success(taskPage);
diff --git a/src/main/resources/mybatis/mybatis-config.xml b/src/main/resources/mybatis/mybatis-config.xml
index 2552373..a9b6aeb 100644
--- a/src/main/resources/mybatis/mybatis-config.xml
+++ b/src/main/resources/mybatis/mybatis-config.xml
@@ -12,8 +12,8 @@
<!-- 閰嶇疆榛樿鐨勬墽琛屽櫒.SIMPLE灏辨槸鏅�氭墽琛屽櫒;REUSE鎵ц鍣ㄤ細閲嶇敤棰勫鐞嗚鍙�(prepared statements);BATCH鎵ц鍣ㄥ皢閲嶇敤璇彞骞舵墽琛屾壒閲忔洿鏂� -->
<setting name="defaultExecutorType" value="SIMPLE"/>
<!-- 鎸囧畾 MyBatis 鎵�鐢ㄦ棩蹇楃殑鍏蜂綋瀹炵幇 -->
- <!-- <setting name="logImpl" value="SLF4J" />-->
- <setting name="logImpl" value="org.apache.ibatis.logging.stdout.StdOutImpl"/>
+ <setting name="logImpl" value="SLF4J"/>
+ <!-- <setting name="logImpl" value="org.apache.ibatis.logging.stdout.StdOutImpl" />-->
<!-- 浣跨敤椹煎嘲鍛藉悕娉曡浆鎹㈠瓧娈� -->
<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
</settings>
--
Gitblit v1.9.3