From c212d4a32be33f173a1f4a58310349e98860c8d2 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 25 Oct 2017 16:40:50 +0800
Subject: [PATCH] 代码更新
---
src/main/java/com/moral/monitor/controller/ApiController.java | 42 +++++++++++++-----------------------------
1 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ApiController.java b/src/main/java/com/moral/monitor/controller/ApiController.java
index a57ad4b..3744c0b 100644
--- a/src/main/java/com/moral/monitor/controller/ApiController.java
+++ b/src/main/java/com/moral/monitor/controller/ApiController.java
@@ -6,6 +6,7 @@
import com.moral.monitor.listener.message.Captcha;
import com.moral.monitor.service.ApiService;
import com.moral.monitor.util.ApiData;
+import com.moral.monitor.util.Crypto;
import com.moral.monitor.util.DateConvert;
import com.taobao.api.ApiException;
import net.sf.json.JSONArray;
@@ -44,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)){
@@ -60,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;
}
@@ -103,7 +87,7 @@
ApiData apiData = new ApiData();
//������������
- User user = apiService.selectFromuserBynameAndpassword(username, password);//username���mobile
+ User user = apiService.selectFromuserBynameAndpassword(username, Crypto.md5(password));//username���mobile
if (user==null){
apiData.setErrno(1);
apiData.setMessage("������������������������������������");
@@ -214,7 +198,7 @@
}
if (user.getCode().equals(code)){
- apiService.updateuserByid(password,String.valueOf(user.getId()));
+ apiService.updateuserByid(Crypto.md5(password),String.valueOf(user.getId()));
apiData.setErrno(0);
apiData.setMessage("������������������");
apiData.setData("{}");
@@ -241,13 +225,13 @@
public ApiData upPassword(String uid,String password,String newpassword){
ApiData apiData = new ApiData();
//������uid ��� password ������������
- User user = apiService.selectFromuserByidAndpassword(uid, password);
+ User user = apiService.selectFromuserByidAndpassword(uid, Crypto.md5(password));
JSONObject jsonObject = JSONObject.fromObject(user);
String s = jsonObject.toString();
if (user!=null){
//������password������
- apiService.updateuserByid(newpassword,uid);
+ apiService.updateuserByid(Crypto.md5(newpassword),uid);
apiData.setErrno(0);
apiData.setMessage("������������������");
apiData.setData(s);
@@ -291,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);
@@ -346,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