From 606c896c1b7c9d986cfb13d8464f3482160a1389 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 08 May 2018 09:47:40 +0800
Subject: [PATCH] 手机 设备 保存 api
---
src/main/java/com/moral/controller/MobileController.java | 38 +++++++++++++++++++++++++++++++-------
src/main/java/com/moral/service/impl/OperateUserServiceImpl.java | 4 +++-
src/main/java/com/moral/entity/Device.java | 9 ---------
3 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index b4d908a..9bc8e52 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -77,14 +77,38 @@
return new AppData<OperateUser>(operateUser);
}
- /**
- * Install device.������������
- *
- * @param device the device
- * @return the result bean
- */
+ /**
+ *
+ * @param request
+ * @param uid
+ * @param deviceName
+ * @param address
+ * @param longitude
+ * @param latitude
+ * @param mac
+ * @param monitorpoint
+ * @return
+ */
@PostMapping("reportDevice")
- public AppData<String> installDevice(Device device) {
+ 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);
return new AppData<String>("");
}
diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 588df3f..3d11d54 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -86,15 +86,6 @@
}
/**
- * Sets the device name.
- *
- * @param device_name the new device name
- */
- public void setDevice_name(String device_name) {
- this.name = device_name;
- }
-
- /**
* Gets the device name.
*
* @return the device name
diff --git a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
index 1f4a2f0..7fa8a29 100644
--- a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
@@ -89,7 +89,9 @@
if (parameters.containsKey("sorter")) {
example.setOrderByClause((String) parameters.get("sorter"));
}
- criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
+ Object isDelete = parameters.get("isDelete");
+ criteria.andEqualTo("isDelete",isDelete!=null?isDelete:0);
+// criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
PageHelper.startPage(Integer.valueOf((String) parameters.get("pi")), Integer.valueOf((String) parameters.get("ps")));
List<OperateUser> operateUsers = operateUserMapper.selectByExample(example);
return new PageBean<OperateUser>(operateUsers);
--
Gitblit v1.8.0