#

vincent

2020-06-02 819c8e537403db4c8e7da8efaeae7ce91fbdf232

#

 src/main/java/com/zy/client/controller/SiteController.java

@@ -3,6 +3,7 @@
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.client.domain.PlcErrorTable;
import com.zy.client.domain.SiteTableVo;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -10,6 +11,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;

/**
 * 输送设备接口
@@ -19,13 +21,32 @@
@RequestMapping("/site")
public class SiteController {

    private AtomicInteger integer = new AtomicInteger();

    @PostMapping("/table/site")
    @ManagerAuth(memo = "站点信息表")
    public R siteTable(){



        return R.ok();
        List<SiteTableVo> list = new ArrayList<>();
        for (int i=0;i<32;i++){
            SiteTableVo vo = new SiteTableVo();
            vo.setDevNo(String.valueOf(i));
            vo.setWorkNo("1204");
            vo.setAutoing("Y");
            vo.setCanining("Y");
            vo.setCanouting("N");
            vo.setHighLow("1");
            vo.setInreqIn("Y");
            vo.setInreqOut("N");
            vo.setLoading("Y");
            if (integer.get() > 5) {
                vo.setStaNo("0000");
            } else {
                vo.setStaNo("9998");
            }
            list.add(vo);
        }
        integer.getAndIncrement();
        return R.ok().add(list);
    }

    @PostMapping("/table/plc/errors")

 src/main/java/com/zy/client/domain/SiteTableVo.java

New file
@@ -0,0 +1,117 @@
package com.zy.client.domain;

/**
 * Created by vincent on 2020-06-02
 */
public class SiteTableVo {

    // 站号
    private String devNo;

    // 工作号
    private String workNo;

    // 自动
    private String autoing;

    // 有物
    private String loading;

    // 可入
    private String canining;

    // 可出
    private String canouting;

    // 需求入
    private String inreqIn;

    // 需求出
    private String inreqOut;

    // 高低库
    private String highLow;

    // 目标站
    private String staNo;

    public String getDevNo() {
        return devNo;
    }

    public void setDevNo(String devNo) {
        this.devNo = devNo;
    }

    public String getWorkNo() {
        return workNo;
    }

    public void setWorkNo(String workNo) {
        this.workNo = workNo;
    }

    public String getAutoing() {
        return autoing;
    }

    public void setAutoing(String autoing) {
        this.autoing = autoing;
    }

    public String getLoading() {
        return loading;
    }

    public void setLoading(String loading) {
        this.loading = loading;
    }

    public String getCanining() {
        return canining;
    }

    public void setCanining(String canining) {
        this.canining = canining;
    }

    public String getCanouting() {
        return canouting;
    }

    public void setCanouting(String canouting) {
        this.canouting = canouting;
    }

    public String getInreqIn() {
        return inreqIn;
    }

    public void setInreqIn(String inreqIn) {
        this.inreqIn = inreqIn;
    }

    public String getInreqOut() {
        return inreqOut;
    }

    public void setInreqOut(String inreqOut) {
        this.inreqOut = inreqOut;
    }

    public String getHighLow() {
        return highLow;
    }

    public void setHighLow(String highLow) {
        this.highLow = highLow;
    }

    public String getStaNo() {
        return staNo;
    }

    public void setStaNo(String staNo) {
        this.staNo = staNo;
    }
}

 src/main/webapp/static/js/common.js

@@ -3,6 +3,11 @@
// 测试
var baseUrl = "";

function setVal(el, val) {
    if (el.text() !== val){
        el.html(val);
    }
}

// 详情窗口-高度
var detailHeight = '80%';

 src/main/webapp/views/pipeline.html

@@ -68,344 +68,7 @@
                </tr>
            </thead>
            <!-- 表格内容 -->
            <tbody>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
                <tr>
                    <td>12</td>
                    <td>2223</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>Y</td>
                    <td>N</td>
                    <td>1</td>
                    <td>1204</td>
                </tr>
            </tbody>
            <tbody></tbody>
        </table>
    </div>
