api详细接口修正

fengxiang

2018-08-14 f53830df5296e399a6153a5a7b0f2b94315dd0c1

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

@@ -9,8 +9,9 @@
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;

import com.moral.entity.alarm.AlarmConfigValue;

@@ -31,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;

@@ -105,6 +104,8 @@
   private  DeviceVersionService dviceVersionService;

   @Resource

    private  OrganizationService organizationService;

   @Resource

    private  DictionaryDataService dictionaryDataService;

   /**

    * Screen login. 大屏登录

    * 

@@ -121,14 +122,29 @@
         resultMap.put("accountId", -1);

      } else {

         resultMap = accountService.screenLogin(parameters);

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

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

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

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

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

                      AreaNames areaNames =  organization.getAreaNames();

                      resultMap.put("mapPath ","中国/"+areaNames.getProvinceName()+"/"

                      +areaNames.getCityName()+"/"+areaNames.getAreaName());

                  }

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

                if((Integer) orgId != 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;

@@ -513,12 +529,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) {

@@ -598,7 +612,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 {

@@ -630,12 +646,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));

@@ -653,5 +664,13 @@
      }

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

   }

}