From 296d509996b9500c35be0b81860fa14c1d275048 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 10:47:51 +0800
Subject: [PATCH] 更改五分钟数据接口，添加界面左侧站点设备信息接口
---
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