From 606c896c1b7c9d986cfb13d8464f3482160a1389 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Tue, 08 May 2018 09:47:40 +0800 Subject: [PATCH] 手机 设备 保存 api --- src/main/java/com/moral/controller/ScreenController.java | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index 5957588..4da099f 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -7,9 +7,6 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.InetAddress; -import java.net.URL; -import java.net.URLConnection; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; @@ -58,7 +55,7 @@ import com.moral.entity.alarm.AlarmSensorLevel; import com.moral.service.AccountService; import com.moral.service.AlarmConfigService; -import com.moral.service.AlarmService; +import com.moral.service.AlarmDailyService; import com.moral.service.AreaService; import com.moral.service.DeviceService; import com.moral.service.HistoryMinutelyService; @@ -116,7 +113,7 @@ private String levelKey = "alarm_"; @Resource - private AlarmService alarmService; + private AlarmDailyService alarmDailyService; /** * Screen login. ������������ * @@ -493,7 +490,7 @@ parameters.remove("organizationId"); } } - Map pieData = alarmService.getPieData(parameters); + Map pieData = alarmDailyService.getPieData(parameters); List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey); return new ResultBean<List<Map<String, Object>>>(list); } -- Gitblit v1.8.0