修改kafka小数数据时间问题

jinpengyong

2023-02-20 65ce763aa478661c8da3214a5aa812a0ce24c04d

修改kafka小数数据时间问题

 screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java

@@ -97,7 +97,7 @@
            }

            //数据过滤
            data.remove("time");
//            data.remove("time");
            data.remove("entryTime");
            Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
            Map<String, Object> newMap = new HashMap<>();

 screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java

@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -49,8 +50,15 @@
        Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
        Map<String, Object> versionInfo = (Map<String, Object>) deviceInfo.get("version");
        Integer version = (Integer) versionInfo.get("id");
        //获取时间戳
        String time1 = data.get("time").toString();
        long l = Long.parseLong(time1);
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
        String format1 = dateFormat.format(l);
        Date time = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);

        Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);

//        Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
        String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN);

        result.put("mac", mac);

 screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java

@@ -107,9 +107,15 @@
            }
          if (code.equals("2")){
              HashMap<String, Object> result = new HashMap<>();
              String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -2), DateUtils.yyyyMM_EN);
              String time1 = deviceData.get("time").toString();
              long l = Long.parseLong(time1);

              SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
              String format = simpleDateFormat.format(DateUtils.addHours(time, -2));
              String format1 = simpleDateFormat.format(l);
              Date date = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);

              String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(date, -2), DateUtils.yyyyMM_EN);
              String format = simpleDateFormat.format(DateUtils.addHours(date, -2));
              result.put("timeUnits",yearAndMonth);
              result.put("mac",mac);
              result.put("time",format);