From fbb28c01b08e0f7c61ce20b9c2428c79d7799b9b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 09 May 2018 10:13:26 +0800
Subject: [PATCH] 设备分页 修复
---
src/main/java/com/moral/controller/MobileController.java | 52 ++++++++++++++++------------------------------------
1 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index cf2702f..abe5d9b 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -11,6 +11,7 @@
import com.moral.common.util.Crypto;
import com.moral.entity.*;
+import com.moral.entity.adapter.EquDeviceAdapter;
import com.moral.service.*;
import com.moral.util.MessageUtils;
import com.taobao.api.ApiException;
@@ -74,39 +75,14 @@
return new AppData<OperateUser>(operateUser);
}
- /**
- *
- * @param request
- * @param uid
- * @param deviceName
- * @param address
- * @param longitude
- * @param latitude
- * @param mac
- * @param monitorpoint
- * @return
- */
+ /**
+ *
+ * @param equDeviceAdapter
+ * @return
+ */
@RequestMapping("reportDevice")
- public AppData<String> installDevice(
- HttpServletRequest request ,
- @RequestParam(value ="uid") Integer uid,
- @RequestParam(value ="device_name") String deviceName,
- @RequestParam(value ="address") String address,
- @RequestParam(value ="longitude") double longitude,
- @RequestParam(value ="latitude") double latitude,
- @RequestParam(value ="mac") String mac,
- @RequestParam(value ="monitorpoint") Integer monitorpoint
- ) {
- // device ������
- Device device = new Device();
- device.setOperateUserId(uid);
- device.setName(deviceName);
- device.setAddress(address);
- device.setLongitude(longitude);
- device.setLatitude(latitude);
- device.setMac(mac);
- device.setMonitorPointId(monitorpoint);
- deviceService.saveOrUpdateDevice(device);
+ public AppData<String> installDevice(EquDeviceAdapter equDeviceAdapter) {
+ deviceService.saveOrUpdateDevice(equDeviceAdapter.toDevice());
return new AppData<String>("");
}
@@ -134,10 +110,14 @@
@RequestMapping("getEquInfoByMac")
public AppData<Map> getDeviceByMac(@RequestParam(value="mac", required=true)String mac) {
Device device = deviceService.getDeviceByMac(mac,false);//���������������
- Map<String,Object> deviceMap = new HashMap<>(BeanMap.create(device));
- deviceMap.put("monitorpointDetail",deviceMap.get("monitorPoint"));
- deviceMap.remove("monitorPoint");
- return new AppData<Map>(deviceMap);
+ if(device!=null){
+ Map<String,Object> deviceMap = new HashMap<>(BeanMap.create(device));
+ deviceMap.put("monitorpointDetail",deviceMap.get("monitorPoint"));
+ deviceMap.remove("monitorPoint");
+ return new AppData<Map>(deviceMap);
+ }else{
+ return new AppData("mac���������������",AppData.FAIL);
+ }
}
/**
--
Gitblit v1.8.0