From ef8f1e9b23d20751838e853a5afe1f703ad562a2 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 13 Aug 2020 08:57:43 +0800
Subject: [PATCH] 风场图update

---
 src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java b/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java
index 4482f55..e971e29 100644
--- a/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java
+++ b/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java
@@ -1,19 +1,23 @@
 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.*;
+import com.moral.entity.DeviceProperty;
 
 public class EquDeviceAdapter {
     private Device device;
-    public EquDeviceAdapter(){
+    
+    private DeviceProperty deviceProperty;
+    
+    
+    public DeviceProperty getDeviceProperty() {
+		return deviceProperty;
+	}
+	public void setDeviceProperty(DeviceProperty deviceProperty) {
+		this.deviceProperty = deviceProperty;
+	}
+	public EquDeviceAdapter(){
         this.device = new Device();
+        this.deviceProperty = new DeviceProperty();
     }
     public void setDevice(Device device) {
         this.device = device;
@@ -22,6 +26,7 @@
     public void setUid(Integer uid) {
         device.setOperateUserId(uid);
     }
+    public void setId(Integer id) {  device.setId(id);  }
 
     public void setDevice_name(String device_name) {
         device.setName(device_name);
@@ -47,9 +52,20 @@
         device.setMonitorPointId(monitorpoint);
     }
 
-    public void setProfessionId(String professionId) {
+    public void setProfessionId(Integer professionId) {
         device.setProfessionId(professionId);
     }
+    
+    public void setDeviceTech(Byte deviceTech) {
+        deviceProperty.setDeviceTech(deviceTech);
+    }
+    public void setExtC(String extC) {
+        deviceProperty.setExtC(extC);
+    }
+    public void setExtD(String extD) {
+        deviceProperty.setExtD(extD);
+    }
+    
     public Device toDevice(){
         return device;
     }

--
Gitblit v1.8.0