blame | history | patch | commit | commitdiff | show whitespace
cjl
2023-07-27 79eda437eebf31b48891ac45255b92e764c883bd 
 screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java


@@ -29,6 +29,7 @@


import org.springframework.util.ObjectUtils;




import java.io.*;


import java.math.BigDecimal;


import java.net.InetAddress;


import java.net.InetSocketAddress;


import java.net.Socket;


@@ -447,12 +448,13 @@


        List<Map<String, Object>> dailyData = this.selectDailyData(prop);


        String startTimeStr = DateUtils.dateToDateString(DateUtils.addHours(end,-1),"yyyyMMddHH")+"0000";


        List<String> list = new ArrayList<>();




        for(Map<String, Object> m : dailyData){


            String result = strList(startTimeStr,m.get("mac").toString(),m.get("value").toString());


            list.add(result);


            redisTemplate.opsForHash().delete(RedisConstants.DATE_CHANG_SHU,m.get("mac").toString());


            redisTemplate.opsForHash().put(RedisConstants.DATE_CHANG_SHU,m.get("mac").toString(),result);


        }


       // httpResult(list.get(0));


        for(String s : list){


            sendSocket("222.92.166.238",15031,s);


        }


@@ -479,8 +481,8 @@


                }


                if(!mapKey.contains("-Flag")){


                    if(mapKey.contains("a34002")||mapKey.contains("a34004")||mapKey.contains("a21026")||mapKey.contains("a21004")||mapKey.contains("a05024")){


                       Double d = Objects.nonNull(mapValue)?Double.valueOf(mapValue.toString())/1000:0d;


                       mapValue = d;


                        BigDecimal d = Objects.nonNull(mapValue)? BigDecimal.valueOf(Double.valueOf(mapValue.toString())).divide(BigDecimal.valueOf(1000)):BigDecimal.ZERO;


                       mapValue = d.toString();


                    }


                    if(mapKey.contains("a00e13")){


                        mapKey = "a90085";