Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/ssf/mysqloracletest/task/SlryYjxxOracleTask.java

@@ -114,9 +114,6 @@ public class SlryYjxxOracleTask {
 
     }
 
-
-
-
 }
 
 

src/main/java/com/ssf/mysqloracletest/task/VLgryGjxxTask.java

@@ -23,6 +23,7 @@ import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 
 /**
  * 用户数据接入
@@ -58,6 +59,7 @@ public class VLgryGjxxTask {
 
         try {
             long currentTimeMillis = System.currentTimeMillis();
+            dateFormat.setTimeZone(TimeZone.getTimeZone("GMT+8"));
             // Convert long to DateTime
             DateTime currentDateTime = DateUtil.date(currentTimeMillis);
             String currentFormattedDate = null;

src/main/java/com/ssf/mysqloracletest/task/VSwryGjxxTask.java

@@ -23,6 +23,7 @@ import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 
 /**
  * 用户数据接入
@@ -38,6 +39,7 @@ public class VSwryGjxxTask {
 
     SimpleDateFormat dateFormat = new SimpleDateFormat(pattern);
 
+
     private final VSySwryGjxxOracleService vSySwryGjxxOracleService;
 
     private final TransitImpUserRecordService transitImpUserRecordService;
@@ -58,6 +60,7 @@ public class VSwryGjxxTask {
 
         try {
             long currentTimeMillis = System.currentTimeMillis();
+            dateFormat.setTimeZone(TimeZone.getTimeZone("GMT+8"));
             // Convert long to DateTime
             DateTime currentDateTime = DateUtil.date(currentTimeMillis);
             String currentFormattedDate = null;