From 45be44fb95325305373647231ef74e72d1501f8c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 11 Nov 2017 08:08:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/controller/MgrController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/MgrController.java b/src/main/java/com/moral/monitor/controller/MgrController.java
index 34454a8..d4d7b6a 100644
--- a/src/main/java/com/moral/monitor/controller/MgrController.java
+++ b/src/main/java/com/moral/monitor/controller/MgrController.java
@@ -8,7 +8,6 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
@@ -27,12 +26,12 @@
@ResponseBody
public Map randpoint(){
- List<Monitorpoint> randpoint = mgrService.randpoint();
+ List<MonitorPoint> randpoint = mgrService.randpoint();
LinkedHashMap<String, List<Equipment>> point_equ = new LinkedHashMap<String, List<Equipment>>();
- for (Monitorpoint point:randpoint){
+ for (MonitorPoint point:randpoint){
String name = point.getName();
List<Equipment> equipments = mgrService.pointequ(name);
if (equipments.size()>0){
@@ -125,13 +124,13 @@
@ResponseBody
public String top100(){
- List<Monitorpoint> randpoint = mgrService.allpoint();
+ List<MonitorPoint> randpoint = mgrService.allpoint();
LinkedHashMap<String, List<Equipment>> point_equ = new LinkedHashMap<String, List<Equipment>>();
- for (Monitorpoint point:randpoint){
+ for (MonitorPoint point:randpoint){
String name = point.getName();
List<Equipment> equipments = mgrService.pointequ(name);
if (equipments.size()>0){
--
Gitblit v1.8.0