kaiyu
2021-07-13 e6463e3aad65706d4540235e30941717532f9f18
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
@@ -5,6 +5,7 @@
import com.moral.api.entity.Sensor;
import com.moral.api.entity.UnitConversion;
import com.moral.api.websocket.SingleDeviceServer;
import com.moral.util.UnitConvertUtils;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.common.TopicPartition;
@@ -51,13 +52,17 @@
                //单位转换
                if(!unitKey.equals(showUnitKey)){
                    String formula = sensor.getFormula();
                    //如果sensor中的公式为空则从缓存中获取公式
                    if(ObjectUtils.isEmpty(formula)){
                        List<UnitConversion> unitConversions = socket.getUnitConversions();
                        System.out.println(unitConversions);
                    }else{
                        for (UnitConversion unitConversion : unitConversions) {
                            if (unitConversion.getOriginalUnitKey().equals(unitKey) && unitConversion.getTargetUnitKey().equals(showUnitKey))
                                formula = unitConversion.getFormula();
                    }
                }
                    //单位转换
                    UnitConvertUtils.calculate(message.get(code),formula);
                }
                //拼接单位
                String showUnit = sensor.getShowUnit();
                String value = message.get(code);