#小车地图bug修复，小车动画

1

5 天以前 a84e04a54fa499bcff8c9806df5c15e09ce3c504

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

@@ -10,6 +10,8 @@
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasRgvMapMapper;
import com.zy.asrs.mapper.BasRgvMapper;
import com.zy.asrs.service.*;
import com.zy.common.utils.News;
import com.zy.core.DevpThread;
@@ -24,6 +26,7 @@
import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
@@ -37,7 +40,8 @@
@Data
@Slf4j
public class SiemensDevpThread implements Runnable, DevpThread {

    private BasRgvMapMapper basRgvMapMapper;
    private BasRgvMapper basRgvMapper;
    private DevpSlave slave;
    private SiemensS7Net siemensS7Net;
    private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
@@ -47,6 +51,7 @@
//
//    }};
    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
        add(1);add(2);//小车站点
        add(1001);add(1002);add(1004);
        add(1005);add(1007);
        add(1008);add(1010);
@@ -67,6 +72,7 @@
    }};

    public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
        add(3);add(4);
        add(2001);add(2003);
        add(2004);add(2006);
        add(2007);add(2009);
@@ -442,7 +448,7 @@
        OperateResultExOne<byte[]> result4 = null;//1054-1079
        OperateResultExOne<byte[]> result5 = null;//1080-1110
        OperateResultExOne<byte[]> resultErr = null;
        if(staNoSize == 100){
        if(staNoSize == 102){
            result1 = siemensS7Net.Read("DB100.0", (short) (2768));//1001-1028
            result2 = siemensS7Net.Read("DB101.0", (short) (1268));//1029-1037
            result3 = siemensS7Net.Read("DB104.0", (short) (1268));//1042-1053
@@ -470,7 +476,7 @@
                    station.put(siteId, staProtocol);
                }
                staProtocol.setSiteId(siteId);
                if (staNoSize == 100) {
                if (staNoSize == 102) {
                    if (siteId < 1029) {
                        result = result1;
                    } else if (siteId < 1042) {
@@ -491,152 +497,168 @@
                        result = result3;
                    }
                }
                // 获取该站点对应的偏移量
                Integer offset = siteOffsetMap.get(siteId);
                if (offset == null) {
                    continue; // 如果没定义偏移量，跳过
                }
                Integer offset2 = getOffsetBySiteId(siteId);//特殊偏移量计算
                Integer offset3 = getOffsetBySiteId2(siteId);
                Integer offsetSign = siteOffsetMapSign.get(siteId);
                if(siteId == 1040){
                    boolean[] full = siemensS7Net.getByteTransform().TransBool(result.Content, offset, 2);
                    staProtocol.setFull(full[0]);
                }
                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2));     // 工作号
                staProtocol.setStaNo((short)siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 12));   // 目标站
                staProtocol.setBarcode(String.valueOf(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 16)));  //条码
