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/SiteController.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/client/controller/SiteController.java b/src/main/java/com/zy/client/controller/SiteController.java
index 67a7881..5dfca41 100644
--- a/src/main/java/com/zy/client/controller/SiteController.java
+++ b/src/main/java/com/zy/client/controller/SiteController.java
@@ -2,14 +2,17 @@
import com.core.annotations.ManagerAuth;
import com.core.common.R;
-import com.zy.client.domain.PlcErrorTable;
+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;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* 杈撻�佽澶囨帴鍙�
@@ -19,21 +22,40 @@
@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 == 0) {
+ vo.setStaNo("0000");
+ } else {
+ vo.setStaNo("9998");
+ }
+ list.add(vo);
+ }
+ integer.getAndIncrement();
+ return R.ok().add(list);
}
@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寮傚父鎻忚堪");
@@ -52,4 +74,11 @@
return R.ok().add(list);
}
+ @PostMapping("/output/site")
+ @ManagerAuth(memo = "绔欑偣璁惧鎶ユ枃鏃ュ織杈撳嚭")
+ public R siteOutput(){
+ String str = "\n" +new Date().toLocaleString() + "銆�2020-5-29 13:14:22銆戞壂鎻弍lcA 鐩爣绔�--27328372372832763643234323432342";
+ return R.ok().add(str);
+ }
+
}
--
Gitblit v1.9.1