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/safe/pojo/SafeTraining.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeTraining.java b/src/main/java/com/ruoyi/safe/pojo/SafeTraining.java
index f9ecc29..b4add43 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeTraining.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeTraining.java
@@ -11,13 +11,12 @@
import java.time.LocalDateTime;
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.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* <p>
@@ -30,7 +29,7 @@
@Getter
@Setter
@TableName("safe_training")
-@ApiModel(value = "SafeTraining瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳")
+@Schema(name = "SafeTraining瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳")
public class SafeTraining implements Serializable {
private static final long serialVersionUID = 1L;
@@ -38,68 +37,68 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("璇剧▼缂栧彿")
+ @Schema(description = "璇剧▼缂栧彿")
private String courseCode;
- @ApiModelProperty("鍩硅鐩爣")
+ @Schema(description = "鍩硅鐩爣")
private String trainingObjectives;
- @ApiModelProperty("鍩硅鍐呭")
+ @Schema(description = "鍩硅鍐呭")
private String trainingContent;
- @ApiModelProperty("鍩硅鏂瑰紡")
+ @Schema(description = "鍩硅鏂瑰紡")
private String trainingMode;
- @ApiModelProperty("鐘舵��(0锛氭湭寮�濮�1锛氳繘琛屼腑锛�2锛氬凡缁撴潫)")
+ @Schema(description = "鐘舵��(0锛氭湭寮�濮�1锛氳繘琛屼腑锛�2锛氬凡缁撴潫)")
private Integer state;
- @ApiModelProperty("鍙傚姞瀵硅薄")
+ @Schema(description = "鍙傚姞瀵硅薄")
private String participants;
- @ApiModelProperty("鍩硅鍦扮偣")
+ @Schema(description = "鍩硅鍦扮偣")
private String placeTraining;
- @ApiModelProperty("鍩硅璁插笀")
+ @Schema(description = "鍩硅璁插笀")
private String trainingLecturer;
- @ApiModelProperty("鍩硅鏃ユ湡")
+ @Schema(description = "鍩硅鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@NotBlank(message = "鍩硅鏃ユ湡涓嶈兘涓虹┖")
private LocalDate trainingDate;
- @ApiModelProperty("寮�濮嬫椂闂�(鏃跺垎绉�)")
+ @Schema(description = "寮�濮嬫椂闂�(鏃跺垎绉�)")
@NotBlank(message = "寮�濮嬫椂闂翠笉鑳戒负绌�")
private String openingTime;
- @ApiModelProperty("缁撴潫鏃堕棿(鏃跺垎绉�)")
+ @Schema(description = "缁撴潫鏃堕棿(鏃跺垎绉�)")
@NotBlank(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
private String endTime;
- @ApiModelProperty("璇鹃瀛﹀垎")
+ @Schema(description = "璇鹃瀛﹀垎")
private String projectCredits;
- @ApiModelProperty("璇炬椂")
+ @Schema(description = "璇炬椂")
private Double classHour;
- @ApiModelProperty("鑰冩牳鏂瑰紡")
+ @Schema(description = "鑰冩牳鏂瑰紡")
private String assessmentMethod;
- @ApiModelProperty("鏈鍩硅缁煎悎璇勪环")
+ @Schema(description = "鏈鍩硅缁煎悎璇勪环")
private String comprehensiveAssessment;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remarks;
- @ApiModelProperty("璇勪环浜篿d")
+ @Schema(description = "璇勪环浜篿d")
private Integer assessmentUserId;
- @ApiModelProperty("璇勪环鏃堕棿")
+ @Schema(description = "璇勪环鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate assessmentDate;
- @ApiModelProperty("鍩硅鎽樿")
+ @Schema(description = "鍩硅鎽樿")
private String trainingAbstract;
@TableField(fill = FieldFill.INSERT)
@@ -120,4 +119,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3