From 8b41df708b44423f2f9cb8a637f3059ec56aa720 Mon Sep 17 00:00:00 2001
From: "1049970895@qniao.cn" <1049970895>
Date: Tue, 6 Sep 2022 10:08:29 +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  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 ab6e18c..6cd973c 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
@@ -126,7 +126,7 @@ public class GizWitsIotDataFormatterJob {
         ).name("machineIotDataReceivedEvent kafka Sink");
 
         // 发送到OSS存储
-        String outputPath = ApolloConfig.get(ConfigConstant.SINK_OSS_PATH);
+        /*String outputPath = ApolloConfig.get(ConfigConstant.SINK_OSS_PATH);
 
         StreamingFileSink<String> sink = StreamingFileSink.forRowFormat(
                 new Path(outputPath),
@@ -173,7 +173,7 @@ public class GizWitsIotDataFormatterJob {
             public String map(MachineIotDataReceivedEvent value) {
                 return JSONUtil.toJsonStr(value);
             }
-        }).addSink(sink);
+        }).addSink(sink);*/
 
         env.execute("gizwits iot data formatter job");
     }
@@ -196,8 +196,8 @@ public class GizWitsIotDataFormatterJob {
                     machineIotDataReceivedEvent.setMachinePwrStat(0);
                     machineIotDataReceivedEvent.setMachineWorkingStat(0);
                     machineIotDataReceivedEvent.setAccJobCount(0L);
-                    machineIotDataReceivedEvent.setCurrCount(0L);
-                    machineIotDataReceivedEvent.setCurrDuration(0L);
+                    machineIotDataReceivedEvent.setCurrJobCount(0L);
+                    machineIotDataReceivedEvent.setCurrJobDuration(0L);
                     machineIotDataReceivedEvent.setJobDurationOfTheDay(0L);
                     machineIotDataReceivedEvent.setJobCountOfTheDay(0L);
                     machineIotDataReceivedEvent.setDurationOfThePeriod(0L);
@@ -229,8 +229,8 @@ public class GizWitsIotDataFormatterJob {
                     machineIotDataReceivedEvent.setMachinePwrStat(1);
                     machineIotDataReceivedEvent.setMachineWorkingStat(2);
                     machineIotDataReceivedEvent.setAccJobCount(0L);
-                    machineIotDataReceivedEvent.setCurrCount(0L);
-                    machineIotDataReceivedEvent.setCurrDuration(0L);
+                    machineIotDataReceivedEvent.setCurrJobCount(0L);
+                    machineIotDataReceivedEvent.setCurrJobDuration(0L);
                     machineIotDataReceivedEvent.setJobDurationOfTheDay(0L);
                     machineIotDataReceivedEvent.setJobCountOfTheDay(0L);
                     machineIotDataReceivedEvent.setDurationOfThePeriod(0L);
@@ -264,7 +264,7 @@ public class GizWitsIotDataFormatterJob {
                     machineIotDataReceivedEvent.setMachinePwrStat(1);
                     machineIotDataReceivedEvent.setMachineWorkingStat(1);
                     machineIotDataReceivedEvent.setAccJobCount(0L);
-                    machineIotDataReceivedEvent.setCurrDuration(deviceStatus.getDuration());
+                    machineIotDataReceivedEvent.setCurrJobDuration(deviceStatus.getDuration());
                     machineIotDataReceivedEvent.setJobDurationOfTheDay(0L);
                     machineIotDataReceivedEvent.setJobCountOfTheDay(0L);
                     machineIotDataReceivedEvent.setDurationOfThePeriod(0L);
@@ -273,7 +273,7 @@ public class GizWitsIotDataFormatterJob {
                     machineIotDataReceivedEvent.setCurrStoppingDuration(0L);
                     machineIotDataReceivedEvent.setIgStat(null);
                     Long count = deviceStatus.getCount();
-                    machineIotDataReceivedEvent.setCurrCount(count);
+                    machineIotDataReceivedEvent.setCurrJobCount(count);
                     machineIotDataReceivedEvent.setReceivedTime(System.currentTimeMillis());
                     Date timestamp = deviceStatus.getTimestamp();
                     if(timestamp != null) {