modify customerWaterMark

Author: todd5167

core/src/main/java/com/dtstack/flink/sql/watermarker/CustomerWaterMarkerForLong.java

@@ -57,12 +57,11 @@ public CustomerWaterMarkerForLong(Time maxOutOfOrderness, int pos,String timezon
     public long extractTimestamp(Row row) {
 
         try{
-            Long eveTime = MathUtil.getLongVal(row.getField(pos));
-            Long extractTime=eveTime;
+            Long extractTime = MathUtil.getLongVal(row.getField(pos));
 
             lastTime = extractTime + timezone.getOffset(extractTime);
 
-            eventDelayGauge.setDelayTime(MathUtil.getIntegerVal((System.currentTimeMillis() - convertTimeZone(extractTime))/1000));
+            eventDelayGauge.setDelayTime(MathUtil.getIntegerVal((System.currentTimeMillis() - extractTime)/1000));
 
             return lastTime;
         }catch (Exception e){
@@ -71,8 +70,4 @@ public long extractTimestamp(Row row) {
         return lastTime;
     }
 
-    public long convertTimeZone(long evenTime){
-        long res = evenTime - timezone.getOffset(evenTime) + TimeZone.getDefault().getOffset(evenTime);
-        return res;
-    }
 }

core/src/main/java/com/dtstack/flink/sql/watermarker/CustomerWaterMarkerForTimeStamp.java

@@ -63,7 +63,7 @@ public long extractTimestamp(Row row) {
 
             lastTime = extractTime + timezone.getOffset(extractTime);
 
-            eventDelayGauge.setDelayTime(MathUtil.getIntegerVal((System.currentTimeMillis() - convertTimeZone(extractTime))/1000));
+            eventDelayGauge.setDelayTime(MathUtil.getIntegerVal((System.currentTimeMillis() - extractTime)/1000));
 
             return lastTime;
         } catch (RuntimeException e) {
@@ -72,8 +72,4 @@ public long extractTimestamp(Row row) {
         return lastTime;
     }
 
-    public long convertTimeZone(long evenTime){
-        long res = evenTime - timezone.getOffset(evenTime) + TimeZone.getDefault().getOffset(evenTime);
-        return res;
-    }
 }