</main>
@@ -415,20 +78,29 @@
</body>
<script>
    // 初始化
    var plcErrorTableFieldCount = 0;
    // 空白行数
    var plcErrorTableBlankRows = 0;
    var siteTableBlankRows = 0;
    // 实际行数
    var plcErrorTableFullRows = 0;
    var siteTableFullRows = 0;


    var outputDom = document.getElementById("output");
    $(document).ready(function() {
        initPlcErrorTable();
        getPlcError();
        initSiteTable();
        getSite();
    });
    // 实时访问
    setInterval(function () {
        getPlcError();
        getSite();
    }, 1000);
    setInterval(function () {
        output("\n" +new Date().toLocaleString() + "【2020-5-29 13:14:22】扫描plcA 目标站--27328372372832763643234323432342");
    },500);



    // plc异常信息表获取
@@ -457,6 +129,54 @@
        });
    }

    // 站点信息表获取
    function getSite() {
        var tableEl = $('#site-table');
        // tableEl.children("tr").children("td").html("");
        $.ajax({
            url: baseUrl+ "/site/table/site",
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            success: function (res) {
                if (res.code === 200){
                    var table = res.data;
                    if (table.length > siteTableBlankRows && table.length !== siteTableFullRows) {
                        initSiteTable(table.length-siteTableBlankRows);
                        siteTableFullRows = table.length;
                    }
                    for (var i=1;i<=table.length;i++){
                        var tr = tableEl.find("tr").eq(i);
                        setVal(tr.children("td").eq(0), table[i-1].devNo);
                        setVal(tr.children("td").eq(1), table[i-1].workNo);
                        setVal(tr.children("td").eq(2), table[i-1].autoing);
                        setVal(tr.children("td").eq(3), table[i-1].loading);
                        setVal(tr.children("td").eq(4), table[i-1].canining);
                        setVal(tr.children("td").eq(5), table[i-1].canouting);
                        setVal(tr.children("td").eq(6), table[i-1].inreqIn);
                        setVal(tr.children("td").eq(7), table[i-1].inreqOut);
                        setVal(tr.children("td").eq(8), table[i-1].highLow);
                        setVal(tr.children("td").eq(9), table[i-1].staNo);

                        // tr.children("td").eq(0).html(table[i-1].devNo);
                        // tr.children("td").eq(1).html(table[i-1].workNo);
                        // tr.children("td").eq(2).html(table[i-1].autoing);
                        // tr.children("td").eq(3).html(table[i-1].loading);
                        // tr.children("td").eq(4).html(table[i-1].canining);
                        // tr.children("td").eq(5).html(table[i-1].canouting);
                        // tr.children("td").eq(6).html(table[i-1].inreqIn);
                        // tr.children("td").eq(7).html(table[i-1].inreqOut);
                        // tr.children("td").eq(8).html(table[i-1].highLow);
                        // tr.children("td").eq(9).html(table[i-1].staNo);
                    }
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                }
            }
        });
    }

    // 日志输出框
    function output(content){
        outputDom.value += content;
@@ -473,7 +193,7 @@
            var total = $('.plc-log-body').height();
            var count = total / one;
            count = parseInt(count) - 1;
            plcErrorTableFieldCount = count;
            plcErrorTableBlankRows = count;
            line = count;
        } else {
            line = row;
@@ -489,5 +209,36 @@
        $('#plc-error-table tbody').after(html);
    }

    // 站点空白表格渲染
    function initSiteTable(row) {
        var line;
        if (row === undefined){
            var one = $('#site-table thead').height();
            var total = $('#site-monitor').height();
            var count = total / one;
            count = parseInt(count) - 1;
            siteTableBlankRows = count;
            line = count;
        } else {
            line = row;
        }
        var html = "";
        for (var i = 0; i < line; i ++){
            html += " <tr>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "     </tr>\n";
        }
        $('#site-table tbody').after(html);
    }

</script>
</html>