From 6006fe5d31237a7b45214b81069c17c2d155e9fb Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 22 May 2018 09:37:14 +0800
Subject: [PATCH] 地图相关资源
---
src/main/java/com/moral/controller/ScreenController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 0968946..773a1d0 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -36,7 +36,6 @@
import org.springframework.web.servlet.ModelAndView;
import org.xml.sax.InputSource;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.moral.common.bean.Constants;
@@ -177,14 +176,16 @@
alarmLevelMap.entrySet().stream().forEach(entry -> {
//��� increment������0������������������������
AlarmSensorLevel alarmSensorLevel = entry.getValue();
- boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item -> item == 0);
- if(isAllZero){
- AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap==null?null:finalDefaultSensorLevelMap.get(entry.getKey());
- if(defaultAlarmSensorLevel!=null){
- alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement());
- }else{
- List<Float> tempList = Arrays.asList(0.0f,200.0f,500.0f);
- alarmSensorLevel.setIncrement(tempList);
+ if(alarmSensorLevel.getIncrement()!=null){
+ boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item -> item == 0);
+ if(isAllZero){
+ AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap==null?null:finalDefaultSensorLevelMap.get(entry.getKey());
+ if(defaultAlarmSensorLevel!=null){
+ alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement());
+ }else{
+ List<Float> tempList = Arrays.asList(0.0f,200.0f,500.0f);
+ alarmSensorLevel.setIncrement(tempList);
+ }
}
}
});
@@ -372,7 +373,7 @@
@RequestMapping(value = "/map-page", method = RequestMethod.GET)
public ModelAndView map(ModelAndView model, @RequestParam("areaCode")int code, @RequestParam("accountId")int accountId){
Account account = accountService.getAccountById(accountId);
- String regionName = areaService.selectFullNameByCode(code);
+ String regionName = areaService.queryFullNameByCode(code);
if(account!=null&®ionName!=null){
//������������
regionName = regionName.replace(" ","");
@@ -525,4 +526,14 @@
List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey);
return new ResultBean<List<Map<String, Object>>>(list);
}
+
+ /**
+ * ���������������id������������������version���������
+ * @param mptid
+ * @return
+ */
+ @GetMapping("getvers")
+ public ResultBean<List<Integer>> getVersions(Integer mptid){
+ return new ResultBean<>(monitorPointService.queryVersionsById(mptid));
+ }
}
--
Gitblit v1.8.0