Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs

tqs

2022-10-11 9ff1f1f221aeafc99653c846b2c2442f9c033ee5

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

@@ -82,7 +82,7 @@
                    //复位测试信号
                    case 3:
                        StaProtocol staProtocol = (StaProtocol)task.getData();
                        siemensS7Net.Write("DB200." + staProtocol.getSiteId(), staProtocol.getStaNo());
                        siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
                        break;
                    default:
                        break;
@@ -188,10 +188,10 @@
        }

        Thread.sleep(200);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB200.0", (short) 96);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
        if(result3.IsSuccess) {
            for(int i=0; i<48; i++){
                startSignal[i] = siemensS7Net.getByteTransform().TransInt16(result.Content, i*2);
                startSignal[i] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
            }
        }
//        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");