From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/ScreenController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index f7d72e0..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;
@@ -374,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(" ","");
@@ -527,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