From eb64c3ede631f9f1ec49260db5190027fa08fb31 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期二, 23 一月 2024 10:57:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/domain/DaOpcuaConfig.java | 117 ++++++++++++++++++++++++++--------------------------------
1 files changed, 53 insertions(+), 64 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/domain/DaOpcuaConfig.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/domain/DaOpcuaConfig.java
index c9faadc..353a1bf 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/domain/DaOpcuaConfig.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/domain/DaOpcuaConfig.java
@@ -1,15 +1,15 @@
package com.jcdm.main.da.opcuaconfig.domain;
-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 com.jcdm.common.annotation.Excel;
+import com.jcdm.common.core.domain.BaseEntity;
/**
- * OPCUA鍙傛暟璁剧疆瀵硅薄 da_opcua_config
+ * 浜や簰淇″彿閰嶇疆瀵硅薄 da_opcua_config
*
* @author yyt
- * @date 2023-12-22
+ * @date 2024-01-22
*/
public class DaOpcuaConfig extends BaseEntity
{
@@ -18,41 +18,46 @@
/** ID */
private Long id;
- /** 鎵�灞炴ā鍧� */
- @Excel(name = "鎵�灞炴ā鍧�")
- private String module;
+ /** $column.columnComment */
/** 鑺傜偣 */
@Excel(name = "鑺傜偣")
private String node;
- /** 闀垮害 */
- @Excel(name = "闀垮害")
+ /** $column.columnComment */
private Long length;
- /** 绫诲瀷 */
- @Excel(name = "绫诲瀷")
+ /** 鏁版嵁绫诲瀷 */
+ @Excel(name = "鏁版嵁绫诲瀷")
private String sysTypes;
- /** 鍔熻兘璇存槑 */
- @Excel(name = "鍔熻兘璇存槑")
+ /** $column.columnComment */
private String functionality;
/** 鏄惁璁㈤槄 */
@Excel(name = "鏄惁璁㈤槄")
private Long subscribe;
- /** 璁㈤槄鍝嶅簲妯″潡 */
- @Excel(name = "璁㈤槄鍝嶅簲妯″潡")
- private String rModule;
- /** 璁㈤槄鍝嶅簲鍑芥暟 */
- @Excel(name = "璁㈤槄鍝嶅簲鍑芥暟")
+ /** 璁㈤槄绫诲瀷 */
+ @Excel(name = "璁㈤槄绫诲瀷")
private String rFunction;
/** 澶囨敞 */
@Excel(name = "澶囨敞")
private String remarks;
+
+ /** 宸ュ簭缂栫爜 */
+ @Excel(name = "宸ュ簭缂栫爜")
+ private String process;
+
+ /** 宸ュ簭鍚嶇О */
+ @Excel(name = "宸ュ簭鍚嶇О")
+ private String processName;
+
+ /** 鐘舵�� */
+ @Excel(name = "鐘舵��")
+ private Long state;
public void setId(Long id)
{
@@ -63,15 +68,7 @@
{
return id;
}
- public void setModule(String module)
- {
- this.module = module;
- }
- public String getModule()
- {
- return module;
- }
public void setNode(String node)
{
this.node = node;
@@ -81,33 +78,12 @@
{
return node;
}
- public void setLength(Long length)
- {
- this.length = length;
- }
-
- public Long getLength()
- {
- return length;
- }
- public void setSysTypes(String sysTypes)
- {
- this.sysTypes = sysTypes;
- }
public String getSysTypes()
{
return sysTypes;
}
- public void setFunctionality(String functionality)
- {
- this.functionality = functionality;
- }
- public String getFunctionality()
- {
- return functionality;
- }
public void setSubscribe(Long subscribe)
{
this.subscribe = subscribe;
@@ -116,19 +92,6 @@
public Long getSubscribe()
{
return subscribe;
- }
- public void setrModule(String rModule)
- {
- this.rModule = rModule;
- }
-
- public String getrModule()
- {
- return rModule;
- }
- public void setrFunction(String rFunction)
- {
- this.rFunction = rFunction;
}
public String getrFunction()
@@ -144,20 +107,46 @@
{
return remarks;
}
+ public void setProcess(String process)
+ {
+ this.process = process;
+ }
+
+ public String getProcess()
+ {
+ return process;
+ }
+ public void setProcessName(String processName)
+ {
+ this.processName = processName;
+ }
+
+ public String getProcessName()
+ {
+ return processName;
+ }
+ public void setState(Long state)
+ {
+ this.state = state;
+ }
+
+ public Long getState()
+ {
+ return state;
+ }
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
- .append("module", getModule())
.append("node", getNode())
- .append("length", getLength())
.append("sysTypes", getSysTypes())
- .append("functionality", getFunctionality())
.append("subscribe", getSubscribe())
- .append("rModule", getrModule())
.append("rFunction", getrFunction())
.append("remarks", getRemarks())
+ .append("process", getProcess())
+ .append("processName", getProcessName())
+ .append("state", getState())
.toString();
}
}
--
Gitblit v1.9.3