From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java b/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java
index 915f511..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;
@@ -51,6 +55,17 @@
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