From b46f7fa6d77852ae9e28a062da234a2ddf9405fb Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 31 三月 2025 16:09:51 +0800
Subject: [PATCH] 2025-3-22定制修改导出去掉容量和连接条
---
src/main/java/com/whyc/pojo/FileParam.java | 81 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/FileParam.java b/src/main/java/com/whyc/pojo/FileParam.java
index 22ac3e7..6024be3 100644
--- a/src/main/java/com/whyc/pojo/FileParam.java
+++ b/src/main/java/com/whyc/pojo/FileParam.java
@@ -1,13 +1,15 @@
package com.whyc.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
-import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -19,7 +21,6 @@
*/
@Data
@AllArgsConstructor
-@NoArgsConstructor
@TableName("tb_file_param")
@ApiModel(value="FileParam瀵硅薄", description="")
@ToString
@@ -34,6 +35,8 @@
private String fileId;
@ApiModelProperty(value = "娴嬭瘯鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss",iso = DateTimeFormat.ISO.DATE_TIME)
private Date testTime;
@ApiModelProperty(value = "鐗堟湰")
@@ -41,6 +44,7 @@
private String version;
@ApiModelProperty(value = "涓婁紶鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date uploadTime;
@ApiModelProperty(value = "鏄惁涓婁紶鏍囧織(0:娌℃湁涓婁紶 1:宸蹭笂浼�)")
@@ -90,9 +94,29 @@
@ApiModelProperty(value = "鏍囩О鐢靛帇")
private Float battVol;
+ private Float battVolGood;
+ private Float battVolBad;
@ApiModelProperty(value = "鏍囩О鍐呴樆(姣)")
private Float battRes;
+ private Float battResGood;
+ private Float battResBad;
+
+ @ApiModelProperty(value = "鏍囩О鐢靛")
+ private Float battSer;
+ private Float battSerGood;
+ private Float battSerBad;
+
+ @ApiModelProperty(value = "杩炴帴鏉￠樆鎶�")
+ private Float connRes;
+ private Float connResGood;
+ private Float connResBad;
+
+ @ApiModelProperty(value = "concount_pb")
+ private Integer concountPb;
+
+ @ApiModelProperty(value = "鍘傚")
+ private String battProducer;
@ApiModelProperty(value = "缁勬暟")
private Integer groupNum;
@@ -127,5 +151,58 @@
@ApiModelProperty(value = "鍐呴樆璁＄畻鏂瑰紡(0:鎵嬪姩 1:鑷姩)")
private Integer evaluationMode;
+ @ApiModelProperty("绯绘暟鍙婇槇鍊兼槸鍚︾鐢�")
+ private int factorDisabled;
+ @ApiModelProperty(value = "鏈烘埧鍚嶇О")
+ @TableField(exist = false)
+ private String stationName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐢垫睜缁勪俊鎭泦鍚�")
+ private List<BattgroupInfo> battInfoList;
+
+ @TableField(exist = false)
+ private String testTimeStr;
+
+ public FileParam() {
+ uploadFlag=0;
+ sysId="";
+ battGroupName="";
+ battBrand="";
+ battModel="";
+ battBatch="";
+ battStation="";
+ battlineName="";
+ battTha=0;
+ battErrflag=0;
+ battTestnum=0;
+ battFaultnum=0;
+ battCap=0f;
+ battCount=0;
+ battVol=0f;
+ battVolGood=0f;
+ battVolBad=0f;
+ battRes=0f;
+ battResGood=0f;
+ battResBad=0f;
+ battSer=0f;
+ battSerGood=0f;
+ battSerBad=0f;
+ connRes=0f;
+ connResGood=0f;
+ connResBad=0f;
+ concountPb=0;
+ battProducer="";
+ groupNum=0;
+ volLowCoeK1=0f;
+ volHighCoeK2=0f;
+ resGoodCoeK3=0f;
+ resBadCoeK4=0f;
+ samplePercent=0;
+ highTempAlarm=0;
+ chainRes=0f;
+ evaluationMode=0;
+ factorDisabled=0;
+ }
}
--
Gitblit v1.9.1