fengxiang
2018-09-27 adc1333672f9fb31bd19cc847c23be8f4d51adb7
src/main/java/com/moral/controller/ScreenController.java
@@ -20,6 +20,7 @@
import com.moral.entity.layout.RealTimeDeviceLayout;
import com.moral.service.*;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.log4j.Logger;
import org.dom4j.Document;
@@ -148,17 +149,24 @@
                     areaNamesBuilder.append(String.join("/",names));
                  }
               // 企业用户
               if( 0 == organization.getRank()) {
               if(organization.getRank()!=null && organization.getRank() == 0) {
                  resultMap.put("type","enterprise");
                    }else{
                  resultMap.put("type","government");
               }
               resultMap.put("areaCode",
                     organization.getVillageCode()|
                     organization.getTownCode()|
                     organization.getAreaCode()*1000000|
                     organization.getCityCode()*1000000|
                     organization.getProvinceCode()*1000000);
               Number mapAreaCode  = null;
               if(organization.getVillageCode()!=null){
                  mapAreaCode  = organization.getVillageCode();
               }else if (organization.getTownCode()!=null){
                  mapAreaCode  = organization.getTownCode();
               }else if(organization.getAreaCode()!=null) {
                  mapAreaCode  = organization.getAreaCode();
               }else if(organization.getCityCode()!=null) {
                  mapAreaCode  = organization.getCityCode();
               }else if(organization.getProvinceCode()!=null) {
                  mapAreaCode  = organization.getProvinceCode();
               }
               resultMap.put("mapAreaCode",mapAreaCode.toString() );
                }
                resultMap.put("mapPath",areaNamesBuilder.toString());
            }