From 7aca2b562095a836bd9e2e29b938c5b43aff6db1 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 06 五月 2024 16:04:06 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java | 2 +-
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java | 17 ++++++++---------
2 files changed, 9 insertions(+), 10 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 8838423..9c4a35a 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
@@ -73,7 +73,7 @@
private Date collectionTime;
/** 棰勭暀瀛楁1 */
- private String spareField1;
+ private String moduleCode;
/** 棰勭暀瀛楁2 */
private String spareField2;
@@ -255,16 +255,16 @@
{
return collectionTime;
}
- public void setSpareField1(String spareField1)
- {
- this.spareField1 = spareField1;
+
+ public String getModuleCode() {
+ return moduleCode;
}
- public String getSpareField1()
- {
- return spareField1;
+ public void setModuleCode(String moduleCode) {
+ this.moduleCode = moduleCode;
}
- public void setSpareField2(String spareField2)
+
+ public void setSpareField2(String spareField2)
{
this.spareField2 = spareField2;
}
@@ -344,7 +344,6 @@
.append("paramLower", getParamLower())
.append("paramStandard", getParamStandard())
.append("collectionTime", getCollectionTime())
- .append("spareField1", getSpareField1())
.append("spareField2", getSpareField2())
.append("createUser", getCreateUser())
.append("createTime", getCreateTime())
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
index f11841d..dc25db8 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
@@ -82,7 +82,7 @@
*/
public static final String PACK_OP400_RecordData = "PACK.OP400.RecordData";//璇锋眰璁板綍鏁版嵁
- public static final String PACK_OP400_AngleResult = "PACK.OP400.AngleResult";//璇锋眰鎷х揣鏁版嵁
+ public static final String PACK_OP400_AngleResult = "PACK.OP400.AngleResult_1";//璇锋眰鎷х揣鏁版嵁
/**
* OP410
*/
--
Gitblit v1.9.3