优化

xufenglei

2018-07-18 8d2d5103aea98fab6ad94acd1c8421c05d1108fa

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

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

import com.moral.entity.*;

import com.moral.entity.alarm.AlarmConfig;

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

@@ -106,6 +103,8 @@
   private  DeviceVersionService dviceVersionService;

   @Resource

    private  OrganizationService organizationService;

   @Resource

    private  DictionaryDataService dictionaryDataService;

   /**

    * Screen login. 大屏登录

    * 

@@ -122,26 +121,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);

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

                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;

@@ -611,7 +613,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 {