获取优良天数

xufenglei

2018-08-31 9437c74510c25be9d2413821c65fcf6ca4e6d21a

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

@@ -9,8 +9,8 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import com.alibaba.fastjson.JSONReader;

import com.alibaba.fastjson.TypeReference;

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;

@@ -32,8 +32,6 @@
import org.springframework.web.bind.annotation.*;

import org.springframework.web.servlet.ModelAndView;

import org.xml.sax.InputSource;

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;

@@ -108,6 +106,10 @@
    private  OrganizationService organizationService;

   @Resource

    private  DictionaryDataService dictionaryDataService;

	
   @Resource

   private WeatherService weatherService;

	
   /**

    * Screen login. 大屏登录

    * 

@@ -128,7 +130,7 @@
         Object orgId = resultMap.get("orgId");

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

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

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

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

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

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

                        AreaNames areaNames =  organization.getAreaNames();

@@ -531,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) {

@@ -551,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");

@@ -616,7 +617,9 @@
             DeviceVersion deviceVersion = deviceVersionService.queryVersionById(device.getDeviceVersionId());

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

         }else {

            return  ResultBean.fail();

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

            log.warn(errMsg);

            return  ResultBean.fail(errMsg);

         }



      } else {

@@ -648,12 +651,7 @@
   })

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

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

      int length = ((String)parameters.get("time")).split("-").length;

      if (length == 2) {

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

      } else if (length == 3){

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

      }

      ParameterUtils.getTimeType4Time(parameters);

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

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

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

@@ -671,5 +669,76 @@
      }

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

   }

}