feat：统一根云字段

root-cloud-event/src/main/java/com/qniao/iot/rc/RootCloudIotDataReceiptedEvent.java

@@ -1,5 +1,6 @@
 package com.qniao.iot.rc;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import lombok.Data;
 import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -11,6 +12,7 @@ import java.math.BigDecimal;
  * @date 2022/7/1
  **/
 @Data
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
 public class RootCloudIotDataReceiptedEvent implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -39,7 +41,6 @@ public class RootCloudIotDataReceiptedEvent implements Serializable {
     /**
      * 设备总电源启停状态 1有电 0断电
      */
-    @JsonProperty("PWR_sta")
     private Integer PWR_sta;
 
 
@@ -161,4 +162,13 @@ public class RootCloudIotDataReceiptedEvent implements Serializable {
      * 设备今日作业率 (eqp_working_rt)
      */
     private BigDecimal eqp_working_rt;
+
+    private Online __online__;
+
+    @Data
+    public static class Online{
+        private boolean connected;
+
+        private boolean directlyLinked;
+    }
 }

root-cloud-statistics/src/main/java/com/qniao/iot/rc/event/MachineIotDataReceivedEvent.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Objects;
 
 /**
@@ -89,7 +90,10 @@ public class MachineIotDataReceivedEvent implements Serializable {
             machineIotDataReceivedEvent.setAccJobCount(event.getACC_count_total());
             machineIotDataReceivedEvent.setCurrJobCount(event.getACC_count());
             machineIotDataReceivedEvent.setCurrJobDuration(Objects.isNull(event.getRunning_duration()) ? null : event.getRunning_duration().longValue());
-            machineIotDataReceivedEvent.setCurrStoppingDuration(StringUtils.isBlank(event.getStoping_duration()) ? null : Long.valueOf(event.getStoping_duration()));
+            if (StringUtils.isNotBlank(event.getStoping_duration())) {
+                BigDecimal stoppingDuration = new BigDecimal(event.getStoping_duration());
+                machineIotDataReceivedEvent.setCurrStoppingDuration(stoppingDuration.longValue());
+            }
             machineIotDataReceivedEvent.setCurrWaitingDuration(Objects.isNull(event.getWaiting_duration()) ? null : event.getWaiting_duration().longValue());
             machineIotDataReceivedEvent.setReportTime(System.currentTimeMillis());
         }

root-cloud-statistics/src/main/java/com/qniao/iot/rc/event/RootCloudIotDataReceiptedEventDeserializationSchema.java

@@ -1,6 +1,6 @@
 package com.qniao.iot.rc.event;
 
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.qniao.iot.rc.RootCloudIotDataReceiptedEvent;
 import org.apache.flink.api.common.serialization.DeserializationSchema;
 import org.apache.flink.api.common.typeinfo.TypeInformation;