From 88ed0e2971154580635fd33f3073e3a26f52fc3a Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 10 十二月 2024 16:06:04 +0800
Subject: [PATCH] 修改逻辑
---
src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/BattAlarm.java b/src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java
similarity index 70%
rename from src/main/java/com/whyc/pojo/BattAlarm.java
rename to src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java
index 3a9e0cc..78ff9ff 100644
--- a/src/main/java/com/whyc/pojo/BattAlarm.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java
@@ -1,7 +1,8 @@
-package com.whyc.pojo;
+package com.whyc.pojo.db_alarm;
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 lombok.AllArgsConstructor;
@@ -27,6 +28,7 @@
private Integer binfId;
@TableField("alm_start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鍛婅寮�濮嬫椂闂�")
private Date almStartTime;
@@ -46,6 +48,19 @@
@ApiModelProperty("鍛婅鍊�")
private Float almValue;
+ @TableField("alm_confirm")
+ @ApiModelProperty("纭鍛婅锛�0鏈‘璁�,1宸茬‘璁�")
+ private Integer almConfirm;
+
+ @TableField("alm_confirm_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("纭鏃堕棿")
+ private Date almConfirmTime;
+
+ @TableField("alm_type")
+ @ApiModelProperty("鍛婅绫诲瀷[1-涓婇檺鍛婅 2-涓嬮檺鍛婅]")
+ private Integer almType;
+
@TableField(exist = false)
@ApiModelProperty("鐢垫睜缁勫悕绉�")
private String binfName;
--
Gitblit v1.9.1