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

whycq

2023-09-15 a9e8a91fd4c8c504d7df9ef921f32d832390e77d

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

@@ -45,7 +45,7 @@
        add(101);add(102);add(103);add(104);
        add(201);add(202);add(203);add(204);add(205);add(206);
        add(207);add(208);add(209);add(210);add(211);add(212);
        add(213);add(105);
        add(213);add(105);add(1000);
    }};

    /**
@@ -54,7 +54,7 @@
    private int barcodeSize = 2;
    public IoModeType ioMode = IoModeType.NONE;

    public int[][] startSignal = new int[48][2];
    public int[][] startSignal = new int[48][3];

    public SiemensDevpThread(DevpSlave slave) {
        this.slave = slave;
@@ -80,47 +80,62 @@
                    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;
                    //测试库出库，库位状态改为8
                    case 6:
                        String data = task.getData()+"";
                        Byte coun=8;
                        siemensS7Net.Write("DB38.0" + data, coun);
                        break;
                    //复位测试信号
                    case 3:
                        StaProtocol staProtocol = (StaProtocol)task.getData();
                        StaProtocol staProtocol = (StaProtocol) task.getData();
                        siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
                        break;
                    default:
                        break;
                }
                // 心跳
    }
    // 心跳
//                heartbeat();
                Thread.sleep(400);
            } catch (Exception e) {
                e.printStackTrace();
            }
} catch (Exception e) {
        e.printStackTrace();
        }

        }
    }
        }

    @Override
    public boolean connect() {
@Override
public boolean connect() {
        boolean result = false;
        siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
        siemensS7Net.setRack(slave.getRack().byteValue());
        siemensS7Net.setSlot(slave.getSlot().byteValue());
        OperateResult connect = siemensS7Net.ConnectServer();
        if(connect.IsSuccess){
            result = true;
            OutputQueue.DEVP.offer(MessageFormat.format( "【{0}】输送线plc连接成功 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
            log.info("输送线plc连接成功 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
        result = true;
        OutputQueue.DEVP.offer(MessageFormat.format( "【{0}】输送线plc连接成功 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
        log.info("输送线plc连接成功 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
        } else {
            OutputQueue.DEVP.offer(MessageFormat.format( "【{0}】输送线plc连接失败！！！ ===>> [id:{1}] [ip:{2}] [port:{3}]  [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
            log.error("输送线plc连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
        OutputQueue.DEVP.offer(MessageFormat.format( "【{0}】输送线plc连接失败！！！ ===>> [id:{1}] [ip:{2}] [port:{3}]  [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
        log.error("输送线plc连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
        }
        siemensS7Net.ConnectClose();
        return result;
    }
        }

    /**
     * 读取状态 ====> 整块plc
     */
    private void read() throws InterruptedException {
/**
 * 读取状态 ====> 整块plc
 */
private void read() throws InterruptedException {
//        // 更新入出库模式
//        updateIoMode();
        int staNoSize = staNos.size();
@@ -196,12 +211,17 @@
        }

        Thread.sleep(200);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB102.0", (short) 96);
        //测试柜状态获取
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB38.0", (short) 48);
        //启动移库按钮
        OperateResultExOne<byte[]> result6 = siemensS7Net.Read("DB102.0", (short) 96);
        //消防报警
        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 48);
        if(result3.IsSuccess) {
            for(int i=0; i<48; i++){
                startSignal[i][0] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
                startSignal[i][1] = siemensS7Net.getByteTransform().TransInt16(result4.Content, i*2);
                startSignal[i][0] = siemensS7Net.getByteTransform().TransByte(result3.Content, i);//测试柜状态
                startSignal[i][1] = siemensS7Net.getByteTransform().TransBool(result4.Content, i)?1:0;//消防状态
                startSignal[i][2] = siemensS7Net.getByteTransform().TransInt16(result6.Content, i*2);//启动按钮状态
            }
        }
