From c350b737713fe518c22036dfc9a2574bcafcb15c Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 02 六月 2020 15:18:08 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 23 +++++++++++
src/main/java/com/zy/client/domain/vo/PlcErrorTableVo.java | 4 +-
src/main/java/com/zy/client/controller/SiteController.java | 8 ++--
src/main/java/com/zy/client/domain/vo/CommandLogVo.java | 40 ++++++++++++++++++++
src/main/webapp/static/css/crn.css | 2
src/main/java/com/zy/client/domain/vo/CrnLatestDataVo.java | 2
src/main/java/com/zy/client/domain/vo/CrnStateTableVo.java | 2
src/main/java/com/zy/client/domain/vo/CrnMsgTableVo.java | 2
src/main/java/com/zy/client/domain/vo/SiteTableVo.java | 2
src/main/java/com/zy/client/controller/CrnController.java | 21 +++++++++-
src/main/java/com/zy/client/domain/vo/SiteLatestDataVo.java | 2
src/main/java/com/zy/client/controller/ConsoleController.java | 4 +-
12 files changed, 94 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/client/controller/ConsoleController.java b/src/main/java/com/zy/client/controller/ConsoleController.java
index 67e1ae9..720d7c6 100644
--- a/src/main/java/com/zy/client/controller/ConsoleController.java
+++ b/src/main/java/com/zy/client/controller/ConsoleController.java
@@ -2,8 +2,8 @@
import com.core.annotations.ManagerAuth;
import com.core.common.R;
-import com.zy.client.domain.CrnLatestDataVo;
-import com.zy.client.domain.SiteLatestDataVo;
+import com.zy.client.domain.vo.CrnLatestDataVo;
+import com.zy.client.domain.vo.SiteLatestDataVo;
import com.zy.client.domain.enums.SiteStatusType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/com/zy/client/controller/CrnController.java b/src/main/java/com/zy/client/controller/CrnController.java
index 7c63ead..50ac8c4 100644
--- a/src/main/java/com/zy/client/controller/CrnController.java
+++ b/src/main/java/com/zy/client/controller/CrnController.java
@@ -2,8 +2,9 @@
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.vo.CommandLogVo;
+import com.zy.client.domain.vo.CrnMsgTableVo;
+import com.zy.client.domain.vo.CrnStateTableVo;
import com.zy.client.domain.enums.CrnStatusType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,6 +13,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -22,9 +24,22 @@
@RequestMapping("/crn")
public class CrnController {
-
private AtomicInteger integer = new AtomicInteger();
+ @ManagerAuth(memo = "杩涜涓殑鍛戒护")
+ @PostMapping("/command/ongoing")
+ public R ongoingCommand(){
+ List<CommandLogVo> list = new ArrayList<>();
+ for (int i=1;i<=4;i++){
+ CommandLogVo vo = new CommandLogVo();
+ vo.setCrnNo(String.valueOf(i));
+ vo.setStatus(1);
+ vo.setCommand(UUID.randomUUID().toString());
+ list.add(vo);
+ }
+ return R.ok().add(list);
+ }
+
@PostMapping("/table/crn/state")
@ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
public R crnStateTable(){
diff --git a/src/main/java/com/zy/client/controller/SiteController.java b/src/main/java/com/zy/client/controller/SiteController.java
index ec02b4f..5dfca41 100644
--- a/src/main/java/com/zy/client/controller/SiteController.java
+++ b/src/main/java/com/zy/client/controller/SiteController.java
@@ -2,8 +2,8 @@
import com.core.annotations.ManagerAuth;
import com.core.common.R;
-import com.zy.client.domain.PlcErrorTable;
-import com.zy.client.domain.SiteTableVo;
+import com.zy.client.domain.vo.PlcErrorTableVo;
+import com.zy.client.domain.vo.SiteTableVo;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -53,9 +53,9 @@
@PostMapping("/table/plc/errors")
@ManagerAuth(memo = "杈撻�佽澶噋lc寮傚父淇℃伅琛�")
public R plcErrorTable(){
- List<PlcErrorTable> list = new ArrayList<>();
+ List<PlcErrorTableVo> list = new ArrayList<>();
for (int i = 0; i<new Random().nextInt(13); i++){
- PlcErrorTable table = new PlcErrorTable();
+ PlcErrorTableVo table = new PlcErrorTableVo();
table.setNo(String.valueOf(i));
table.setError("寮傚父淇℃伅");
table.setPlcDesc("plc寮傚父鎻忚堪");
diff --git a/src/main/java/com/zy/client/domain/vo/CommandLogVo.java b/src/main/java/com/zy/client/domain/vo/CommandLogVo.java
new file mode 100644
index 0000000..e0b1646
--- /dev/null
+++ b/src/main/java/com/zy/client/domain/vo/CommandLogVo.java
@@ -0,0 +1,40 @@
+package com.zy.client.domain.vo;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+public class CommandLogVo {
+
+ // 鍫嗗灈鏈虹紪鍙�
+ private String crnNo;
+
+ // 鐘舵��
+ private Integer status;
+
+ // 鍛戒护鎶ユ枃
+ private String command;
+
+ public String getCrnNo() {
+ return crnNo;
+ }
+
+ public void setCrnNo(String crnNo) {
+ this.crnNo = crnNo;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public String getCommand() {
+ return command;
+ }
+
+ public void setCommand(String command) {
+ this.command = command;
+ }
+}
diff --git a/src/main/java/com/zy/client/domain/CrnLatestDataVo.java b/src/main/java/com/zy/client/domain/vo/CrnLatestDataVo.java
similarity index 93%
rename from src/main/java/com/zy/client/domain/CrnLatestDataVo.java
rename to src/main/java/com/zy/client/domain/vo/CrnLatestDataVo.java
index 400fa4f..6c6de4f 100644
--- a/src/main/java/com/zy/client/domain/CrnLatestDataVo.java
+++ b/src/main/java/com/zy/client/domain/vo/CrnLatestDataVo.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain;
+package com.zy.client.domain.vo;
/**
* 鍫嗗灈鏈烘渶鏂版暟鎹鍥惧璞�
diff --git a/src/main/java/com/zy/client/domain/CrnMsgTableVo.java b/src/main/java/com/zy/client/domain/vo/CrnMsgTableVo.java
similarity index 98%
rename from src/main/java/com/zy/client/domain/CrnMsgTableVo.java
rename to src/main/java/com/zy/client/domain/vo/CrnMsgTableVo.java
index 01fd4e8..e4354e9 100644
--- a/src/main/java/com/zy/client/domain/CrnMsgTableVo.java
+++ b/src/main/java/com/zy/client/domain/vo/CrnMsgTableVo.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain;
+package com.zy.client.domain.vo;
/**
* Created by vincent on 2020-06-02
diff --git a/src/main/java/com/zy/client/domain/CrnStateTableVo.java b/src/main/java/com/zy/client/domain/vo/CrnStateTableVo.java
similarity index 98%
rename from src/main/java/com/zy/client/domain/CrnStateTableVo.java
rename to src/main/java/com/zy/client/domain/vo/CrnStateTableVo.java
index c0966b0..8fdbcb7 100644
--- a/src/main/java/com/zy/client/domain/CrnStateTableVo.java
+++ b/src/main/java/com/zy/client/domain/vo/CrnStateTableVo.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain;
+package com.zy.client.domain.vo;
import com.zy.client.domain.enums.CrnStatusType;
diff --git a/src/main/java/com/zy/client/domain/PlcErrorTable.java b/src/main/java/com/zy/client/domain/vo/PlcErrorTableVo.java
similarity index 89%
rename from src/main/java/com/zy/client/domain/PlcErrorTable.java
rename to src/main/java/com/zy/client/domain/vo/PlcErrorTableVo.java
index 647accc..4eaaa97 100644
--- a/src/main/java/com/zy/client/domain/PlcErrorTable.java
+++ b/src/main/java/com/zy/client/domain/vo/PlcErrorTableVo.java
@@ -1,9 +1,9 @@
-package com.zy.client.domain;
+package com.zy.client.domain.vo;
/**
* Created by vincent on 2020-06-02
*/
-public class PlcErrorTable {
+public class PlcErrorTableVo {
// 搴忓彿
private String no;
diff --git a/src/main/java/com/zy/client/domain/SiteLatestDataVo.java b/src/main/java/com/zy/client/domain/vo/SiteLatestDataVo.java
similarity index 95%
rename from src/main/java/com/zy/client/domain/SiteLatestDataVo.java
rename to src/main/java/com/zy/client/domain/vo/SiteLatestDataVo.java
index 033be13..94b46dc 100644
--- a/src/main/java/com/zy/client/domain/SiteLatestDataVo.java
+++ b/src/main/java/com/zy/client/domain/vo/SiteLatestDataVo.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain;
+package com.zy.client.domain.vo;
import com.zy.client.domain.enums.SiteStatusType;
diff --git a/src/main/java/com/zy/client/domain/SiteTableVo.java b/src/main/java/com/zy/client/domain/vo/SiteTableVo.java
similarity index 98%
rename from src/main/java/com/zy/client/domain/SiteTableVo.java
rename to src/main/java/com/zy/client/domain/vo/SiteTableVo.java
index ceb1ffe..207d113 100644
--- a/src/main/java/com/zy/client/domain/SiteTableVo.java
+++ b/src/main/java/com/zy/client/domain/vo/SiteTableVo.java
@@ -1,4 +1,4 @@
-package com.zy.client.domain;
+package com.zy.client.domain.vo;
/**
* Created by vincent on 2020-06-02
diff --git a/src/main/webapp/static/css/crn.css b/src/main/webapp/static/css/crn.css
index 5c7e61c..c8fea39 100644
--- a/src/main/webapp/static/css/crn.css
+++ b/src/main/webapp/static/css/crn.css
@@ -75,7 +75,7 @@
/* -------------------- 绗簩妯″潡 -------------------- */
.crn-msg {
- overflow: hidden;
+ overflow: auto;
margin-top: 10px;
height: 20%;
background-color: #fff;
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index ac5eb55..6eb1082 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -163,7 +163,6 @@
</div>
</body>
<script>
-
// 绌虹櫧琛屾暟
var crnStateTableBlankRows = 0;
var crnMsgTableBlankRows = 0;
@@ -182,11 +181,33 @@
setInterval(function () {
getCrnStateInfo();
getCrnMsgInfo();
+ getCommandLog();
},1000);
setInterval(function () {
getSiteOutput();
},500);
+ // 鑾峰彇鍫嗗灈鏈烘墽琛屼腑鐨勫懡浠�
+ function getCommandLog() {
+ $.ajax({
+ url: baseUrl + "/crn/command/ongoing",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ var commands = res.data;
+ for (var i=0; i<commands.length;i++){
+ $("#crn"+commands[i].crnNo).val(commands[i].command);
+ }
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/login";
+ } else {
+ alert(res.msg);
+ }
+ }
+ })
+ }
+
// 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ---- 琛ㄤ竴
function getCrnStateInfo() {
--
Gitblit v1.9.1