From d7dc62f727cb8579dfac2065df30ae390e4d1eff Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 27 Oct 2017 14:13:24 +0800
Subject: [PATCH] 数据库更新数据
---
src/main/java/com/moral/monitor/controller/ApiController.java | 35 +++++++++--------------------------
1 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ApiController.java b/src/main/java/com/moral/monitor/controller/ApiController.java
index b4c1897..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;
}
@@ -248,7 +231,7 @@
if (user!=null){
//������password������
- apiService.updateuserByid(newpassword,uid);
+ apiService.updateuserByid(Crypto.md5(newpassword),uid);
apiData.setErrno(0);
apiData.setMessage("������������������");
apiData.setData(s);
@@ -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