From d3409e53d656dff668c12a335bcb6f367ca63fdb Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 25 一月 2024 09:03:10 +0800
Subject: [PATCH] opcua迁移
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java | 60 +++++-------------------------------------------------------
1 files changed, 5 insertions(+), 55 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
index ad11ae4..05d7528 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
@@ -1,11 +1,11 @@
package com.jcdm.main.da.paramCollection.domain;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
/**
* 璁惧浜у搧杩囩▼鍙傛暟閲囬泦瀵硅薄 da_param_collection
@@ -65,8 +65,7 @@
private String paramStandard;
/** 閲囬泦鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "閲囬泦鏃堕棿")
private Date collectionTime;
/** 棰勭暀瀛楁1 */
@@ -96,15 +95,6 @@
/** 绫诲瀷 */
@Excel(name = "绫诲瀷")
private String type;
- @Excel(name = "鍙傛暟闆嗙紪鐮�")
- private String parameterSetCode;
- @Excel(name = "鍙傛暟闆嗗悕绉�")
- private String parameterSetName;
- @Excel(name = "宸ュ簭缂栧彿")
- private String processesCode;
- @Excel(name = "宸ュ簭鍚嶇О")
- private String processesName;
-
public void setId(Long id)
{
@@ -295,42 +285,6 @@
{
return type;
}
- public void setParameterSetCode(String parameterSetCode)
- {
- this.parameterSetCode = parameterSetCode;
- }
-
- public String getParameterSetCode()
- {
- return parameterSetCode;
- }
- public void setParameterSetName(String parameterSetName)
- {
- this.parameterSetName = parameterSetName;
- }
-
- public String getParameterSetName()
- {
- return parameterSetName;
- }
- public void setProcessesCode(String processesCode)
- {
- this.processesCode = processesCode;
- }
-
- public String getProcessesCode()
- {
- return processesCode;
- }
- public void setProcessesName(String processesName)
- {
- this.processesName = processesName;
- }
-
- public String getProcessesName()
- {
- return processesName;
- }
@Override
public String toString() {
@@ -358,10 +312,6 @@
.append("paramName", getParamName())
.append("unit", getUnit())
.append("type", getType())
- .append("parameterSetCode", getParameterSetCode())
- .append("parameterSetName", getParameterSetName())
- .append("processesCode", getProcessesCode())
- .append("processesName", getProcessesName())
.toString();
}
}
--
Gitblit v1.9.3