获取优良天数

xufenglei

2018-08-31 9437c74510c25be9d2413821c65fcf6ca4e6d21a

 src/main/java/com/moral/controller/ScreenController.java

@@ -3,23 +3,21 @@
import static com.moral.common.util.ResourceUtil.getValue;

import static com.moral.common.util.WebUtils.getParametersStartingWith;



import java.io.BufferedReader;

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;

import java.util.List;

import java.util.Map;

import java.io.*;

import java.util.*;

import java.util.stream.Collectors;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import com.alibaba.fastjson.*;

import com.moral.common.util.ParameterUtils;

import com.moral.common.util.StringUtils;

import com.moral.entity.*;

import com.moral.entity.alarm.AlarmConfig;

import com.moral.entity.alarm.AlarmConfigValue;

import com.moral.entity.charts.DataSortCondition;

import com.moral.entity.layout.RealTimeDeviceLayout;

import com.moral.service.*;

import org.apache.commons.collections.CollectionUtils;

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

import org.apache.log4j.Logger;

@@ -27,53 +25,34 @@
import org.dom4j.Element;

import org.dom4j.io.SAXReader;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.cglib.beans.BeanMap;

import org.springframework.data.redis.core.RedisTemplate;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.util.ObjectUtils;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.springframework.web.bind.annotation.RequestParam;

import org.springframework.web.bind.annotation.ResponseBody;

import org.springframework.web.bind.annotation.RestController;

import org.springframework.web.bind.annotation.*;

import org.springframework.web.servlet.ModelAndView;

import org.xml.sax.InputSource;



import com.alibaba.fastjson.JSON;

import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;

import com.moral.common.bean.Constants;

import com.moral.common.bean.JsonData;

import com.moral.common.bean.PageResult;

import com.moral.common.bean.ResultBean;

import com.moral.common.util.ValidateUtil;

import com.moral.common.xml.Version;

import com.moral.entity.Account;

import com.moral.entity.Device;

import com.moral.entity.MapBounds;

import com.moral.entity.MonitorPoint;

import com.moral.entity.alarm.AlarmConfigValue;

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.AreaService;

import com.moral.service.DeviceService;

import com.moral.service.HistoryMinutelyService;

import com.moral.service.HistoryService;

import com.moral.service.MachineActivateService;

import com.moral.service.MonitorPointService;

import com.moral.service.SensorService;



import io.swagger.annotations.Api;

import io.swagger.annotations.ApiImplicitParam;

import io.swagger.annotations.ApiImplicitParams;

import io.swagger.annotations.ApiOperation;



/**

 * The Class ScreenController.大屏接口

 */

@RestController

@RequestMapping("/screen")

//@CrossOrigin(origins = "*", maxAge = 3600)

@CrossOrigin(origins = "*", maxAge = 3600)

@SuppressWarnings({ "rawtypes", "unchecked", "unused" })

@Api(tags = "Screen", description = "大屏接口") 
public class ScreenController {

   public  static Logger log = Logger.getLogger(ScreenController.class);

    @Resource

@@ -85,6 +64,8 @@
   SensorService sensorService;

   @Resource

   MonitorPointService monitorPointService;

   @Resource

   DeviceVersionService  deviceVersionService;



   /** The screen service. */

   @Resource

@@ -105,8 +86,8 @@
   private MachineActivateService machineActivateService;



   /** The resource. */

   @Value(value = "classpath:system/alarmLevels.json")

   private org.springframework.core.io.Resource resource;

//   @Value(value = "classpath:system/alarmLevels.json")

//   private org.springframework.core.io.Resource resource;



   /** The redis template. */

   @Resource

@@ -116,7 +97,19 @@
   private String levelKey = "alarm_";



   @Resource

   private AlarmService alarmService;

   private AlarmDailyService alarmDailyService;

   @Resource

   private OrganizationLayoutService orgLayoutService;

   @Resource

   private  DeviceVersionService dviceVersionService;

   @Resource

    private  OrganizationService organizationService;

   @Resource

    private  DictionaryDataService dictionaryDataService;

	
   @Resource

