#

Junjie

6 天以前 82c36e2b434fa7a1c16b0448aa4cf1483107f79c

 src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java

@@ -2,6 +2,7 @@

import HslCommunication.Core.Types.OperateResult;
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
@@ -25,13 +26,13 @@
    private SiemensS7Net siemensNet;
    private DeviceConfig deviceConfig;

    public ZyCrnRealConnect(SiemensS7Net siemensS7Net, DeviceConfig deviceConfig) {
        this.siemensNet = siemensS7Net;
    public ZyCrnRealConnect(DeviceConfig deviceConfig) {
        this.deviceConfig = deviceConfig;
    }

    public boolean connect() {
        boolean connected = false;
        siemensNet = new SiemensS7Net(SiemensPLCS.S1200, deviceConfig.getIp());
        OperateResult connect = siemensNet.ConnectServer();
        if(connect.IsSuccess){
            connected = true;
@@ -167,7 +168,7 @@
                    }
                }
                idx++;
                Thread.sleep(500L);
                Thread.sleep(500);
            } while (idx < 5);

            if (command.getAckFinish() == 0) {
@@ -184,7 +185,7 @@
                        }
                    }
                    i++;
                    Thread.sleep(500L);
                    Thread.sleep(500);
                } while (i < 5);
            }

@@ -220,7 +221,7 @@
                    null,    // 修改人员
                    null,    // 备注
                    JSON.toJSONString(command),    // 指令
                    JSON.toJSONString(command),    // 系统状态
                    JSON.toJSONString(getStatus()),    // 系统状态
                    1,    // 下发状态{0:未下发,1:已下发}
                    JSON.toJSONString(response)    // 响应
            );