大屏登录 返回地址信息完善

fengxiang

2018-07-16 3bb54d86b0a80a13374b10b1a9d9d0f131a85f9d

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

@@ -11,6 +11,7 @@


import com.alibaba.fastjson.JSONReader;

import com.alibaba.fastjson.TypeReference;

import com.moral.common.util.StringUtils;

import com.moral.entity.*;

import com.moral.entity.alarm.AlarmConfig;

import com.moral.entity.alarm.AlarmConfigValue;

@@ -53,7 +54,7 @@
@RequestMapping("/screen")

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

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

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

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

    @Resource

@@ -103,6 +104,8 @@
   private OrganizationLayoutService orgLayoutService;

   @Resource

   private  DeviceVersionService dviceVersionService;

   @Resource

    private  OrganizationService organizationService;

   /**

    * Screen login. 大屏登录

    * 

@@ -119,6 +122,27 @@
         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);

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

                  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;

   }

@@ -619,7 +643,12 @@
   })

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

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

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

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

      if (length == 2) {

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

      } else if (length == 3){

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

      }

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

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

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