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_batt_testdata/BatttestdataInf.java |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 44 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java b/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
index 5d16bc1..a145a63 100644
--- a/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
+++ b/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
@@ -1,12 +1,15 @@
 package com.whyc.pojo.db_batt_testdata;
 
 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;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -23,6 +26,8 @@
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
 @TableName(schema = "db_batt_testdata",value ="tb_batttestdata_inf")
 @ApiModel(value="BatttestdataInf瀵硅薄", description="鐢垫睜缁勫巻鍙叉祴璇曟暟鎹�昏〃")
 public class BatttestdataInf implements Serializable {
@@ -71,6 +76,10 @@
     @ApiModelProperty(value = "娴嬭瘯鍋滄鍘熷洜")
     private Integer testStoptype;
 
+    @ApiModelProperty(value = "娴嬭瘯鍋滄鍘熷洜")
+    @TableField(exist = false)
+    private String testStoptypeReason;
+
     @ApiModelProperty(value = "鍦ㄧ嚎鐢靛帇")
     private Float onlineVol;
 
@@ -104,5 +113,40 @@
     @ApiModelProperty(value = "灞辫タ61850鐩戞祴鏀剧數鏁版嵁鏍囪瘑銆�0锛氱洃娴嬫斁鐢碉紱1鍋滅數鏀剧數銆�")
     private Integer testDatatype;
 
+    @TableField(exist = false)
+    private String stationName;
+
+    @TableField(exist = false)
+    private Integer stationId;
+
+    @TableField(exist = false)
+    private Integer powerId;
+
+    @TableField(exist = false)
+    private Integer devId;
+
+    @TableField(exist = false)
+    private String battgroupName;
+
+    @TableField(exist = false)
+    private String provice;
+    @TableField(exist = false)
+    private String city;
+    @TableField(exist = false)
+    private String country;
+    @TableField(exist = false)
+    private String fullName;
+
+    @TableField(exist = false)
+    private Float restCap;
+    @TableField(exist = false)
+    private Float restTime;
+
+    @TableField(exist = false)
+    private Float realCap;
+
+    @TableField(exist = false)
+    private String precentCap;
+
 
 }

--
Gitblit v1.9.1