fengxiang
2018-07-16 b95fd235f28073131ffc4b9417219bdd576d3c7c
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,10 @@
   private OrganizationLayoutService orgLayoutService;
   @Resource
   private  DeviceVersionService dviceVersionService;
   @Resource
    private  OrganizationService organizationService;
   @Resource
    private  DictionaryDataService dictionaryDataService;
   /**
    * Screen login. 大屏登录
    * 
@@ -119,6 +124,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 != 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;
   }
@@ -619,7 +648,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));