From 03ac47becf21a56071fd97bc9f7599eef2ca90da Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 02 六月 2020 11:14:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/client/controller/SiteController.java | 11 ++++++++++-
src/main/java/com/zy/client/domain/enums/CrnStatusType.java | 2 +-
src/main/java/com/zy/client/domain/enums/SiteStatusType.java | 2 +-
src/main/java/com/zy/Boot.java | 2 ++
src/main/java/com/zy/client/domain/SiteLatestDataVo.java | 2 +-
src/main/java/com/zy/client/controller/ConsoleController.java | 2 +-
6 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/Boot.java b/src/main/java/com/zy/Boot.java
index 7b7d3a7..6f1f7db 100644
--- a/src/main/java/com/zy/Boot.java
+++ b/src/main/java/com/zy/Boot.java
@@ -1,5 +1,6 @@
package com.zy;
+import com.zy.common.utils.RandomValidateCodeUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -8,6 +9,7 @@
public class Boot extends SpringBootServletInitializer {
public static void main(String[] args) {
+ RandomValidateCodeUtil.init();
SpringApplication.run(Boot.class, args);
}
diff --git a/src/main/java/com/zy/client/controller/ConsoleController.java b/src/main/java/com/zy/client/controller/ConsoleController.java
index 78d4204..67e1ae9 100644
--- a/src/main/java/com/zy/client/controller/ConsoleController.java
+++ b/src/main/java/com/zy/client/controller/ConsoleController.java
@@ -4,7 +4,7 @@
import com.core.common.R;
import com.zy.client.domain.CrnLatestDataVo;
import com.zy.client.domain.SiteLatestDataVo;
-import com.zy.client.entity.SiteStatusType;
+import com.zy.client.domain.enums.SiteStatusType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/src/main/java/com/zy/client/controller/SiteController.java b/src/main/java/com/zy/client/controller/SiteController.java
index 593864c..67a7881 100644
--- a/src/main/java/com/zy/client/controller/SiteController.java
+++ b/src/main/java/com/zy/client/controller/SiteController.java
@@ -19,9 +19,18 @@
@RequestMapping("/site")
public class SiteController {
+ @PostMapping("/table/site")
+ @ManagerAuth(memo = "绔欑偣淇℃伅琛�")
+ public R siteTable(){
+
+
+
+ return R.ok();
+ }
+
@PostMapping("/table/plc/errors")
@ManagerAuth(memo = "杈撻�佽澶噋lc寮傚父淇℃伅琛�")
- public R crnLatestData(){
+ public R plcErrorTable(){
List<PlcErrorTable> list = new ArrayList<>();
for (int i = 0; i<new Random().nextInt(13); i++){
PlcErrorTable table = new PlcErrorTable();
diff --git a/src/main/java/com/zy/client/domain/SiteLatestDataVo.java b/src/main/java/com/zy/client/domain/SiteLatestDataVo.java
index dbbfed9..033be13 100644
--- a/src/main/java/com/zy/client/domain/SiteLatestDataVo.java
+++ b/src/main/java/com/zy/client/domain/SiteLatestDataVo.java
@@ -1,6 +1,6 @@
package com.zy.client.domain;
-import com.zy.client.entity.SiteStatusType;
+import com.zy.client.domain.enums.SiteStatusType;
/**
* 绔欑偣鏈�鏂版暟鎹鍥惧璞�
diff --git a/src/main/java/com/zy/client/entity/CrnStatusType.java b/src/main/java/com/zy/client/domain/enums/CrnStatusType.java
similarity index 88%
rename from src/main/java/com/zy/client/entity/CrnStatusType.java
rename to src/main/java/com/zy/client/domain/enums/CrnStatusType.java
index c024702..cc1bb0e 100644
--- a/src/main/java/com/zy/client/entity/CrnStatusType.java
+++ b/src/main/java/com/zy/client/domain/enums/CrnStatusType.java
@@ -1,4 +1,4 @@
-package com.zy.client.entity;
+package com.zy.client.domain.enums;
/**
* 鍫嗗灈鏈虹姸鎬佹灇涓�
diff --git a/src/main/java/com/zy/client/entity/SiteStatusType.java b/src/main/java/com/zy/client/domain/enums/SiteStatusType.java
similarity index 88%
rename from src/main/java/com/zy/client/entity/SiteStatusType.java
rename to src/main/java/com/zy/client/domain/enums/SiteStatusType.java
index 8c52867..d44ec2f 100644
--- a/src/main/java/com/zy/client/entity/SiteStatusType.java
+++ b/src/main/java/com/zy/client/domain/enums/SiteStatusType.java
@@ -1,4 +1,4 @@
-package com.zy.client.entity;
+package com.zy.client.domain.enums;
/**
--
Gitblit v1.9.1