From 02ccfc21d5d4f767bbd92ecda89cdfcc3283728c Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 11 六月 2025 08:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem into master
---
src/main/java/com/whyc/pojo/db_ram_db/DeviceState.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_ram_db/DeviceState.java b/src/main/java/com/whyc/pojo/db_ram_db/DeviceState.java
index 660000d..d0b91b9 100644
--- a/src/main/java/com/whyc/pojo/db_ram_db/DeviceState.java
+++ b/src/main/java/com/whyc/pojo/db_ram_db/DeviceState.java
@@ -1,6 +1,7 @@
package com.whyc.pojo.db_ram_db;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -53,7 +54,7 @@
@ApiModelProperty(value = "娴嬭瘯缁勫彿")
private Integer devTestgroupnum;
- @ApiModelProperty(value = "璁惧娴嬭瘯绫诲瀷")
+ @ApiModelProperty(value = "璁惧宸ヤ綔绫诲瀷")
private Integer devWorkstate;
@ApiModelProperty(value = "璁惧鍛婅鐘舵��")
@@ -110,6 +111,7 @@
private Float devConresist1;
@ApiModelProperty(value = "61850璁惧鍛婅")
+ @TableField(value = "dev_61850alarms")
private String dev61850alarms;
@ApiModelProperty(value = "缁�2浜屾瀬绠″帇闄�")
@@ -127,5 +129,25 @@
@ApiModelProperty(value = "鍏呮斁鐢典竴浣撴満缁�2缁勭鐢垫祦")
private Float groupCurr2;
+ @TableField(exist = false)
+ private String stationName;
+
+ @TableField(exist = false)
+ private String stationId;
+
+ @TableField(exist = false)
+ private Integer powerId;
+
+ @TableField(exist = false)
+ private String devName;
+
+ @TableField(exist = false)
+ private String provice;
+ @TableField(exist = false)
+ private String city;
+ @TableField(exist = false)
+ private String country;
+ @TableField(exist = false)
+ private String fullName;
}
--
Gitblit v1.9.1