#新版HSL

luxiaotao1123

2020-08-07 fcc87a4bdb9cd45767ff65f4b182261371c93457

#新版HSL

 src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftBasic.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftIncrementCount.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftSecurity.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/BasicFramework/SoftZipped.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/BasicFramework/SystemVersion.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Address/DeviceAddressBase.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/IMessage/FetchWriteMessage.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/IMessage/FinsMessage.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/IMessage/HslMessage.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/IMessage/INetMessage.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/IMessage/MelsecA1EBinaryMessage.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/IMessage/MelsecQnA3EAsciiMessage.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/IMessage/MelsecQnA3EBinaryMessage.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/IMessage/ModbusTcpMessage.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/IMessage/S7Message.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Net/HslProtocol.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Net/IReadWriteNet.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Net/NetHandle.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkBase.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkDeviceBase.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkDoubleBase.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Net/NetworkBase/NetworkXBase.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Net/StateOne/AlienSession.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Net/StateOne/AppSession.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Security/HslSecurity.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Transfer/ByteTransformBase.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Transfer/ByteTransformHelper.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Transfer/DataFormat.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Transfer/IByteTransform.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Transfer/RegularByteTransform.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Transfer/ReverseBytesTransform.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Transfer/ReverseWordTransform.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperate.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperateExOne.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperateExThree.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Types/ActionOperateExTwo.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Types/FunctionOperate.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Types/FunctionOperateExOne.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Types/HslTimeOut.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Types/IDataTransfer.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResult.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExFour.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExOne.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExThree.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Core/Types/OperateResultExTwo.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Enthernet/ComplexNet/NetComplexClient.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Enthernet/FileNet/FileBaseInfo.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Enthernet/PushNet/NetPushClient.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Enthernet/SimplifyNet/NetSimplifyClient.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Language/DefaultLanguage.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Language/English.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/LogNet/Core/GenerateMode.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/LogNet/Core/HslMessageDegree.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/LogNet/Core/HslMessageItem.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/LogNet/Core/ILogNet.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/ModBus/ModbusAddress.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/ModBus/ModbusInfo.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/ModBus/ModbusTcpNet.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecA1EDataType.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecA1ENet.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecHelper.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecMcAsciiNet.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecMcDataType.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Profinet/Melsec/MelsecMcNet.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Profinet/Omron/OmronFinsDataType.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Profinet/Omron/OmronFinsNet.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensFetchWriteNet.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensPLCS.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Profinet/Siemens/SiemensS7Net.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/StringResources.java

File was deleted

 src/main/java/com/zy/common/HslCommunication/Utilities.java

File was deleted

 src/main/java/com/zy/common/Main.java

@@ -1,20 +1,20 @@
package com.zy.common;

import com.zy.common.HslCommunication.Core.Net.NetHandle;
import com.zy.common.HslCommunication.Core.Transfer.DataFormat;
import com.zy.common.HslCommunication.Core.Types.ActionOperateExThree;
import com.zy.common.HslCommunication.Core.Types.ActionOperateExTwo;
import com.zy.common.HslCommunication.Core.Types.OperateResult;
import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
import com.zy.common.HslCommunication.Enthernet.ComplexNet.NetComplexClient;
import com.zy.common.HslCommunication.Enthernet.PushNet.NetPushClient;
import com.zy.common.HslCommunication.Enthernet.SimplifyNet.NetSimplifyClient;
import com.zy.common.HslCommunication.ModBus.ModbusTcpNet;
import com.zy.common.HslCommunication.Profinet.Melsec.MelsecA1ENet;
import com.zy.common.HslCommunication.Profinet.Melsec.MelsecMcAsciiNet;
import com.zy.common.HslCommunication.Profinet.Melsec.MelsecMcNet;
import com.zy.common.HslCommunication.Profinet.Siemens.SiemensPLCS;
import com.zy.common.HslCommunication.Profinet.Siemens.SiemensS7Net;
import HslCommunication.Core.Net.NetHandle;
import HslCommunication.Core.Transfer.DataFormat;
import HslCommunication.Core.Types.ActionOperateExThree;
import HslCommunication.Core.Types.ActionOperateExTwo;
import HslCommunication.Core.Types.OperateResult;
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Enthernet.ComplexNet.NetComplexClient;
import HslCommunication.Enthernet.PushNet.NetPushClient;
import HslCommunication.Enthernet.SimplifyNet.NetSimplifyClient;
import HslCommunication.ModBus.ModbusTcpNet;
import HslCommunication.Profinet.Melsec.MelsecA1ENet;
import HslCommunication.Profinet.Melsec.MelsecMcAsciiNet;
import HslCommunication.Profinet.Melsec.MelsecMcNet;
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;

import java.util.Arrays;


 src/main/java/com/zy/core/channel/TestController.java

@@ -15,7 +15,6 @@
    @RequestMapping("/test")
    public String test(){
        Task task = new Task();
        task.setId(1);
        MessageQueue.offer(SlaveType.Crn, 1, task);
        return "ok";
    }

 src/main/java/com/zy/core/thread/CrnThread.java

@@ -1,8 +1,8 @@
package com.zy.core.thread;

import com.zy.common.HslCommunication.Core.Types.OperateResult;
import com.zy.common.HslCommunication.Profinet.Siemens.SiemensPLCS;
import com.zy.common.HslCommunication.Profinet.Siemens.SiemensS7Net;
import HslCommunication.Core.Types.OperateResult;
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
@@ -62,6 +62,8 @@
    public boolean connect() {
        boolean result = false;
        siemensNet = new SiemensS7Net(SiemensPLCS.S1200,slave.getIp());
        siemensNet.setRack((byte) 0);
        siemensNet.setSlot((byte) 1);
        OperateResult connect = siemensNet.ConnectServer();
        if(connect.IsSuccess){
            result = true;

 src/main/java/com/zy/core/thread/DevpThread.java

@@ -1,9 +1,9 @@
package com.zy.core.thread;

import com.zy.common.HslCommunication.Core.Types.OperateResult;
import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
import com.zy.common.HslCommunication.Profinet.Siemens.SiemensPLCS;
import com.zy.common.HslCommunication.Profinet.Siemens.SiemensS7Net;
import HslCommunication.Core.Types.OperateResult;
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
@@ -72,6 +72,8 @@
    public boolean connect() {
        boolean result = false;
        siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
        siemensS7Net.setRack((byte) 0);
        siemensS7Net.setSlot((byte) 1);
        OperateResult connect = siemensS7Net.ConnectServer();
        if(connect.IsSuccess){
            result = true;