From f69073b835f1a0c66590130e1830edcdd75ebb8a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 十一月 2024 16:59:35 +0800
Subject: [PATCH] 去掉dmpvar

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java |   40 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java
index 5a639e8..88c142b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java
@@ -1,10 +1,17 @@
 package com.qianwen.smartman.modules.mdc.entity;
 
 import java.sql.Timestamp;
+import java.util.Date;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
 
 public class SuperAggregateState extends SuperAggregate {
+	private Timestamp time;
     private Timestamp startTime;
     private Timestamp endTime;
+    
+    private Long endL;
+    private Date endD;
     /**
      * 閲囬泦鐨勬湡闂�/鏃堕暱銆傚崟浣嶇?
      */
@@ -151,8 +158,32 @@
         return (result10 * 59) + ($endTime == null ? 43 : $endTime.hashCode());
     }
 
-    public void setStartTime(final Timestamp startTime) {
-        this.startTime = startTime;
+    public Long getEndL() {
+		return endL;
+	}
+
+	public void setEndL(Long endL) {
+		this.endL = endL;
+	}
+
+	public Date getEndD() {
+		return endD;
+	}
+
+	public void setEndD(Date endD) {
+		this.endD = endD;
+	}
+
+	public Timestamp getTime() {
+		return time;
+	}
+
+	public void setTime(Timestamp time) {
+		this.time = time;
+	}
+
+	public void setStartTime(final Timestamp startTime) {
+        this.time = startTime;
     }
 
     public void setEndTime(final Timestamp endTime) {
@@ -193,7 +224,8 @@
 
     @Override // org.springblade.modules.mdc.entity.SuperAggregate
     public String toString() {
-        return "SuperAggregateState(startTime=" + getStartTime() + ", endTime=" + getEndTime() + ", durationCollect=" + getDurationCollect() + ", valueCollect=" + getValueCollect() + ", wcs=" + getWcs() + ", rps=" + getRps() + ", isDeleted=" + getIsDeleted() + ", isPlan=" + getIsPlan() + ", employeeId=" + getEmployeeId() + ", feedbackId=" + getFeedbackId() + ")";
+    	return ToStringBuilder.reflectionToString(this);
+        //return "SuperAggregateState(startTime=" + getStartTime() + ", endTime=" + getEndTime() + ", durationCollect=" + getDurationCollect() + ", valueCollect=" + getValueCollect() + ", wcs=" + getWcs() + ", rps=" + getRps() + ", isDeleted=" + getIsDeleted() + ", isPlan=" + getIsPlan() + ", employeeId=" + getEmployeeId() + ", feedbackId=" + getFeedbackId() + ")";
     }
 
     public SuperAggregateState() {
@@ -213,7 +245,7 @@
     }
 
     public Timestamp getStartTime() {
-        return this.startTime;
+        return this.time;
     }
 
     public Timestamp getEndTime() {

--
Gitblit v1.9.3