From 4447110e052c82124dfb04eb21b15bd832361227 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 20 Feb 2019 13:56:40 +0800
Subject: [PATCH] 更新
---
src/main/java/com/moral/controller/MobileController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index 7319f8a..de362b3 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -20,6 +20,7 @@
import com.moral.common.bean.AppData;
import com.moral.common.bean.ResultBean;
import com.moral.common.util.Crypto;
+import com.moral.common.util.WebUtils;
import com.moral.entity.Account;
import com.moral.entity.Device;
import com.moral.entity.MonitorPoint;
@@ -305,9 +306,9 @@
@GetMapping("sensors")
@ApiOperation(value = "���������������������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "deviceVersionId", value = "������������Id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "deviceVersionId", value = "������������Id", required = true, paramType = "query", dataType = "int"),
@ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "deviceId", value = "������id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "deviceId", value = "������id", required = true, paramType = "query", dataType = "int"),
})
public ResultBean<List<Map<String, Object>>> getSensorsDataByDevice(HttpServletRequest request){
Map<String, Object> parameters = getParametersStartingWith(request, null);
@@ -320,11 +321,19 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "size", value = "������������������", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "size", value = "������������������", required = true, paramType = "query", dataType = "int"),
})
public ResultBean<List<Map<String, Object>>> getSensorDataBySensorKey(HttpServletRequest request){
Map<String, Object> parameters = getParametersStartingWith(request, null);
List<Map<String, Object>> sensors = historyService.getSensorDataBySensorKey(parameters);
return new ResultBean<List<Map<String, Object>>>(sensors);
}
+
+ @RequestMapping("profession-provincecode")
+ public ResultBean<List<Profession>> getProfessionByProvinceCode(HttpServletRequest request){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ List<Profession> professions = professionService.getProfessiontList(parameters);
+ return new ResultBean<List<Profession>>(professions);
+ }
+
}
--
Gitblit v1.8.0