Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs

野心家

2023-06-01 297aaba86ef2c39dc6b8e9160365b8d3c026d5b8

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

@@ -80,6 +80,15 @@
                    case 2:
                        write((StaProtocol)task.getData());
                        break;
                    // 写数据 103站点写入PACK码
                    case 4:
                        write103((String)task.getData());
                        break;
                    // 火警信号
                    case 5:
                        StaProtocol staProtocol2 = (StaProtocol)task.getData();
                        siemensS7Net.Write("DB108.0" + staProtocol2.getSiteId(), staProtocol2.getStaNo()==1);
                        break;
                    //复位测试信号
                    case 3:
                        StaProtocol staProtocol = (StaProtocol)task.getData();
@@ -197,7 +206,7 @@

        Thread.sleep(200);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB102.0", (short) 96);
        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 96);
        if(result3.IsSuccess) {
            for(int i=0; i<48; i++){
                startSignal[i][0] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
@@ -238,6 +247,24 @@
    }

    /**
     * 写入 pack码 =====> 单站点写入
     */
    private void write103(String packNo){
        try{
            OperateResult write = siemensS7Net.Write("DB109.", packNo);
            if (!write.IsSuccess) {
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线站点数据失败。输送线plc编号={1}，站点数据={2}", slave.getId(), JSON.toJSON(packNo)));
                log.error("写入输送线站点数据失败。输送线plc编号={}，站点数据={}", slave.getId(), JSON.toJSON(packNo));
            } else {
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】 输送线命令下发 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(packNo)));
                log.info("输送线命令下发 [id:{}] >>>>> 命令下发： {}",  slave.getId(), JSON.toJSON(packNo));
            }
        }catch (Exception e){
            log.error("103站点写入数据失败，输送线线程write103");
        }
    }

    /**
     * 写入 ID+目标站 =====> 单站点写入
     */
    private void write(StaProtocol staProtocol) throws InterruptedException {
@@ -248,7 +275,9 @@
        short[] array = new short[2];
        array[0] = staProtocol.getWorkNo();
        array[1] = staProtocol.getStaNo();
        OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
        OperateResult write;

        write = siemensS7Net.Write("DB100." + index*4, array);

//        OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 工作号
//        Thread.sleep(500);