//                if(siteId < 5){
//                    int rgvNo = 2;
//                    if(siteId<3){
//                        rgvNo = 1;
//                    }
////                    BasRgv basRgv = basRgvMapper.selectByRgvNo(rgvNo);
//                    BasRgvMap basRgvMap = basRgvMapMapper.selectByRgvNo(rgvNo);
//                    if(siteId%2 != 0){
////                        staProtocol.setWorkNo(basRgv.getWrkNo1());
//                    }else{
////                        staProtocol.setWorkNo(basRgv.getWrkNo2());
//                    }
//
//                }else{
                    // 获取该站点对应的偏移量
                    Integer offset = siteOffsetMap.get(siteId);
                    if (offset == null) {
                        continue; // 如果没定义偏移量，跳过
                    }
                    Integer offset2 = getOffsetBySiteId(siteId);//特殊偏移量计算
                    Integer offset3 = getOffsetBySiteId2(siteId);
                    Integer offsetSign = siteOffsetMapSign.get(siteId);
                    if(siteId == 1040){
                        boolean[] full = siemensS7Net.getByteTransform().TransBool(result.Content, offset, 2);
                        staProtocol.setFull(full[0]);
                    }
                    staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2));     // 工作号
                    staProtocol.setStaNo((short)siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 12));   // 目标站
                    staProtocol.setBarcode(String.valueOf(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 16)));  //条码

                if(specialSites2.contains(siteId)){
                    staProtocol.setStaNo((short)siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 48));   // 目标站
                    staProtocol.setBarcode(String.valueOf(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 52)));  //条码
                }
                if(staNosErrList.contains(siteId)){
                    Integer offsetErr = siteErrOffsetMap.get(siteId);
                    boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(resultErr.Content, offsetErr, 2);
                    staProtocol.setFrontErr(statusErr[2]);
                    staProtocol.setBackErr(statusErr[3]);
                    staProtocol.setHighErr(statusErr[5]);
                    staProtocol.setLeftErr(statusErr[11]);
                    staProtocol.setRightErr(statusErr[12]);
                    if(specialSites2.contains(siteId)){
                        staProtocol.setStaNo((short)siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 48));   // 目标站
                        staProtocol.setBarcode(String.valueOf(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 52)));  //条码
                    }
                    if(staNosErrList.contains(siteId)){
                        Integer offsetErr = siteErrOffsetMap.get(siteId);
                        boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(resultErr.Content, offsetErr, 2);
                        staProtocol.setFrontErr(statusErr[2]);
                        staProtocol.setBackErr(statusErr[3]);
                        staProtocol.setHighErr(statusErr[5]);
                        staProtocol.setLeftErr(statusErr[11]);
                        staProtocol.setRightErr(statusErr[12]);
// 取出454~458位置的5个字节
                    byte[] bytes = Arrays.copyOfRange(resultErr.Content, (offsetErr + 14), (offsetErr + 19));
                        byte[] bytes = Arrays.copyOfRange(resultErr.Content, (offsetErr + 14), (offsetErr + 19));
// 转换成字符串（S7里CHAR是单字节编码，直接ASCII即可）
                    String plcStr = new String(bytes, StandardCharsets.US_ASCII).trim();
                        String plcStr = new String(bytes, StandardCharsets.US_ASCII).trim();
// 判断是否等于 "error"
                    staProtocol.setBarcodeErr("error".equalsIgnoreCase(plcStr));
                }
                        staProtocol.setBarcodeErr("error".equalsIgnoreCase(plcStr));
                    }

                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3, 1);
                staProtocol.setAutoing(!status[0]);  // 自动
                boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 4, 3);
                boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 8, 3);
                boolean[] statusSign = siemensS7Net.getByteTransform().TransBool(resultErr.Content, offsetSign, 3);
                boolean loading = false;
                if(!status1[0])
                {
                    loading = true;
                }
                staProtocol.setLoading(loading);  // 有物
                    boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3, 1);
                    staProtocol.setAutoing(!status[0]);  // 自动
                    boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 4, 3);
                    boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 8, 3);
                    boolean[] statusSign = siemensS7Net.getByteTransform().TransBool(resultErr.Content, offsetSign, 3);
                    boolean loading = false;
                    if(!status1[0])
                    {
                        loading = true;
                    }
                    staProtocol.setLoading(loading);  // 有物

                staProtocol.setInEnable(status1[2]); // 可入
                staProtocol.setOutEnable(status1[2]);// 可出
                staProtocol.setErr(status1[6]);
                    staProtocol.setInEnable(status1[2]); // 可入
                    staProtocol.setOutEnable(status1[2]);// 可出
                    staProtocol.setErr(status1[6]);

                //报警
                staProtocol.setPassTimeOut(statusErr[0]);
                staProtocol.setObjectNoIdError(statusErr[1]);
                staProtocol.setIdNoObjectError(statusErr[2]);
                staProtocol.setLmfrError(statusErr[3]);
                staProtocol.setLiftError(statusErr[4]);
                staProtocol.setDlfrError(statusErr[5]);
                staProtocol.setDmfrError(statusErr[6]);
                staProtocol.setVfdError(statusErr[7]);
                staProtocol.setSrvError(statusErr[8]);
                staProtocol.setRes1(statusErr[9]);
                staProtocol.setRes2(statusErr[10]);
                staProtocol.setRes3(statusErr[11]);
                staProtocol.setCommunicationTimeOut(statusErr[12]);
                staProtocol.setParameterIncompleteError(statusErr[13]);
                staProtocol.setDataNotClear(statusErr[14]);
                staProtocol.setSetParameterError(statusErr[15]);
                staProtocol.setRes4(statusErr[16]);
                staProtocol.setRes5(statusErr[17]);
                staProtocol.setDataError(statusErr[18]);
                    //报警
                    staProtocol.setPassTimeOut(statusErr[0]);
                    staProtocol.setObjectNoIdError(statusErr[1]);
                    staProtocol.setIdNoObjectError(statusErr[2]);
                    staProtocol.setLmfrError(statusErr[3]);
                    staProtocol.setLiftError(statusErr[4]);
                    staProtocol.setDlfrError(statusErr[5]);
                    staProtocol.setDmfrError(statusErr[6]);
                    staProtocol.setVfdError(statusErr[7]);
                    staProtocol.setSrvError(statusErr[8]);
                    staProtocol.setRes1(statusErr[9]);
                    staProtocol.setRes2(statusErr[10]);
                    staProtocol.setRes3(statusErr[11]);
                    staProtocol.setCommunicationTimeOut(statusErr[12]);
                    staProtocol.setParameterIncompleteError(statusErr[13]);
                    staProtocol.setDataNotClear(statusErr[14]);
                    staProtocol.setSetParameterError(statusErr[15]);
                    staProtocol.setRes4(statusErr[16]);
                    staProtocol.setRes5(statusErr[17]);
                    staProtocol.setDataError(statusErr[18]);

                //信号
                staProtocol.setSensorGArrive(statusSign[0]);
                staProtocol.setSensorGDec(statusSign[1]);
                staProtocol.setSensorGArrive2(statusSign[2]);
                staProtocol.setSensorLimit(statusSign[3]);
                staProtocol.setEmergency(statusSign[4]);
                staProtocol.setSensorGLeave(statusSign[5]);
                staProtocol.setSensorGLeave2(statusSign[6]);
                staProtocol.setSensorCUp(statusSign[7]);
                staProtocol.setSensorCDown(statusSign[8]);
                staProtocol.setLiftMotorFr(statusSign[9]);
                staProtocol.setLineMotorFr(statusSign[10]);
                staProtocol.setTranMotorFr(statusSign[11]);
                staProtocol.setRst1(statusSign[12]);
                staProtocol.setRst2(statusSign[13]);
                staProtocol.setRst3(statusSign[14]);
                staProtocol.setRst4(statusSign[15]);
                staProtocol.setSensorArriveD(statusSign[16]);
                staProtocol.setSensorDecD(statusSign[17]);
                staProtocol.setSensorArriveL(statusSign[18]);
                staProtocol.setSensorDecL(statusSign[19]);
                staProtocol.setSensorArriveR(statusSign[20]);
                staProtocol.setSensorDecR(statusSign[21]);
                    //信号
                    staProtocol.setSensorGArrive(statusSign[0]);
                    staProtocol.setSensorGDec(statusSign[1]);
                    staProtocol.setSensorGArrive2(statusSign[2]);
                    staProtocol.setSensorLimit(statusSign[3]);
                    staProtocol.setEmergency(statusSign[4]);
                    staProtocol.setSensorGLeave(statusSign[5]);
                    staProtocol.setSensorGLeave2(statusSign[6]);
                    staProtocol.setSensorCUp(statusSign[7]);
                    staProtocol.setSensorCDown(statusSign[8]);
                    staProtocol.setLiftMotorFr(statusSign[9]);
                    staProtocol.setLineMotorFr(statusSign[10]);
                    staProtocol.setTranMotorFr(statusSign[11]);
                    staProtocol.setRst1(statusSign[12]);
                    staProtocol.setRst2(statusSign[13]);
                    staProtocol.setRst3(statusSign[14]);
                    staProtocol.setRst4(statusSign[15]);
                    staProtocol.setSensorArriveD(statusSign[16]);
                    staProtocol.setSensorDecD(statusSign[17]);
                    staProtocol.setSensorArriveL(statusSign[18]);
                    staProtocol.setSensorDecL(statusSign[19]);
                    staProtocol.setSensorArriveR(statusSign[20]);
                    staProtocol.setSensorDecR(statusSign[21]);


                if( (staProtocol.getPassTimeOut() ||
                    staProtocol.getObjectNoIdError() ||
                        staProtocol.getIdNoObjectError() ||
                        staProtocol.getLmfrError() ||
                        staProtocol.getLiftError() ||
                        staProtocol.getDlfrError() ||
                        staProtocol.getDmfrError() ||
                        staProtocol.getVfdError() ||
                        staProtocol.getSrvError() ||
                        staProtocol.getRes1() ||
                        staProtocol.getRes2() ||
                        staProtocol.getRes3() ||
                        staProtocol.getCommunicationTimeOut() ||
                        staProtocol.getParameterIncompleteError() ||
                        staProtocol.getDataNotClear() ||
                        staProtocol.getSetParameterError() ||
                        staProtocol.getDataError()) && staProtocol.isWriteMk()
                ){
                    staProtocol.setErrorMk(true);//若存在异常触发写入
                }
                    if( (staProtocol.getPassTimeOut() ||
                            staProtocol.getObjectNoIdError() ||
                            staProtocol.getIdNoObjectError() ||
                            staProtocol.getLmfrError() ||
                            staProtocol.getLiftError() ||
                            staProtocol.getDlfrError() ||
                            staProtocol.getDmfrError() ||
                            staProtocol.getVfdError() ||
                            staProtocol.getSrvError() ||
                            staProtocol.getRes1() ||
                            staProtocol.getRes2() ||
                            staProtocol.getRes3() ||
                            staProtocol.getCommunicationTimeOut() ||
                            staProtocol.getParameterIncompleteError() ||
                            staProtocol.getDataNotClear() ||
                            staProtocol.getSetParameterError() ||
                            staProtocol.getDataError()) && staProtocol.isWriteMk()
                    ){
                        staProtocol.setErrorMk(true);//若存在异常触发写入
                    }

                if(     !staProtocol.getPassTimeOut() &&
                        !staProtocol.getObjectNoIdError() &&
                        !staProtocol.getIdNoObjectError() &&
                        !staProtocol.getLmfrError() &&
                        !staProtocol.getLiftError() &&
                        !staProtocol.getDlfrError() &&
                        !staProtocol.getDmfrError() &&
                        !staProtocol.getVfdError() &&
                        !staProtocol.getSrvError() &&
                        !staProtocol.getRes1() &&
                        !staProtocol.getRes2() &&
                        !staProtocol.getRes3() &&
                        !staProtocol.getCommunicationTimeOut() &&
                        !staProtocol.getParameterIncompleteError() &&
                        !staProtocol.getDataNotClear() &&
                        !staProtocol.getSetParameterError() &&
                        !staProtocol.getDataError()
                ){
                    staProtocol.setWriteMk(true);//无异常后才能继续写入
                    staProtocol.setErrorMk(false);//若存在异常触发写入
                    if(     !staProtocol.getPassTimeOut() &&
                            !staProtocol.getObjectNoIdError() &&
                            !staProtocol.getIdNoObjectError() &&
                            !staProtocol.getLmfrError() &&
                            !staProtocol.getLiftError() &&
                            !staProtocol.getDlfrError() &&
                            !staProtocol.getDmfrError() &&
                            !staProtocol.getVfdError() &&
                            !staProtocol.getSrvError() &&
                            !staProtocol.getRes1() &&
                            !staProtocol.getRes2() &&
                            !staProtocol.getRes3() &&
                            !staProtocol.getCommunicationTimeOut() &&
                            !staProtocol.getParameterIncompleteError() &&
                            !staProtocol.getDataNotClear() &&
                            !staProtocol.getSetParameterError() &&
                            !staProtocol.getDataError()
                    ){
                        staProtocol.setWriteMk(true);//无异常后才能继续写入
                        staProtocol.setErrorMk(false);//若存在异常触发写入

                }
                    }


                if (!staProtocol.isPakMk() && (!staProtocol.isLoading() || staProtocol.getWorkNo()==0)) {
                    staProtocol.setPakMk(true);
                }
                    if (!staProtocol.isPakMk() && (!staProtocol.isLoading() || staProtocol.getWorkNo()==0)) {
                        staProtocol.setPakMk(true);
                    }
//                }

            }
        }
        //条码扫描器
@@ -705,6 +727,8 @@
        }




        if (result1.IsSuccess && result2.IsSuccess) {

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