blame | history | patch | commit | commitdiff | show whitespace
kaiyu
2021-07-13 327267727c36cef76ee554e1ad97099180cd4f13 
 screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java


@@ -3,6 +3,7 @@


import com.alibaba.fastjson.JSON;


import com.moral.api.entity.Device;


import com.moral.api.entity.Sensor;


import com.moral.api.entity.UnitConversion;


import com.moral.api.websocket.SingleDeviceServer;


import org.apache.kafka.clients.consumer.Consumer;


import org.apache.kafka.clients.consumer.ConsumerRecord;


@@ -10,6 +11,7 @@


import org.springframework.kafka.annotation.KafkaListener;


import org.springframework.kafka.listener.ConsumerSeekAware;


import org.springframework.stereotype.Component;


import org.springframework.util.ObjectUtils;




import java.util.HashMap;


import java.util.List;


@@ -30,7 +32,6 @@


    public void listen(ConsumerRecord<String, String> record , Consumer consumer) throws Exception {


        String messageStr = record.value();


        Map<String,String> message = (Map<String,String>)JSON.parse(messageStr);


        //System.out.println(message);


        CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;


        for (SingleDeviceServer socket : sockets) {


            //判断消息书否数据该socket


@@ -44,9 +45,21 @@


            List<Sensor> sensors = device.getVersion().getSensors();//获取型号所有因子信息


            for (Sensor sensor : sensors) {


                String code = sensor.getCode();


                String showUnit = sensor.getShowUnit();


                String showUnitKey = sensor.getShowUnitKey();


                String unitKey = sensor.getUnitKey();


                //数据补偿


                //单位转换


                if(!unitKey.equals(showUnitKey)){


                    String formula = sensor.getFormula();


                    if(ObjectUtils.isEmpty(formula)){


                        List<UnitConversion> unitConversions = socket.getUnitConversions();


                        System.out.println(unitConversions);


                    }else{




                    }


                }


                //拼接单位


                String showUnit = sensor.getShowUnit();


                String value = message.get(code);


                value+=showUnit;


                resultMessgae.put(sensor.getCode(),value);


@@ -72,3 +85,4 @@




    }


}