大屏 path 更新

fengxiang

2018-09-27 3c3f6b4816efe48645866a6ebc1581eb522dc229

 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;

@@ -153,12 +154,19 @@
                    }else{

                  resultMap.put("type","government");

               }

               resultMap.put("areaCode",

                     organization.getVillageCode()|

                     organization.getTownCode()|

                     organization.getAreaCode()|

                     organization.getCityCode()|

                     organization.getProvinceCode());

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

                }

                resultMap.put("mapPath",areaNamesBuilder.toString());

            }