From e15bba44445d695ce7a9c5efefc0e649ee7d4a7a Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 02 六月 2020 14:36:03 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/client/domain/CrnStateTableVo.java   |    2 
 src/main/webapp/views/crn.html                            |   42 +++++++++
 src/main/java/com/zy/client/domain/CrnMsgTableVo.java     |  133 +++++++++++++++++++++++++++++++++
 src/main/java/com/zy/client/controller/CrnController.java |   34 +++++++
 4 files changed, 204 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/client/controller/CrnController.java b/src/main/java/com/zy/client/controller/CrnController.java
index 9c55eb9..7c63ead 100644
--- a/src/main/java/com/zy/client/controller/CrnController.java
+++ b/src/main/java/com/zy/client/controller/CrnController.java
@@ -2,6 +2,7 @@
 
 import com.core.annotations.ManagerAuth;
 import com.core.common.R;
+import com.zy.client.domain.CrnMsgTableVo;
 import com.zy.client.domain.CrnStateTableVo;
 import com.zy.client.domain.enums.CrnStatusType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,10 +27,36 @@
 
     @PostMapping("/table/crn/state")
     @ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
-    public R crnTable(){
+    public R crnStateTable(){
         List<CrnStateTableVo> list = new ArrayList<>();
-        for (int i=0;i<4;i++){
-            CrnStateTableVo vo = new CrnStateTableVo("1", CrnStatusType.AUTO, "姝e父", "鏈夌墿", "99", "3", "涓綅", "18233", "422", "0", "1204", "鍏抽棴", "0");
+        for (int i=1;i<=4;i++){
+            CrnStateTableVo vo = new CrnStateTableVo(String.valueOf(i), CrnStatusType.AUTO, "姝e父", "鏈夌墿", "99", "3", "涓綅", "18233", "422", "0", "1204", "鍏抽棴", "0");
+            if (integer.get()%5 == 0) {
+                vo.setWorkNo("0000");
+            } else {
+                vo.setWorkNo("9998");
+            }
+            list.add(vo);
+        }
+        integer.getAndIncrement();
+        return R.ok().add(list);
+    }
+
+    @PostMapping("/table/crn/msg")
+    @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
+    public R crnMsgTable(){
+        List<CrnMsgTableVo> list = new ArrayList<>();
+        for (int i=1;i<=4;i++){
+            CrnMsgTableVo vo = new CrnMsgTableVo();
+            vo.setCrnNo(String.valueOf(i));
+            vo.setCommand("28283E23132D23");
+            vo.setError("");
+            vo.setLocNo("0601812");
+            vo.setOrigin("0");
+            vo.setSourceLocNo("");
+            vo.setSourceStaNo("0");
+            vo.setStaNo("2112");
+            vo.setStatus("绌洪棽");
             if (integer.get()%5 == 0) {
                 vo.setWorkNo("0000");
             } else {
@@ -47,4 +74,5 @@
         String str = "\n" +new Date().toLocaleString() + "銆�2020-5-29 13:14:22銆戞壂鎻弍lcA 鐩爣绔�--273283723728327636432343234323422732837237283276364323432343234227328372372832763643234323432342";
         return R.ok().add(str);
     }
+
 }
diff --git a/src/main/java/com/zy/client/domain/CrnMsgTableVo.java b/src/main/java/com/zy/client/domain/CrnMsgTableVo.java
new file mode 100644
index 0000000..01fd4e8
--- /dev/null
+++ b/src/main/java/com/zy/client/domain/CrnMsgTableVo.java
@@ -0,0 +1,133 @@
+package com.zy.client.domain;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+public class CrnMsgTableVo {
+
+    // 鍫嗗灈鏈哄彿
+    private String crnNo;
+
+    // 鐘舵��
+    private String status;
+
+    // 宸ヤ綔鍙�
+    private String workNo;
+
+    // 婧愮珯
+    private String sourceStaNo;
+
+    // 鐩爣绔�
+    private String staNo;
+
+    // 婧愬簱浣�
+    private String sourceLocNo;
+
+    // 鐩爣搴撲綅
+    private String locNo;
+
+    // 寮傚父
+    private String error;
+
+    // 鍘熺偣
+    private String origin;
+
+    // 鍛戒护
+    private String command;
+
+    public CrnMsgTableVo() {
+    }
+
+    public CrnMsgTableVo(String crnNo, String status, String workNo, String sourceStaNo, String staNo, String sourceLocNo, String locNo, String error, String origin, String command) {
+        this.crnNo = crnNo;
+        this.status = status;
+        this.workNo = workNo;
+        this.sourceStaNo = sourceStaNo;
+        this.staNo = staNo;
+        this.sourceLocNo = sourceLocNo;
+        this.locNo = locNo;
+        this.error = error;
+        this.origin = origin;
+        this.command = command;
+    }
+
+    public String getCrnNo() {
+        return crnNo;
+    }
+
+    public void setCrnNo(String crnNo) {
+        this.crnNo = crnNo;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getWorkNo() {
+        return workNo;
+    }
+
+    public void setWorkNo(String workNo) {
+        this.workNo = workNo;
+    }
+
+    public String getSourceStaNo() {
+        return sourceStaNo;
+    }
+
+    public void setSourceStaNo(String sourceStaNo) {
+        this.sourceStaNo = sourceStaNo;
+    }
+
+    public String getStaNo() {
+        return staNo;
+    }
+
+    public void setStaNo(String staNo) {
+        this.staNo = staNo;
+    }
+
+    public String getSourceLocNo() {
+        return sourceLocNo;
+    }
+
+    public void setSourceLocNo(String sourceLocNo) {
+        this.sourceLocNo = sourceLocNo;
+    }
+
+    public String getLocNo() {
+        return locNo;
+    }
+
+    public void setLocNo(String locNo) {
+        this.locNo = locNo;
+    }
+
+    public String getError() {
+        return error;
+    }
+
+    public void setError(String error) {
+        this.error = error;
+    }
+
+    public String getOrigin() {
+        return origin;
+    }
+
+    public void setOrigin(String origin) {
+        this.origin = origin;
+    }
+
+    public String getCommand() {
+        return command;
+    }
+
+    public void setCommand(String command) {
+        this.command = command;
+    }
+}
diff --git a/src/main/java/com/zy/client/domain/CrnStateTableVo.java b/src/main/java/com/zy/client/domain/CrnStateTableVo.java
index baa5b4b..c0966b0 100644
--- a/src/main/java/com/zy/client/domain/CrnStateTableVo.java
+++ b/src/main/java/com/zy/client/domain/CrnStateTableVo.java
@@ -40,7 +40,7 @@
     // 浠诲姟鍙�
     private String workNo;
 
-    // 妯″紡
+    // 鐘舵��
     private String status;
 
     // 鎶ヨ鐮�
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 2a5be06..ac5eb55 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -176,11 +176,13 @@
         initCrnStateTable();
         getCrnStateInfo();
         initCrnMsgTable();
+        getCrnMsgInfo();
     });
     // 鏁版嵁鏇存柊
     setInterval(function () {
         getCrnStateInfo();
-    },500);
+        getCrnMsgInfo();
+    },1000);
     setInterval(function () {
         getSiteOutput();
     },500);
