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/java/com/zy/client/controller/CrnController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 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..50ac8c4 100644
--- a/src/main/java/com/zy/client/controller/CrnController.java
+++ b/src/main/java/com/zy/client/controller/CrnController.java
@@ -2,7 +2,9 @@
import com.core.annotations.ManagerAuth;
import com.core.common.R;
-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;
@@ -11,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;
/**
@@ -21,15 +24,54 @@
@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 crnTable(){
+ public R crnStateTable(){
List<CrnStateTableVo> list = new ArrayList<>();
- for (int i=0;i<4;i++){
- CrnStateTableVo vo = new CrnStateTableVo("1", CrnStatusType.AUTO, "姝ｅ父", "鏈夌墿", "99", "3", "涓綅", "18233", "422", "0", "1204", "鍏抽棴", "0");
+ for (int i=1;i<=4;i++){
+ CrnStateTableVo vo = new CrnStateTableVo(String.valueOf(i), CrnStatusType.AUTO, "姝ｅ父", "鏈夌墿", "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 +89,5 @@
String str = "\n" +new Date().toLocaleString() + "銆�2020-5-29 13:14:22銆戞壂鎻弍lcA 鐩爣绔�--273283723728327636432343234323422732837237283276364323432343234227328372372832763643234323432342";
return R.ok().add(str);
}
+
}
--
Gitblit v1.9.1