   private WeatherService weatherService;

	
   /**

    * Screen login. 大屏登录

    * 

@@ -133,6 +126,30 @@
         resultMap.put("accountId", -1);

      } else {

         resultMap = accountService.screenLogin(parameters);

         // 添加返回行政区信息字符串操作

         Object orgId = resultMap.get("orgId");

         if(resultMap.get("orgId")!=null && resultMap.get("orgId") instanceof Integer) {

                StringBuilder areaNamesBuilder = new StringBuilder("中国");

                if(!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {

                    Organization organization = organizationService.getOrganizationById((Integer) orgId);

                    if(organization.getAreaNames()!=null){

                        AreaNames areaNames =  organization.getAreaNames();

                        if(!StringUtils.isNullOrEmpty(areaNames.getProvinceName())){

                            areaNamesBuilder.append("/");

                            areaNamesBuilder.append(areaNames.getProvinceName());

                            if(!StringUtils.isNullOrEmpty(areaNames.getCityName())){

                                areaNamesBuilder.append("/");

                                areaNamesBuilder.append(areaNames.getCityName());

                                if(!StringUtils.isNullOrEmpty(areaNames.getAreaName())){

                                    areaNamesBuilder.append("/");

                                    areaNamesBuilder.append(areaNames.getAreaName());

                                }

                            }

                        }

                    }

                }

                resultMap.put("mapPath",areaNamesBuilder.toString());

            }

      }

      return resultMap;

   }

@@ -160,17 +177,54 @@
    * @return the alarm levels

    */

   @GetMapping("alarm-levels")

