From acc6dd66f7ab4d7c9ff7c79196867ef486dd07ae Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 15 Jun 2018 08:54:16 +0800
Subject: [PATCH] update

---
 src/main/java/com/moral/controller/ScreenController.java |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index dadbe33..d827c2a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -61,6 +61,11 @@
 import com.moral.service.MonitorPointService;
 import com.moral.service.SensorService;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
 /**
  * The Class ScreenController.������������
  */
@@ -68,6 +73,7 @@
 @RequestMapping("/screen")
 //@CrossOrigin(origins = "*", maxAge = 3600)
 @SuppressWarnings({ "rawtypes", "unchecked", "unused" })
+@Api(tags = "Screen", description = "������������") 
 public class ScreenController {
 	public  static Logger log = Logger.getLogger(ScreenController.class);
     @Resource
@@ -375,8 +381,6 @@
 		Account account = accountService.getAccountById(accountId);
 		String regionName = areaService.queryFullNameByCode(code);
 		if(account!=null&&regionName!=null){
-		    //������������
-            regionName = regionName.replace(" ","");
 			Object sensors = sensorService.queryAll();
 			JSONObject params = new JSONObject();
 			params.put("regionCode",code);
@@ -526,4 +530,29 @@
 		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));
+	}
+	
+	@GetMapping("region_ranking_data")
+	@ApiOperation(value = "������������������", notes = "������������������")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "regionCode", value = "���������", required = true, paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "dimension", value = "������(profession���region���monitorPoint������)", required = true, paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"), 
+			@ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "int"), 
+	})
+	public ResultBean<List<Map<String, Object>>> getRegionRankingData(HttpServletRequest request){
+		Map<String, Object> parameters = getParametersStartingWith(request, null);
+		List<Map<String, Object>> list = historyService.getRegionRankingData(parameters);
+		return new ResultBean<List<Map<String, Object>>>(list);
+	}
+
 }

--
Gitblit v1.8.0