From 3e6d73b90033d94fb8cb59e3a0958853177410e7 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei@blit.7drlb.com>
Date: Fri, 27 Oct 2017 09:42:09 +0800
Subject: [PATCH] 设备单项本月平均值、上一天AQI指标，单项标准值接口 设备状态接口
---
src/main/java/com/moral/monitor/controller/ApiController.java | 33 ++++++++-------------------------
1 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ApiController.java b/src/main/java/com/moral/monitor/controller/ApiController.java
index 33ea1b9..3744c0b 100644
--- a/src/main/java/com/moral/monitor/controller/ApiController.java
+++ b/src/main/java/com/moral/monitor/controller/ApiController.java
@@ -45,13 +45,11 @@
@RequestParam(value ="mac") String mac ){
try {
- System.out.println("");
- System.out.println("");
- System.out.println("");
request.setCharacterEncoding("UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
+
//������������������������������
ApiData apiData = new ApiData();
if(StringUtils.isBlank(mac)){
@@ -61,37 +59,22 @@
return apiData;
}
-
+ if (StringUtils.isBlank(longitude)){ longitude="0"; }
+ if (StringUtils.isBlank(latitude)) { latitude="0"; }
Equipment equipment = apiService.selectFromequipmentBymac(mac);
- if (equipment==null){
- if (StringUtils.isBlank(longitude)){ longitude="0"; }
- if (StringUtils.isBlank(latitude)) { latitude="0"; }
- //������
+ if (equipment==null){ //������
apiService.insertIntoequipment(device_name,address,longitude,latitude,uid,mac);
apiData.setData("");
apiData.setMessage("������������������");
apiData.setErrno(0);
- return apiData;
-
- }
-
-
-
- //������
- if (!StringUtils.isBlank(mac)) {
-
- if (StringUtils.isBlank(longitude)){ longitude="0"; }
- if (StringUtils.isBlank(latitude)) { latitude="0"; }
-
+ } else { //������
apiService.updateFromequipmentBymac(device_name, address, longitude, latitude, uid, mac);
apiData.setData("");
apiData.setMessage("������������������");
apiData.setErrno(0);
- return apiData;
}
-
- return null;
+ return apiData;
}
@@ -292,7 +275,7 @@
ae.setDevice_name(e.getName());
ae.setMac(e.getMac());
ae.setStatus(e.getState());
- ae.setFei(e.getFei());
+// ae.setFei(e.get);
// ae.setCreate_time(DateConvert.dateConvert(e.getTime()));
apiEquipments.add(ae);
@@ -347,7 +330,7 @@
ae.setDevice_name(e.getName());
ae.setMac(e.getMac());
ae.setStatus(e.getState());
- ae.setFei(e.getFei());
+// ae.setFei(e.getFei());
ae.setCreate_time(DateConvert.dateConvert(e.getTime()));
apiEquipments.add(ae);
--
Gitblit v1.8.0