From 7525afb97a1aeb68887fc557de832b0849c503b5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 27 Sep 2018 10:37:52 +0800
Subject: [PATCH] 大屏组织path，获取areacode
---
src/main/java/com/moral/controller/ScreenController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 27c491d..91cef7f 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/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,19 +154,19 @@
}else{
resultMap.put("type","government");
}
- Number areaCode = null;
+ Number mapareaCode = null;
if(organization.getVillageCode()!=null){
- areaCode = organization.getVillageCode();
+ mapareaCode = organization.getVillageCode();
}else if (organization.getTownCode()!=null){
- areaCode = organization.getTownCode();
+ mapareaCode = organization.getTownCode();
}else if(organization.getAreaCode()!=null) {
- areaCode = organization.getAreaCode();
+ mapareaCode = organization.getAreaCode();
}else if(organization.getCityCode()!=null) {
- areaCode = organization.getCityCode();
+ mapareaCode = organization.getCityCode();
}else if(organization.getProvinceCode()!=null) {
- areaCode = organization.getProvinceCode();
+ mapareaCode = organization.getProvinceCode();
}
- resultMap.put("areaCode",areaCode);
+ resultMap.put("mapareaCode ",mapareaCode );
}
resultMap.put("mapPath",areaNamesBuilder.toString());
}
--
Gitblit v1.8.0