From 3c3f6b4816efe48645866a6ebc1581eb522dc229 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 27 Sep 2018 10:57:57 +0800
Subject: [PATCH] 大屏 path 更新
---
src/main/java/com/moral/controller/ScreenController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index a7005ec..bcea347 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,12 +154,19 @@
}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 );
}
resultMap.put("mapPath",areaNamesBuilder.toString());
}
--
Gitblit v1.8.0