Browse Source

[Fix-6707][common] Fix complement data error because of global variables (#6759)

* [Fix-6707][common] Fix complement data error because of global variables

* [Fix-6707][common] Fix complement data error because of global variables

* [Fix-6707][common] Fix complement data error because of global variables

* [Fix-6707][common] Fix complement data error because of global variables

Co-authored-by: shangeyao <sgy960921>
Co-authored-by: OS <29528966+lenboo@users.noreply.github.com>
3.0.0/version-upgrade
Assert 3 years ago committed by GitHub
parent
commit
089f73ebe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java
  2. 7
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/BusinessTimeUtils.java

4
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java

@ -99,8 +99,8 @@ public class ParameterUtils {
} }
Map<String, String> allParamMap = new HashMap<>(); Map<String, String> allParamMap = new HashMap<>();
//If it is a complement, a complement time needs to be passed in, according to the task type //If it is a complement, a complement time needs to be passed in, according to the task type
Map<String, String> timeParams = BusinessTimeUtils Map<String, String> timeParams = BusinessTimeUtils.
.getBusinessTime(commandType, scheduleTime); getBusinessTime(commandType, scheduleTime);
if (timeParams != null) { if (timeParams != null) {
allParamMap.putAll(timeParams); allParamMap.putAll(timeParams);

7
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/BusinessTimeUtils.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.utils.placeholder; package org.apache.dolphinscheduler.common.utils.placeholder;
import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.Constants;
@ -36,6 +37,7 @@ public class BusinessTimeUtils {
private BusinessTimeUtils() { private BusinessTimeUtils() {
throw new IllegalStateException("BusinessTimeUtils class"); throw new IllegalStateException("BusinessTimeUtils class");
} }
/** /**
* get business time in parameters by different command types * get business time in parameters by different command types
* *
@ -45,8 +47,12 @@ public class BusinessTimeUtils {
*/ */
public static Map<String, String> getBusinessTime(CommandType commandType, Date runTime) { public static Map<String, String> getBusinessTime(CommandType commandType, Date runTime) {
Date businessDate = runTime; Date businessDate = runTime;
Map<String, String> result = new HashMap<>();
switch (commandType) { switch (commandType) {
case COMPLEMENT_DATA: case COMPLEMENT_DATA:
if (runTime == null) {
return result;
}
break; break;
case START_PROCESS: case START_PROCESS:
case START_CURRENT_TASK_PROCESS: case START_CURRENT_TASK_PROCESS:
@ -66,7 +72,6 @@ public class BusinessTimeUtils {
break; break;
} }
Date businessCurrentDate = addDays(businessDate, 1); Date businessCurrentDate = addDays(businessDate, 1);
Map<String, String> result = new HashMap<>();
result.put(Constants.PARAMETER_CURRENT_DATE, format(businessCurrentDate, PARAMETER_FORMAT_DATE)); result.put(Constants.PARAMETER_CURRENT_DATE, format(businessCurrentDate, PARAMETER_FORMAT_DATE));
result.put(Constants.PARAMETER_BUSINESS_DATE, format(businessDate, PARAMETER_FORMAT_DATE)); result.put(Constants.PARAMETER_BUSINESS_DATE, format(businessDate, PARAMETER_FORMAT_DATE));
result.put(Constants.PARAMETER_DATETIME, format(businessCurrentDate, PARAMETER_FORMAT_TIME)); result.put(Constants.PARAMETER_DATETIME, format(businessCurrentDate, PARAMETER_FORMAT_TIME));

Loading…
Cancel
Save