@@ -215,6 +217,42 @@
                         setVal(tr.children("td").eq(10), table[i-1].workNo);
                         setVal(tr.children("td").eq(11), table[i-1].status);
                         setVal(tr.children("td").eq(12), table[i-1].warnCode);
+                    }
+                } else if (res.code === 403){
+                    top.location.href = baseUrl+"/login";
+                }  else {
+                    alert(res.msg);
+                }
+            }
+        });
+    }
+
+    // 鍫嗗灈鏈烘暟鎹〃鑾峰彇 ---- 琛ㄤ簩
+    function getCrnMsgInfo() {
+        var tableEl = $('#crn-msg-table');
+        $.ajax({
+            url: baseUrl+ "/crn/table/crn/msg",
+            headers: {'token': localStorage.getItem('token')},
+            method: 'POST',
+            success: function (res) {
+                if (res.code === 200){
+                    var table = res.data;
+                    if (table.length > crnStateTableBlankRows && table.length !== crnStateTableFullRows) {
+                        initCrnStateTable(table.length-crnStateTableBlankRows);
+                        crnStateTableFullRows = 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].crnNo);
+                        setVal(tr.children("td").eq(1), table[i-1].status);
+                        setVal(tr.children("td").eq(2), table[i-1].workNo);
+                        setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
+                        setVal(tr.children("td").eq(4), table[i-1].staNo);
+                        setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
+                        setVal(tr.children("td").eq(6), table[i-1].locNo);
+                        setVal(tr.children("td").eq(7), table[i-1].error);
+                        setVal(tr.children("td").eq(8), table[i-1].origin);
+                        setVal(tr.children("td").eq(9), table[i-1].command);
                     }
                 } else if (res.code === 403){
                     top.location.href = baseUrl+"/login";
@@ -315,8 +353,6 @@
         crnOutputDom.value += content;
         crnOutputDom.scrollTop = crnOutputDom.scrollHeight;
     }
-
-
 
 </script>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1