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/layout/SensorComb.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/entity/layout/SensorComb.java b/src/main/java/com/moral/entity/layout/SensorComb.java
index 7c4e7ae..c8e86d1 100644
--- a/src/main/java/com/moral/entity/layout/SensorComb.java
+++ b/src/main/java/com/moral/entity/layout/SensorComb.java
@@ -1,5 +1,8 @@
package com.moral.entity.layout;
+import com.moral.entity.OrganizationLayout;
+import com.moral.entity.Sensor;
+import com.moral.entity.SensorUnit;
import lombok.Data;
/**
@@ -15,4 +18,30 @@
String sourceUnit;
String targetUnit;
String evaluator;
+ public static SensorComb generate(Sensor sensor) {
+ SensorComb sensorComb = new SensorComb();
+ sensorComb.setSensorId(sensor.getId());
+ sensorComb.setSensorKey(sensor.getSensorKey());
+ sensorComb.setName(sensor.getDescription());
+ sensorComb.setSourceUnit(sensor.getUnit());
+ sensorComb.setTargetUnit(sensor.getUnit());
+ return sensorComb;
+ }
+ public static SensorComb generate(OrganizationLayout orgLayout) {
+ SensorComb sensorComb = new SensorComb();
+ sensorComb.setIndex(orgLayout.getPagePositionIndex());
+ sensorComb.setSensorKey(orgLayout.getPagePositionValue());
+ return sensorComb;
+ }
+ public void setSensor(Sensor sensor) {
+ this.setSensorId(sensor.getId());
+ this.setSensorKey(sensor.getSensorKey());
+ this.setName(sensor.getDescription());
+ this.setSourceUnit(sensor.getUnit());
+ this.setTargetUnit(sensor.getUnit());
+ }
+ public void setUnit(SensorUnit unit) {
+ this.setTargetUnit(unit.getName());
+ this.setEvaluator(unit.getRules());
+ }
}
--
Gitblit v1.8.0