From 6abc20e29568c129f4ca71eccec9310534a8c779 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 04 八月 2020 14:42:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensS7Net.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/gateway/core/net/siemens/SiemensS7Net.java b/src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensS7Net.java
similarity index 97%
rename from src/main/java/com/zy/gateway/core/net/siemens/SiemensS7Net.java
rename to src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensS7Net.java
index ed1e73a..0ec720e 100644
--- a/src/main/java/com/zy/gateway/core/net/siemens/SiemensS7Net.java
+++ b/src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensS7Net.java
@@ -1,16 +1,15 @@
-package com.zy.gateway.core.net.siemens;
+package com.zy.common.HslCommunication.Profinet.Siemens;
-import com.zy.gateway.core.StringResources;
-import com.zy.gateway.core.base.SoftBasic;
-import com.zy.gateway.core.domain.OperateResult;
-import com.zy.gateway.core.domain.OperateResultExOne;
-import com.zy.gateway.core.domain.OperateResultExThree;
-import com.zy.gateway.core.domain.OperateResultExTwo;
-import com.zy.gateway.core.domain.siemens.S7Message;
-import com.zy.gateway.core.domain.siemens.SiemensPLCS;
-import com.zy.gateway.core.net.NetworkDeviceBase;
-import com.zy.gateway.core.transfer.ReverseBytesTransform;
-import com.zy.gateway.core.utils.Utilities;
+import com.zy.common.HslCommunication.BasicFramework.SoftBasic;
+import com.zy.common.HslCommunication.Core.IMessage.S7Message;
+import com.zy.common.HslCommunication.Core.Net.NetworkBase.NetworkDeviceBase;
+import com.zy.common.HslCommunication.Core.Transfer.ReverseBytesTransform;
+import com.zy.common.HslCommunication.Core.Types.OperateResult;
+import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
+import com.zy.common.HslCommunication.Core.Types.OperateResultExThree;
+import com.zy.common.HslCommunication.Core.Types.OperateResultExTwo;
+import com.zy.common.HslCommunication.StringResources;
+import com.zy.common.HslCommunication.Utilities;
import java.io.ByteArrayOutputStream;
import java.net.Socket;
@@ -195,7 +194,7 @@
return OperateResultExOne.CreateSuccessResult(buffer);
}
else {
- return new OperateResultExOne<byte[]>(read.ErrorCode, StringResources.Language.SiemensDataLengthCheckFailed());
+ return new OperateResultExOne<byte[]>(read.ErrorCode,StringResources.Language.SiemensDataLengthCheckFailed());
}
}
--
Gitblit v1.9.1