From 58f51c889aecd7065a82b99d29b3ef4aee891ec1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 25 Oct 2017 16:31:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/controller/MgrController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/MgrController.java b/src/main/java/com/moral/monitor/controller/MgrController.java
index 3beb0fb..34454a8 100644
--- a/src/main/java/com/moral/monitor/controller/MgrController.java
+++ b/src/main/java/com/moral/monitor/controller/MgrController.java
@@ -27,12 +27,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 +125,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