From 93320802e24849dfefe6680f54a9a455b81ca470 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 04 九月 2024 20:12:20 +0800
Subject: [PATCH] 1、系统引入liquibase,用于记录数据库版本更新 2、新增字典类型表及字典详情表,并以liquibase的方式创建表导入数据
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java
index 15fa1e7..313adc2 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java
@@ -105,9 +105,10 @@
if (addressLength < 2) {
return null;
}
+ int wordindex = Integer.parseInt(stringdatas[1]) + index;
+ return stringdatas[0] + "." + wordindex;
+ /* if (addressLength == 2) {
- if (addressLength == 2) {
- int wordindex = index;
return stringdatas[0] + "." + wordindex;
}
@@ -115,13 +116,8 @@
int wordindex = index;
int newIndex = wordindex + 13;
return stringdatas[0] + "." + wordindex + "-" + newIndex;
- }
- return null;
- }
-
- public int getPlcAddress() {
-
- return addressIndex;
+ }*/
+// return null;
}
public String getAddress() {
--
Gitblit v1.8.0