From 7be408b1ce28b70005cdf147f9c41065ddc43dea Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 08 May 2018 16:48:18 +0800
Subject: [PATCH] 设备信息修改
---
src/main/java/com/moral/controller/MobileController.java | 40 ++++----------------
src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java | 56 ++++++++++++++++++++++++++++
src/main/java/com/moral/entity/Device.java | 1
3 files changed, 65 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index cf2702f..1e290e6 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>("");
}
diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 3d11d54..0f170b7 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -76,6 +76,7 @@
*/
private Integer deviceVersionId;
private String isDelete;
+ private String professionId;
/**
* Sets the uid.
*
diff --git a/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java b/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java
new file mode 100644
index 0000000..4482f55
--- /dev/null
+++ b/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java
@@ -0,0 +1,56 @@
+package com.moral.entity.adapter;
+
+import com.moral.entity.Device;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Transient;
+
+import static lombok.AccessLevel.*;
+
+public class EquDeviceAdapter {
+ private Device device;
+ public EquDeviceAdapter(){
+ this.device = new Device();
+ }
+ public void setDevice(Device device) {
+ this.device = device;
+ }
+
+ public void setUid(Integer uid) {
+ device.setOperateUserId(uid);
+ }
+
+ public void setDevice_name(String device_name) {
+ device.setName(device_name);
+ }
+
+ public void setAddress(String address) {
+ device.setAddress(address);
+ }
+
+ public void setLongitude(Double longitude) {
+ device.setLongitude(longitude);
+ }
+
+ public void setLatitude(Double latitude) {
+ device.setLatitude(latitude);
+ }
+
+ public void setMac(String mac) {
+ device.setMac(mac);
+ }
+
+ public void setMonitorpoint(Integer monitorpoint) {
+ device.setMonitorPointId(monitorpoint);
+ }
+
+ public void setProfessionId(String professionId) {
+ device.setProfessionId(professionId);
+ }
+ public Device toDevice(){
+ return device;
+ }
+}
--
Gitblit v1.8.0