Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

 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());
    }
}