//        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
@@ -238,33 +258,99 @@
    }

    /**
     * 写入 pack码 =====> 单站点写入
     */
    private void write103(String packNo){
        try{

            OperateResult write = siemensS7Net.Write("DB109.0", 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 {
        if (null == staProtocol) {
            return;
        }
        int staNoSize = staNos.size();
        int index = staNos.indexOf(staProtocol.getSiteId());
        short[] array = new short[2];
        array[0] = staProtocol.getWorkNo();
        array[1] = staProtocol.getStaNo();
        OperateResult write = siemensS7Net.Write("DB100." + index*4, array);

        //任务ID下发次数
        int idCount = 0;
        boolean idFlag = false;
        OperateResult write;
        while(idCount < 5){

            write = siemensS7Net.Write("DB100." + index*4, array);    // 写
            if(write.IsSuccess){
                Thread.sleep(200);
                OperateResultExOne<byte[]> readId = siemensS7Net.Read("DB100." + index*4, (short) (staNoSize*2));
                  if(readId.IsSuccess){
                    if(staProtocol.getWorkNo()!=0&&staProtocol.getWorkNo()!=9999){
                        if(!staProtocol.isInEnable()&&(staProtocol.getSiteId()==201||staProtocol.getSiteId()==206)){
                            break;
                        }
                    }
                    short workNo = siemensS7Net.getByteTransform().TransInt16(readId.Content, 0);
                    if(staProtocol.getWorkNo().equals(workNo)){
                        //工作号写入成功
                        idFlag = true;
                        break;
                    } else {//返回结果是成功了，但是真实值不相同
                        idCount++;
                        OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线工作号后返回成功，但是读取工作号值不一致。输送线plc编号={1}，站点数据={2},写入次数={3}",
                                slave.getId(), JSON.toJSON(staProtocol),idCount));
                        log.error("写入输送线工作号后返回成功，但是读取工作号值不一致。输送线plc编号={}，{}，写入次数={}", slave.getId(), JSON.toJSON(staProtocol), idCount);
                    }
                } else {
                    idCount++;
                    OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线工作号后读取工作号失败。输送线plc编号={1}，站点数据={2},写入次数={3}",
                            slave.getId(), JSON.toJSON(staProtocol), idCount));
                    log.error("写入输送线工作号后读取工作号失败。输送线plc编号={}，站点数据={},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), idCount);
                }
            } else {
                idCount++;
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线工作号失败。输送线plc编号={1}，站点数据={2},写入次数={3}",
                        slave.getId(), JSON.toJSON(staProtocol),idCount));
                log.error("写入输送线工作号失败。输送线plc编号={}，站点数据={},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), idCount);
            }
            Thread.sleep(200);
        }
        //写ID尝试了5次还是失败了
        if(!idFlag){
            staProtocol = station.get(staProtocol.getSiteId());
            if (staProtocol.getWorkNo() == 9999 && staProtocol.getStaNo() ==0) {
                staProtocol.setPakMk(true);
            }
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线工作号尝试5次失败。输送线plc编号={1}，站点数据={2}", slave.getId(), JSON.toJSON(staProtocol)));
            log.error("写入输送线工作号尝试5次失败。输送线plc编号={}，站点数据={}", slave.getId(), JSON.toJSON(staProtocol));

            //重新添加数据到任务队列
            boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
            read();//读取1次设备状态
            return;
        }

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

        if (!write.IsSuccess) {
            staProtocol = station.get(staProtocol.getSiteId());
            if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
                staProtocol.setPakMk(true);
            }
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线站点数据失败。输送线plc编号={1}，站点数据={2}", slave.getId(), JSON.toJSON(staProtocol)));
            log.error("写入输送线站点数据失败。输送线plc编号={}，站点数据={}", slave.getId(), JSON.toJSON(staProtocol));
        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】 输送线命令下发 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
            log.info("输送线命令下发 [id:{}] >>>>> 命令下发： {}",  slave.getId(), JSON.toJSON(staProtocol));
        }
        OutputQueue.DEVP.offer(MessageFormat.format("【{0}】 输送线命令下发成功 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
        log.info("输送线命令下发 [id:{}] >>>>> 命令下发成功： {}",  slave.getId(), JSON.toJSON(staProtocol));
    }

    // 更新入出库模式