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; 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(){ 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 = "输送设备plc异常信息表") 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异常描述"); src/main/java/com/zy/client/domain/vo/CommandLogVo.java
New file @@ -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; } } src/main/java/com/zy/client/domain/vo/CrnLatestDataVo.java
File was renamed from src/main/java/com/zy/client/domain/CrnLatestDataVo.java @@ -1,4 +1,4 @@ package com.zy.client.domain; package com.zy.client.domain.vo; /** * 堆垛机最新数据视图对象 src/main/java/com/zy/client/domain/vo/CrnMsgTableVo.java
File was renamed from src/main/java/com/zy/client/domain/CrnMsgTableVo.java @@ -1,4 +1,4 @@ package com.zy.client.domain; package com.zy.client.domain.vo; /** * Created by vincent on 2020-06-02 src/main/java/com/zy/client/domain/vo/CrnStateTableVo.java
File was renamed from src/main/java/com/zy/client/domain/CrnStateTableVo.java @@ -1,4 +1,4 @@ package com.zy.client.domain; package com.zy.client.domain.vo; import com.zy.client.domain.enums.CrnStatusType;
File was renamed from src/main/java/com/zy/client/domain/PlcErrorTable.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; src/main/java/com/zy/client/domain/vo/SiteLatestDataVo.java
File was renamed from src/main/java/com/zy/client/domain/SiteLatestDataVo.java @@ -1,4 +1,4 @@ package com.zy.client.domain; package com.zy.client.domain.vo; import com.zy.client.domain.enums.SiteStatusType;
File was renamed from src/main/java/com/zy/client/domain/SiteTableVo.java @@ -1,4 +1,4 @@ package com.zy.client.domain; package com.zy.client.domain.vo; /** * Created by vincent on 2020-06-02 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; 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() {
