From c9fab06805357db21713c7007fa1f4d037b3529e Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 24 Oct 2018 08:50:51 +0800
Subject: [PATCH] 优化
---
src/main/java/com/moral/controller/ScreenController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 27c491d..f0c0f43 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;
@@ -148,24 +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");
}
- 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.toString() );
}
resultMap.put("mapPath",areaNamesBuilder.toString());
}
@@ -704,7 +705,7 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "orgid",defaultValue = "5",value = "������id", required = true, paramType = "query", dataType = "Integer"),
})
- public ResultBean<List<Map>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) {
+ public ResultBean<List<Map<String,Object>>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) {
return new ResultBean<>(hangzhouAqiService.queryAqi24Hours(organizationId));
}
@GetMapping("mpt-dev-summary")
--
Gitblit v1.8.0