   public Object getAlarmLevels(HttpServletRequest request, Integer orgId) {

   public Object getAlarmLevels(HttpServletRequest request, Optional<Integer> orgId, Optional<Integer> mpId,Optional<String> mac) {

        List<Map<String,Object>> sensorAlarmList = null;

      try {

         AlarmConfigValue alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId).get();

         Map<String,AlarmSensorLevel> alarmLevelMap = alarmConfigValue.getAlarmLevels();

         sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {

             AlarmSensorLevel alarmSensorLevel = alarmLevelMap.get(key);

            JSONObject alarmSensorLevelMap = (JSONObject) JSON.toJSON(alarmSensorLevel);

            alarmSensorLevelMap.put("key",key);

            return alarmSensorLevelMap;

         }).collect(Collectors.toList());

       try {

            AlarmConfig alarmConfig = null;

             if(orgId.isPresent()){

                 alarmConfig = alarmConfigService.queryValueByOrganizationId(orgId.get()).get();

             }else if(mpId.isPresent()){

                 alarmConfig = alarmConfigService.queryByMonitorPointId(mpId.get()).get();

             } else if(mac.isPresent() ){

                 alarmConfig = alarmConfigService.queryByDeviceMac(mac.get()).get();

             }

             //返回值处理

             if(alarmConfig.getValue()!=null&&alarmConfig.getValue().getAlarmLevels()!=null){

                 Map<String, AlarmSensorLevel> alarmLevelMap = alarmConfig.getValue().getAlarmLevels();

                 // 当前非取默认值，未设值将用默认值覆盖

                 Map<String,AlarmSensorLevel> defaultSensorLevelMap = null;

                 if(alarmConfig.getId()!=null){

                     AlarmConfigValue defaultAlarmValue = alarmConfigService.getDefaultAlarmConfigValue();

                     defaultSensorLevelMap = defaultAlarmValue.getAlarmLevels();

                 }

                 Map<String, AlarmSensorLevel> finalDefaultSensorLevelMap = defaultSensorLevelMap;

                 alarmLevelMap.entrySet().stream().forEach(entry -> {

                     //当 increment都为0时，替换为默认值

                     AlarmSensorLevel alarmSensorLevel = entry.getValue();

                     if(alarmSensorLevel.getIncrement()!=null){

                         boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item ->  item == 0);

                         if(isAllZero){

                             AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap==null?null:finalDefaultSensorLevelMap.get(entry.getKey());

                             if(defaultAlarmSensorLevel!=null){

                                 alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement());

                             }else{

                                 List<Float> tempList = Arrays.asList(0.0f,200.0f,500.0f);

                                 alarmSensorLevel.setIncrement(tempList);

                             }

                         }

                     }

                 });

                 //map to list

                 Map<String, AlarmSensorLevel> finalAlarmLevelMap = alarmLevelMap;

                 sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {

                     AlarmSensorLevel alarmSensorLevel = finalAlarmLevelMap.get(key);

                     Map<String,Object> alarmSensorLevelMap = new HashMap<>(BeanMap.create(alarmSensorLevel));

                     alarmSensorLevelMap.put("key",key);

                     return alarmSensorLevelMap;

                 }).collect(Collectors.toList());

             }else{

                 return  new ResultBean<>("提供参数有误，未查询到任何数据",ResultBean.FAIL);

             }

      } catch (Exception e) {

         e.printStackTrace();

         Map<String, Object> err = new LinkedHashMap<String, Object>();

@@ -195,6 +249,29 @@
      return result;

   }



   /**

    *

    * @param dataSortCondition 数据排名查询条件

    * @return

    */

   public ResultBean<Map<String,Object>> getOrderData(DataSortCondition dataSortCondition) {

      ResultBean resultBean = new ResultBean();

      if(dataSortCondition.getCode()==null){

         resultBean.setCode(ResultBean.FAIL);

         resultBean.setMessage("code can't be null");

      } else if(dataSortCondition.getStyle()==null){

         resultBean.setCode(ResultBean.FAIL);

         resultBean.setMessage("style can't be null");

      }

      String code = dataSortCondition.getCode().toString();

      Region region = Region.create(code);

      if(region == null) {

         resultBean.setCode(ResultBean.FAIL);

         resultBean.setMessage("code is not in the correct format");

      }

      // todo

      return  null;

   }

   /**

    * Gets the day AQI by sensor.设备昨日的AQI指标

    *

@@ -271,49 +348,46 @@
   private int port = 21;

   private String path = "/";



   private String urlStr = "http://www.7drlb.com/apps/Version.xml";



   @RequestMapping(value = "/upgrade", method = RequestMethod.GET)

   public Version index() {

      Version version = new Version();

//      FTPClient ftpClient = new FTPClient();

      FTPClient ftpClient = new FTPClient();

      try {

//         ftpClient.connect(ip, port);

////         ftpClient.login(userName, userPwd);

////         ftpClient.changeWorkingDirectory(path);

////         //ftpClient.enterRemotePassiveMode();

////         //ftpClient.enterLocalPassiveMode();

////         ftpClient.enterLocalActiveMode();

////         //ftpClient.enterRemoteActiveMode(InetAddress.getByName(ip), port);

////

////         InputStream ins = ftpClient.retrieveFileStream(fileName);

////         BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));

////         String line;

////         StringBuilder builder = new StringBuilder();

////         while ((line = reader.readLine()) != null) {

////            builder.append(line);

////         }

////         reader.close();

////         if (ins != null) {

////            ins.close();

////         }

////         ftpClient.getReply();

////         String content = builder.toString();

////         if(ftpClient.isConnected()) {

////            ftpClient.logout();

////            ftpClient.disconnect();

////         }

         ftpClient.connect(ip, port);

         ftpClient.login(userName, userPwd);

         ftpClient.changeWorkingDirectory(path);

         ftpClient.enterLocalPassiveMode();

         //ftpClient.enterLocalActiveMode();



         URL realUrl = new URL(urlStr);

         URLConnection connection = realUrl.openConnection();

         connection.connect();

         StringBuffer result = new StringBuffer();

         BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8"));

         InputStream ins = ftpClient.retrieveFileStream(fileName);

         BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));

         String line;

         while ((line = in.readLine()) != null) {

            result.append(line);

         StringBuilder builder = new StringBuilder();

         while ((line = reader.readLine()) != null) {

            builder.append(line);

         }

         String content = result.toString();

         reader.close();

         if (ins != null) {

            ins.close();

         }

         ftpClient.getReply();

         String content = builder.toString();

         if(ftpClient.isConnected()) {

            ftpClient.logout();

            ftpClient.disconnect();

         }



//         String urlStr = "http://www.7drlb.com/apps/Version.xml";

//         URL realUrl = new URL(urlStr);

//         URLConnection connection = realUrl.openConnection();

//         connection.connect();

//         StringBuffer result = new StringBuffer();

//         BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8"));

//         String line;

//         while ((line = in.readLine()) != null) {

//            result.append(line);

//         }

//         String content = result.toString();



         SAXReader saxReader = new SAXReader();

         Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));

@@ -347,10 +421,8 @@
   @RequestMapping(value = "/map-page", method = RequestMethod.GET)

   public ModelAndView map(ModelAndView model, @RequestParam("areaCode")int code, @RequestParam("accountId")int accountId){

      Account account = accountService.getAccountById(accountId);

      String regionName = areaService.selectFullNameByCode(code);

      String regionName = areaService.queryFullNameByCode(code);

      if(account!=null&&regionName!=null){

          //去除空格

            regionName = regionName.replace(" ","");

         Object sensors = sensorService.queryAll();

         JSONObject params = new JSONObject();

         params.put("regionCode",code);

@@ -461,12 +533,10 @@
   @GetMapping("report_avg_datas")

   public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request) throws Exception {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      parameters.put("type", "month");

      ParameterUtils.getTimeType4Time(parameters);

      parameters.put("monitorPointId", parameters.remove("monitorPoint"));

      String sensorKey = parameters.remove("sensorKey").toString();

      List<String> sensorKeys = new ArrayList<String>();

      sensorKeys.add(sensorKey);

      parameters.put("sensors", sensorKeys);

      Object sensorKey = parameters.remove("sensorKey");

      parameters.put("sensors", Arrays.asList(sensorKey));

      List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);

      

      for (Map<String, Object> map : list) {

@@ -481,7 +551,8 @@
   @GetMapping("report_alarm_datas")

   public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      parameters.put("type", "month");

      ParameterUtils.getTimeType4Time(parameters);

      //parameters.put("type", "month");

      String sensorKey = "list";

      if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {

         parameters.put("description", "description");

@@ -496,8 +567,178 @@
            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);

   }



   /**

    * 根据监控点id获取所属设备version数据集

    * @param mptid

    * @return

    */

   @GetMapping("getvers")

   public ResultBean<List<Integer>> getVersions(Integer mptid){

      return  new ResultBean<>(monitorPointService.queryVersionsById(mptid));

   }

	
   @GetMapping("region_ranking_data")

   @ApiOperation(value = "获取排名数据", notes = "获取排名数据")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "regionCode", value = "区域码", required = true, paramType = "query", dataType = "String"),

         @ApiImplicitParam(name = "dimension", value = "维度(profession、region、monitorPoint选一)", required = true, paramType = "query", dataType = "String"),

         @ApiImplicitParam(name = "sensorKey", value = "传感器key", required = true, paramType = "query", dataType = "String"), 
         @ApiImplicitParam(name = "accountId", value = "账户id", required = true, paramType = "query", dataType = "int"), 
         @ApiImplicitParam(name = "timeType", value = "时间类型(month、day、hour选一)", required = true, paramType = "query", dataType = "int"), 
   })

   public ResultBean<List<Map<String, Object>>> getRegionRankingData(HttpServletRequest request){

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      List<Map<String, Object>> list = historyService.getRegionRankingData(parameters);

      return new ResultBean<List<Map<String, Object>>>(list);

   }

   // todo

   @Value(value = "classpath:system/realTimeMonitorLayout.json")

   private org.springframework.core.io.Resource resource;

   @ApiOperation(value = "获取实时监控页面布局", notes = "")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "primaryKey",defaultValue = "898607b0101730391967", value = "值为：设备mac或监控站id", required = true, paramType = "query", dataType = "String"),

         @ApiImplicitParam(name = "type", defaultValue = "device",value = "值为：'monitorPoint'或'device'", required = true, paramType = "query", dataType = "String"),

   })

   @GetMapping("rtm-layout")

   public ResultBean realTimeMonitorLayout(String primaryKey,String type){

      RealTimeDeviceLayout rtdLayout = null;

      if(type != null && type.equals("device")) {

         Device device = deviceService.getDeviceByMac(primaryKey,false);

         if(device!= null

         && device.getOrganizationIds()!=null

         && device.getOrganizationIds().size() >0

         && device.getDeviceVersionId()!=null) {

             Integer orgId = device.getOrganizationIds().get(0);

             DeviceVersion deviceVersion = deviceVersionService.queryVersionById(device.getDeviceVersionId());

              rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(orgId,deviceVersion.getVersion());

         }else {

            String errMsg = "device 数据异常："+ JSON.toJSONString(device);

            log.warn(errMsg);

            return  ResultBean.fail(errMsg);

         }



      } else {

         MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(Integer.parseInt(primaryKey));

         List<DeviceVersion> versionList = deviceVersionService.queryByMpointId(monitorPoint.getId());

         if(versionList.size() > 0) {

         List<Integer> versionNolist =   versionList.stream().map(item -> {

               return  item.getVersion();

            }).collect(Collectors.toList());

            rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(monitorPoint.getOrganizationId(),versionNolist);

            if(rtdLayout == null) {

               return ResultBean.fail();

            }

         }

      }

      if(rtdLayout!=null && rtdLayout.getDefaultMonitorItems().size() == 0 ) {

         rtdLayout.getDefaultMonitorItems().addAll(rtdLayout.getCoreMonitorItems());

      }

      return new ResultBean(rtdLayout == null? new RealTimeDeviceLayout():rtdLayout);

   }



   @GetMapping("report_avg_data")

   @ApiOperation(value = "获取监测因子月平均值", notes = "获取监测因子月平均值")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "monitorPoint", value = "监控站id", required = true, paramType = "query", dataType = "String"),

         @ApiImplicitParam(name = "mac", value = "设备mac", required = false, paramType = "query", dataType = "String"),

         @ApiImplicitParam(name = "sensorKey", value = "传感器key,如有多个用逗号分隔", required = true, paramType = "query", dataType = "String"), 
         @ApiImplicitParam(name = "time", value = "时间,月份(格式：2018-03)", required = true, paramType = "query", dataType = "String"), 
   })

   public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgDataBySensorKey(HttpServletRequest request) throws Exception {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      ParameterUtils.getTimeType4Time(parameters);

      parameters.put("monitorPointId", parameters.remove("monitorPoint"));

      String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");

      parameters.put("sensors", Arrays.asList(sensorKeys));

      List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);

		
      for (Map<String, Object> map : list) {

         String time = map.get("time").toString();

         time = time.substring(time.length() - 2);

         map.put("time", Integer.valueOf(time));

         List<Number> values = new ArrayList<Number>();

         for (String string : sensorKeys) {

            values.add((Number) map.remove(string));

         }

         map.put("values", values);

      }

      return new ResultBean<List<Map<String, Object>>>(list);

   }

   @GetMapping("getmpoint-byid")

   @ApiOperation(value = "获取监测站数据", notes = "获取监测站数据,包含名称、地址、坐标等详细信息")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "monitorPointId",defaultValue = "1",value = "监控站id", required = true, paramType = "query", dataType = "Integer"),

   })

    public ResultBean<MonitorPoint> getMonitorPointById(Integer monitorPointId){

      MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(monitorPointId);

      return new ResultBean<>(monitorPoint);

   }

   @Resource

   HangzhouAqiService hangzhouAqiService;

   @GetMapping("aqi24hours")

   @ApiOperation(value = "最近24小时aqi数值", notes = "最近24小时国控aqi数值")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "orgid",defaultValue = "5",value = "组织id", required = true, paramType = "query", dataType = "Integer"),

   })

   public ResultBean<List<Map>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) {

      return new ResultBean<>(hangzhouAqiService.queryAqi24Hours(organizationId));

   }

   @GetMapping("mpt-dev-summary")

   @ApiOperation(value = "监控总数和设备状态信息", notes = "监控总数和设备状态信息")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "orgid",defaultValue = "5",value = "组织id", required = true, paramType = "query", dataType = "Integer"),

   })

   public ResultBean<Map> getMptAndDevSummary(@RequestParam("orgid") Integer organizationId){

        Map<String,Map> result = new HashMap<>(2);

          Integer mptCount = monitorPointService.countOfSubOrgs(organizationId);

          Map monitorPointSummary = new HashMap();

          monitorPointSummary.put("all",mptCount);

          Map deviceSummary = deviceService.queryDeviceStateSummary(organizationId);

        result.put("monitorPoint",monitorPointSummary);

        result.put("device",deviceSummary);

        return new ResultBean<>(result);

   }

	
   @GetMapping("weather")

   @ApiOperation(value = "获取区域天气情况", notes = "获取区域天气情况")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "登录账号的组织id", required = true, paramType = "query", dataType = "String")

   })

   public ResultBean<Map<String, Object>> getWeatherDataByRegion(HttpServletRequest request) throws Exception {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      Map<String, Object> map = weatherService.getWeatherDataByRegion(parameters);

      return new ResultBean<Map<String,Object>>(map);

   }



   @GetMapping("actual")

   @ApiOperation(value = "获取监测因子实时最大值", notes = "获取监测因子实时最大值")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "accountId",defaultValue = "1", value = "登录账号的id", required = true, paramType = "query", dataType = "String"),

         @ApiImplicitParam(name = "sensorKey",defaultValue = "e1,e2,e3", value = "传感器key,如有多个用逗号分隔", required = true, paramType = "query", dataType = "String"), 
         @ApiImplicitParam(name = "time",defaultValue = "", value = "时间(long类型时间戳)", required = false, paramType = "query", dataType = "String"), 
         @ApiImplicitParam(name = "interval",defaultValue = "30", value = "时间间隔（秒）", required = true, paramType = "query", dataType = "Integer"),

   })

   public ResultBean<Map<String, Object>> getActualDataByRegion(HttpServletRequest request) throws Exception {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      Map<String, Object> map = historyService.getActualDataByRegion(parameters);

      return new ResultBean<Map<String, Object>>(map);

   }



   @GetMapping("quality")

   @ApiOperation(value = "获取优良天数", notes = "获取优良天数")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "登录账号的组织id", required = true, paramType = "query", dataType = "String")

   })

   public ResultBean<Map<String, Object>> getQualityCountDayByRegion(HttpServletRequest request) throws Exception {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      //Map<String, Object> map = hangzhouAqiService.getQualityCountDayByRegion(parameters);

      Map<String, Object> map = new HashMap<String, Object>();

      map.put("count", 136);

      return new ResultBean<Map<String, Object>>(map);

   }

}