运维app getEquInfoByMac api

fengxiang

2018-05-08 5f549c4d7bb36ff4dc012fed9ee1e049dbf899a8

 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);

   }