Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-10 ef431a71ed043e8fb63777793df23c110b853803

 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;

@@ -20,6 +17,7 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import com.moral.entity.alarm.AlarmConfig;

import org.apache.commons.collections.CollectionUtils;

import org.apache.commons.net.ftp.FTPClient;

import org.apache.log4j.Logger;

@@ -58,7 +56,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 +114,7 @@
   private String levelKey = "alarm_";



   @Resource

   private AlarmService alarmService;

   private AlarmDailyService alarmDailyService;

   /**

    * Screen login. 大屏登录

    * 

@@ -493,8 +491,22 @@
            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);

   }



   /**

    * 获取报警阀值

    * @param mpid

    * @return

    */

   @GetMapping("getalevels")

   public ResultBean<Map<String,AlarmSensorLevel>> getAlarmLevelByMonitorPointId(int mpid){

      AlarmConfig alarmConfig = alarmConfigService.queryByMonitorPointId(mpid).get();

      ResultBean<Map<String,AlarmSensorLevel>> resultBean = new ResultBean();

      resultBean.setCode(ResultBean.SUCCESS);

      resultBean.setData(alarmConfig.getValue().getAlarmLevels());

      return resultBean;

   }

}