#

luxiaotao1123

2020-09-24 ede6255e91ce3c3eae7fc90f8ee2f1a49e5574cf

#

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

@@ -44,7 +44,7 @@
    private boolean pakMk = true;

    // 台车位置
    private Integer position;
    private Short position;

    public BasDevp toSqlModel(){
        BasDevp basDevp = new BasDevp();

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

@@ -139,10 +139,11 @@
            }
        }
        // 台车位置
        OperateResultExOne<Integer> result2 = siemensS7Net.ReadInt32("DB100.48");
        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB100.48");
        if (result2.IsSuccess) {
            StaProtocol staProtocol = station.get(8);
            staProtocol.setPosition(result2.Content);
//            System.out.println("8号站位置："+result2.Content);
        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】8号台车获取实时位置失败！！！", DateUtils.convert(new Date())));
            log.error("8号台车获取实时位置失败！！！");

 src/main/webapp/views/console.html

@@ -512,8 +512,8 @@
                        } else {
                            siteEl.html(sites[i].siteId);
                        }
                        if (i===8) {
                            carAnimate(i, Number(sites[i].nearbySta));
                        if (i+1===8) {
                            carAnimate(i+1, Number(sites[i].nearbySta));
                        }
                    }
                } else if (res.code === 403){