From 3bfdde73c91647e59687b49758a54df5a0d0962d Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 11 Jul 2018 14:54:57 +0800
Subject: [PATCH] app接口更新
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 3 +++
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 16 ++++++++++++++--
src/main/java/com/moral/controller/MobileController.java | 6 +++---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 1 +
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index 7319f8a..a15ddaf 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -305,9 +305,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,7 +320,7 @@
@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);
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 87ee342..cf1ef0c 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -22,6 +22,7 @@
import com.moral.common.exception.BusinessException;
import com.moral.common.util.Crypto;
import com.moral.common.util.ResourceUtil;
+import com.moral.common.util.ValidateUtil;
import com.moral.entity.Account;
import com.moral.entity.Organization;
import com.moral.mapper.AccountMapper;
@@ -182,6 +183,8 @@
@Override
public Account companyLogin(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters.get("account"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("password"), "param.is.null");
Account account = new Account();
account.setIsDelete(Constants.IS_DELETE_FALSE);
account.setAccountName(parameters.get("account").toString());
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 8aa95dc..264ed65 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -476,6 +476,7 @@
@Override
public List<Device> getDevicesByOrganizationId(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters.get("organizationId"), "param.is.null");
return deviceMapper.getDevicesByOrganizationId(parameters);
}
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index c45cb88..70fe9ac 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -221,20 +221,32 @@
@Override
public List<Map<String, Object>> getSensorsDataByDevice(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters.get("deviceVersionId"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("deviceId"), "param.is.null");
List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(parameters);
parameters.put("size", 1);
List<Map<String, Object>> values = historyMapper.getValueByMacAndSize(parameters);
- JSONObject map = JSON.parseObject(values.get(0).get("value").toString());
+ JSONObject map = null;
+ if (!ObjectUtils.isEmpty(values)) {
+ map = JSON.parseObject(values.get(0).get("value").toString());
+ }
Device device = deviceMapper.selectByPrimaryKey(Integer.valueOf((String) parameters.get("deviceId")));
for (Map<String, Object> sensor : sensors) {
- sensor.put("value", map.remove(sensor.get("sensor_key")));
+ if (!ObjectUtils.isEmpty(map)) {
+ sensor.put("value", map.remove(sensor.get("sensor_key")));
+ }
sensor.put("state", device.getState());
+ sensor.put("name", sensor.get("description"));
}
return sensors;
}
@Override
public List<Map<String, Object>> getSensorDataBySensorKey(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters.get("sensorKey"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("size"), "param.is.null");
parameters.put("size", Integer.valueOf(parameters.remove("size").toString()));
List<Map<String, Object>> values = historyMapper.getValueByMacAndSize(parameters);
for (Map<String, Object> value : values) {
--
Gitblit v1.8.0