From dc26b581fb9f8c9ce7a86b0495d67764092c3500 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 15 四月 2026 17:06:17 +0800
Subject: [PATCH] feat(device): 添加设备类目字段并重构DTO结构
---
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 2 +
src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 26 ++-----------
src/main/resources/mapper/device/DeviceRepairMapper.xml | 4 +
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 4 ++
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 67 ++-------------------------------
src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 3 +
6 files changed, 20 insertions(+), 86 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index 522a324..f4e71c5 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -2,13 +2,14 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.device.pojo.DeviceMaintenance;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@Data
-public class DeviceMaintenanceDto {
+public class DeviceMaintenanceDto extends DeviceMaintenance {
@ApiModelProperty("璁惧淇濆吇id")
@@ -23,20 +24,8 @@
@ApiModelProperty("瑙勬牸鍨嬪彿")
private String deviceModel;
- @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private String maintenancePlanTimeReq;
-
- @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private String maintenancePlanTime;
-
@ApiModelProperty("瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
-
- @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private String maintenanceActuallyTime;
-
- @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private String maintenanceActuallyTimeReq;
@ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
private String maintenanceResult;
@@ -45,25 +34,18 @@
private Integer status;
@ApiModelProperty("鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@ApiModelProperty("鏇存柊鏃堕棿")
- @TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜�")
- @TableField(fill = FieldFill.INSERT)
- private String createUser;
-
@ApiModelProperty("鏇存柊浜�")
- @TableField(fill = FieldFill.UPDATE)
- private String updateUser;
+ private String updateUserName;
@ApiModelProperty("绉熸埛id")
- @TableField(fill = FieldFill.INSERT)
private Long tenantId;
@ApiModelProperty("鍒涘缓浜哄悕绉�")
private String createUserName;
}
+
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 92cfe8c..4ab8513 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -1,74 +1,15 @@
package com.ruoyi.device.dto;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.device.pojo.DeviceRepair;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.time.LocalDateTime;
-import java.util.Date;
-
@Data
-public class DeviceRepairDto {
+public class DeviceRepairDto extends DeviceRepair {
- @ApiModelProperty("璁惧鎶ヤ慨id")
- private Long id;
-
- @ApiModelProperty("璁惧鍙拌处id")
- private Long deviceLedgerId;
-
- @ApiModelProperty("璁惧鍚嶇О")
- private String deviceName;
-
- @ApiModelProperty("璁惧鍨嬪彿")
- private String deviceModel;
-
- @ApiModelProperty("鎶ヤ慨鏃堕棿")
- private Date repairTime;
-
+ @ApiModelProperty("鎶ヤ慨鏃堕棿瀛楃涓�")
private String repairTimeStr;
- @ApiModelProperty("鎶ヤ慨浜�")
- private String repairName;
-
- @ApiModelProperty("鎶ヤ慨鍐呭")
- private String remark;
-
- @ApiModelProperty("缁翠慨浜�")
- private String maintenanceName;
-
- @ApiModelProperty("缁翠慨鏃堕棿")
- private Date maintenanceTime;
-
+ @ApiModelProperty("缁翠慨鏃堕棿瀛楃涓�")
private String maintenanceTimeStr;
-
- @ApiModelProperty("缁翠慨缁撴灉")
- private String maintenanceResult;
-
- @ApiModelProperty("鐘舵��")
- private Integer status;
-
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- @ApiModelProperty("鏇存柊鏃堕棿")
- @TableField(fill = FieldFill.UPDATE)
- private LocalDateTime updateTime;
-
- @ApiModelProperty("鍒涘缓浜�")
- @TableField(fill = FieldFill.INSERT)
- private String createUser;
-
- @ApiModelProperty("鏇存柊浜�")
- @TableField(fill = FieldFill.UPDATE)
- private String updateUser;
-
- @ApiModelProperty("绉熸埛id")
- @TableField(fill = FieldFill.INSERT)
- private Long tenantId;
-
-
}
-
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index 5176f7d..cbf8dbf 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -38,6 +38,9 @@
@ApiModelProperty(value = "鏈�鍚庢墽琛屾椂闂�")
private LocalDateTime lastExecutionTime;
+ @ApiModelProperty(value = "璁惧绫荤洰")
+ private String machineryCategory;
+
private String deviceName;
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index abcbf73..7beedee 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -34,6 +34,10 @@
@ApiModelProperty("鎶ヤ慨鍐呭")
private String remark;
+
+ @ApiModelProperty(value = "璁惧绫荤洰")
+ private String machineryCategory;
+
@ApiModelProperty("缁翠慨浜�")
private String maintenanceName;
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 2ed16a4..e166457 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -19,6 +19,7 @@
dm.tenant_id,
dm.maintenance_actually_name,
dl.device_name,
+ dm.machinery_category,
dl.device_model,
su.nick_name as create_user_name
from device_maintenance dm
@@ -62,6 +63,7 @@
dm.create_user,
dm.update_user,
dm.tenant_id,
+ dm.machinery_category,
dm.maintenance_actually_name,
dl.device_name,
dl.device_model,
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index d093980..aeb87a8 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -21,7 +21,8 @@
dr.update_user,
dr.tenant_id,
dl.device_name,
- dl.device_model
+ dl.device_model,
+ dr.machinery_category
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
<where>
@@ -66,6 +67,7 @@
dr.update_user,
dr.tenant_id,
dl.device_name,
+ dr.machinery_category,
dl.device_model
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
--
Gitblit v1.9.3