#

luxiaotao1123

2020-08-25 295f9d1ac51f668234d0ac81dd051284cbbf8a35

#

 src/main/java/com/zy/core/model/protocol/CrnProtocol.java

@@ -108,6 +108,14 @@
     */
    private Short alarm1;

    private Short temp1;

    private Short temp2;

    private Short temp3;

    private Short temp4;

    /**
     * 异常1
     */

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

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

import HslCommunication.Core.Types.OperateResult;
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import HslCommunication.Profinet.Melsec.MelsecMcNet;
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
@@ -12,7 +10,6 @@
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.CrnStatusType;
import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
@@ -33,7 +30,7 @@
@Slf4j
public class CrnThread implements Runnable, ThreadHandler {

    private SiemensS7Net siemensNet;
    private MelsecMcNet melsecMcNet;
    private CrnSlave slave;
    private CrnProtocol crnProtocol;

@@ -93,10 +90,8 @@
    @Override
    public boolean connect() {
        boolean result = false;
        siemensNet = new SiemensS7Net(SiemensPLCS.S300, slave.getIp());
        siemensNet.setRack(slave.getRack().byteValue());
        siemensNet.setSlot(slave.getSlot().byteValue());
        OperateResult connect = siemensNet.ConnectServer();
        melsecMcNet = new MelsecMcNet(slave.getIp(), slave.getPort());
        OperateResult connect = melsecMcNet.ConnectServer();
        if(connect.IsSuccess){
            result = true;
            OutputQueue.CRN.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()));
@@ -105,7 +100,7 @@
            OutputQueue.CRN.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:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
        }
        siemensNet.ConnectClose();
        melsecMcNet.ConnectClose();
        return result;
    }

@@ -113,60 +108,50 @@
     * 读取状态
     */
    private void readStatus(){
        OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 56);
        if (result.IsSuccess) {
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));
        try {
            if (null == crnProtocol) {
                crnProtocol = new CrnProtocol();
            }
            crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
            crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
            crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
            crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
            crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
            crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
            crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
            crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
            crnProtocol.setMode(melsecMcNet.ReadInt16("D2231").Content);
            crnProtocol.setTaskNo(melsecMcNet.ReadInt16("D2233").Content);
            crnProtocol.setStatus(melsecMcNet.ReadInt16("D2234").Content);
            crnProtocol.setBay(melsecMcNet.ReadInt16("D2231").Content);
            crnProtocol.setLevel(melsecMcNet.ReadInt16("D2231").Content);
            crnProtocol.setForkPos(melsecMcNet.ReadInt16("D2231").Content);
            crnProtocol.setLiftPos(melsecMcNet.ReadInt16("D2231").Content);
            crnProtocol.setWalkPos(melsecMcNet.ReadInt16("D2231").Content);
//            crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
            crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 18));
            crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
            // 异常信息
            crnProtocol.setError1(siemensNet.getByteTransform().TransBool(result.Content, 22, 2));
            crnProtocol.setError2(siemensNet.getByteTransform().TransBool(result.Content, 24, 2));
            crnProtocol.setError3(siemensNet.getByteTransform().TransBool(result.Content, 26, 2));
            crnProtocol.setError4(siemensNet.getByteTransform().TransBool(result.Content, 28, 2));
            crnProtocol.setError5(siemensNet.getByteTransform().TransBool(result.Content, 30, 2));
            crnProtocol.setError6(siemensNet.getByteTransform().TransBool(result.Content, 32, 2));
            crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 34));
            crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 38));
            crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 42));
            crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 46));
            crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 50));
            crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 54));
            crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 58));

            /**
             *   当读到status == 90.任务完成等待WCS确认 时
             *   下发任务完成指令
             */
            if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
                CrnCommand crnCommand = new CrnCommand();
                crnCommand.setAckFinish((short)1);
                write(crnCommand);
            }

            // 根据实时信息更新数据库
            BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
            BasCrnp basCrnp = new BasCrnp();
            basCrnp.setCrnNo(slave.getId());
            if (basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
                log.error("堆垛机plc数据库更新失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
            }

        } else {
            OutputQueue.CRN.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:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
            crnProtocol.setLoaded(melsecMcNet.ReadInt16("D2231").Content);
            crnProtocol.setAlarm(melsecMcNet.ReadInt16("D2231").Content);
            crnProtocol.setError1(melsecMcNet.ReadBool("D2231", (short) 2).Content);
            crnProtocol.setTemp1(melsecMcNet.ReadInt16("D2231").Content);
            crnProtocol.setTemp2(melsecMcNet.ReadInt16("D2231").Content);
            crnProtocol.setTemp3(melsecMcNet.ReadInt16("D2231").Content);
            crnProtocol.setTemp4(melsecMcNet.ReadInt16("D2231").Content);
            crnProtocol.setXSpeed(melsecMcNet.ReadFloat("D2231").Content);
            crnProtocol.setYSpeed(melsecMcNet.ReadFloat("D2231").Content);
            crnProtocol.setZSpeed(melsecMcNet.ReadFloat("D2231").Content);
            crnProtocol.setXDistance(melsecMcNet.ReadFloat("D2231").Content);
            crnProtocol.setYDistance(melsecMcNet.ReadFloat("D2231").Content);
            crnProtocol.setXDuration(melsecMcNet.ReadFloat("D2231").Content);
            crnProtocol.setYDuration(melsecMcNet.ReadFloat("D2231").Content);
        } catch (Exception e) {
            e.printStackTrace();
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】读取堆垛机plc状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            log.error("读取堆垛机plc状态信息失败 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            return;
        }

        OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));

        // 根据实时信息更新数据库
        BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
        BasCrnp basCrnp = new BasCrnp();
        basCrnp.setCrnNo(slave.getId());
        if (basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
            log.error("堆垛机plc数据库更新失败 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
        }

    }

    /**
@@ -188,7 +173,7 @@
        array[6] = command.getDestinationPosX();
        array[7] = command.getDestinationPosY();
        array[8] = command.getDestinationPosZ();
        OperateResult result = siemensNet.Write("DB8.0", array);
        OperateResult result = melsecMcNet.Write("DB8.0", array);
        if (result.IsSuccess) {
            System.out.println(MessageFormat.format("【{0}】[id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
@@ -202,7 +187,7 @@

    @Override
    public void close() {
        siemensNet.ConnectClose();
        melsecMcNet.ConnectClose();
    }

    public CrnProtocol getCrnProtocol(){