From c247f5bf64c98595cc7e4efc9e1ae7ff1df79c11 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 14:05:32 +0800
Subject: [PATCH] refactor(swagger): 迁移Swagger注解到OpenAPI 3.0
---
src/main/java/com/ruoyi/device/pojo/DeviceLedger.java | 52 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
index caa8f32..61239ac 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
@@ -4,22 +4,20 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.Date;
/**
* 璁惧鍙拌处瀹炰綋绫�
*/
@Data
@TableName("device_ledger")
-@ApiModel
+@Schema
public class DeviceLedger {
/**
@@ -31,14 +29,26 @@
/**
* 璁惧鍚嶇О
*/
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
private String deviceName;
/**
* 瑙勬牸鍨嬪彿
*/
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String deviceModel;
+
+ /**
+ * 璁惧鍝佺墝
+ */
+ @Schema(description = "璁惧鍝佺墝")
+ private String deviceBrand;
+
+ /**
+ * 瀛樻斁浣嶇疆
+ */
+ @Schema(description = "瀛樻斁浣嶇疆")
+ private String storageLocation;
/**
* 渚涘簲鍟嗗悕绉�
@@ -111,24 +121,44 @@
/* *************************** 杩愯绠＄悊 *************************** */
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty("璁″垝杩愯鏃堕棿")
+ @Schema(description = "璁″垝杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planRuntimeTime;
- @ApiModelProperty("寮�濮嬭繍琛屾椂闂�")
+ @Schema(description = "寮�濮嬭繍琛屾椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startRuntimeTime;
- @ApiModelProperty("缁撴潫杩愯鏃堕棿")
+ @Schema(description = "缁撴潫杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endRuntimeTime;
- @ApiModelProperty("杩愯鏃堕暱")
+ @Schema(description = "杩愯鏃堕暱")
private String runtimeDuration;
+
+ @Schema(description = "鏄惁鎶樻棫 1-鏄� 2-鍚�")
+ private Integer isDepr;
+
+ @Schema(description = "姣忓勾鎶樻棫閲戦")
+ private BigDecimal annualDepreciationAmount;
+
+ @TableField(exist = false)
+ @Schema(description = "绱鎶樻棫")
+ private BigDecimal deprAmount;
+
+ @TableField(exist = false)
+ @Schema(description = "鍑�鍊�")
+ private BigDecimal netValue;
+
+ @Schema(description = "璁惧绫诲瀷")
+ private String type;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3