From 0acb61fe67c538a7bb9cd7aaec51c0b4099667db Mon Sep 17 00:00:00 2001 From: "1049970895@qniao.cn" <1049970895> Date: Sat, 20 Aug 2022 11:52:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/gizwits/GizWitsIotDataFormatterJob.java | 3 ++- .../src/test/java/com/qniao/Test1.java | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/iot-gizwits-statistics/src/main/java/com/qniao/iot/gizwits/GizWitsIotDataFormatterJob.java b/iot-gizwits-statistics/src/main/java/com/qniao/iot/gizwits/GizWitsIotDataFormatterJob.java index c3f166f..9b71164 100644 --- a/iot-gizwits-statistics/src/main/java/com/qniao/iot/gizwits/GizWitsIotDataFormatterJob.java +++ b/iot-gizwits-statistics/src/main/java/com/qniao/iot/gizwits/GizWitsIotDataFormatterJob.java @@ -208,7 +208,8 @@ public class GizWitsIotDataFormatterJob { machineIotDataReceivedEvent.setDataSource(DataSource.TACT_CLOUD); machineIotDataReceivedEvent.setMachineIotMac(Long.valueOf(mac)); machineIotDataReceivedEvent.setMachinePwrStat(1); - machineIotDataReceivedEvent.setMachineWorkingStat(0); + // 上线之后的工作状态是待机中 + machineIotDataReceivedEvent.setMachineWorkingStat(2); machineIotDataReceivedEvent.setCurrJobCount(0L); machineIotDataReceivedEvent.setCurrJobDuration(0L); machineIotDataReceivedEvent.setCurrStoppingDuration(0L); diff --git a/iot-gizwits-statistics/src/test/java/com/qniao/Test1.java b/iot-gizwits-statistics/src/test/java/com/qniao/Test1.java index 8cafc66..d4c9c08 100644 --- a/iot-gizwits-statistics/src/test/java/com/qniao/Test1.java +++ b/iot-gizwits-statistics/src/test/java/com/qniao/Test1.java @@ -3,13 +3,19 @@ package com.qniao; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.HexUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.gizwits.noti.noticlient.util.CommandUtils; +import com.qniao.iot.gizwits.DeviceStatus; import com.qniao.iot.gizwits.source.GizWitsIotSource; import com.qniao.iot.gizwits.util.DataParsingUtils; +import com.qniao.iot.rc.constant.DataSource; import org.apache.commons.lang3.StringUtils; +import java.sql.Date; import java.time.Instant; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; @@ -26,7 +32,11 @@ public class Test1 { JSONObject event = JSONObject.parseObject("{\"country\":\"China\",\"data\":{\"duration_2\":60,\"duration_1\":60,\"cur_speed\":0,\"state_1\":2,\"timestamp_3\":\"53b6f062\",\"timestamp_2\":\"17b6f062\",\"timestamp_1\":\"dbb5f062\",\"state_3\":2,\"state_2\":2,\"duration_3\":60,\"count_3\":4,\"count_2\":0,\"total_3\":2255,\"count_1\":1,\"total_2\":2251,\"sn\":75,\"total_1\":2251,\"signal\":3,\"cur_state\":2},\"city\":\"Unkown\",\"delivery_id\":4,\"ip\":\"117.132.198.66\",\"created_at\":1659942513.65440893173,\"mac\":\"861193040823503\",\"event_type\":\"device_status_kv\",\"product_key\":\"816caf9e2b2141be916f204214461df4\",\"cmd\":\"event_push\",\"msg_id\":\"vDBYUYSLQrmg7dtg+DlqJg\",\"region\":\"Unkown\",\"did\":\"apGAtdzI\"}"); List> mapList = DataParsingUtils.deviceStatusKvParsing(event); - System.out.println(StrUtil.toString(mapList)); - + mapList.forEach(e -> { + JSONObject j = (JSONObject) JSON.toJSON(e); + DeviceStatus deviceStatus = j.toJavaObject(DeviceStatus.class); + System.out.println(JSONUtil.toJsonStr(deviceStatus)); + System.out.println(deviceStatus.getTimestamp().getTime()); + }); } }