forked from moral

blame | history | patch | commit | commitdiff | ignore whitespace
kaiyu
2021-08-06 b41e39cab33da257f1b2cf33123c1958102fa0e9 
 screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java


@@ -17,6 +17,7 @@


import org.springframework.stereotype.Component;


import org.springframework.util.ObjectUtils;




import java.math.BigDecimal;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


@@ -39,7 +40,7 @@


        long serverStartTime = System.currentTimeMillis();


        CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;


        for (SingleDeviceServer socket : sockets) {


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


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


            String messageMac = (String) message.get("mac");


            String mac = socket.getMac();


            if (!mac.equalsIgnoreCase(messageMac))


@@ -57,7 +58,11 @@


                String showUnitKey = sensor.getShowUnitKey();


                String unitKey = sensor.getUnitKey();


                String unit = sensor.getUnit();


                String sourceData = String.valueOf(message.get(code));


                //对数据保留两位小数，并且向下取整


                Double sourceDataD = Double.valueOf(String.valueOf(message.get(code)));


                BigDecimal bg = new BigDecimal(sourceDataD);


                bg = bg.setScale(2,BigDecimal.ROUND_FLOOR);


                String sourceData = bg.toString();


                //数据补偿


                //单位转换


                if (!unitKey.equals(showUnitKey)) {//如果源单位和显示单位不同，则进行单位转换


@@ -84,11 +89,12 @@


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


                }


            }


            resultMessgae.put("DataTime", message.get("DataTime"));


            resultMessgae.put("time", message.get("time"));


            resultMessgae.put("time1", message.get("time1"));


            resultMessgae.put("serverTime", System.currentTimeMillis());


            resultMessgae.put("serverStartTime", serverStartTime);


            //测试时间延迟使用的属性


            //resultMessgae.put("DataTime", message.get("DataTime"));


            //resultMessgae.put("time", message.get("time"));


            //resultMessgae.put("time1", message.get("time1"));


            //resultMessgae.put("serverTime", System.currentTimeMillis());


            //resultMessgae.put("serverStartTime", serverStartTime);


            socket.sendMessage(JSON.toJSONString(resultMessgae));


        }


    }