bak 修改 获取版本数据前

kimi

2020-05-18 c8aee7b9bfd79cfd741d7e5692520f4f51a31a86

 src/main/java/com/highdatas/mdm/job/JobClient.java

@@ -12,16 +12,14 @@
import org.springframework.beans.factory.annotation.Value;

import org.springframework.boot.context.properties.ConfigurationProperties;

import org.springframework.http.*;

import org.springframework.http.client.SimpleClientHttpRequestFactory;

import org.springframework.http.converter.StringHttpMessageConverter;

import org.springframework.stereotype.Component;

import org.springframework.util.LinkedMultiValueMap;

import org.springframework.util.MultiValueMap;

import org.springframework.util.StringUtils;

import org.springframework.web.client.RestTemplate;



import java.nio.charset.StandardCharsets;

import java.util.HashMap;

import java.util.LinkedHashMap;

import java.util.Map;



@Slf4j

@@ -45,10 +43,10 @@
    }

    public  boolean login() {

        String url = this.url + prefix + "login";

        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

        params.set("userName","mdmadmin");

        params.set("password","datacvg123");

        params.set("ifRemember","false");

        Map<String, String> params = new LinkedHashMap<>();

        params.put("userName","mdmadmin");

        params.put("password","datacvg123");

        params.put("ifRemember","false");

        Map<String, Object> paramMap = new HashMap<>();

        paramMap.putAll(params);

        String urlParamsByMap = HttpUtils.getUrlParamsByMap(paramMap);

@@ -73,13 +71,43 @@
    public boolean saveJobGroup() {

        try {

            String url =  this.url + prefix + "xxlcustapi/saveJobGroup";

            MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

            params.set("appName","MDMApp");

            params.set("order", "1");

            params.set("title","数据汇集定时任务执行器");

            params.set("modelId","MDM");

            params.set("addressType","1");

            params.set("addressList",local);

            Map<String, String> params = new LinkedHashMap<>();

            params.put("appName","MDMApp");

            params.put("order", "1");

            params.put("title","数据汇集定时任务执行器");

            params.put("modelId","MDM");

            params.put("addressType","1");

            params.put("addressList",local);

            String s = null;

            Map<String, Object> paramMap = new HashMap<>();

            paramMap.putAll(params);

            String urlParamsByMap = HttpUtils.getUrlParamsByMap(paramMap);



            s = HttpRestClient(url, HttpMethod.POST, null, urlParamsByMap, MediaType.APPLICATION_JSON);



            JSONObject result = (JSONObject) JSON.parse(s);

            boolean success = parse(result);

            if (!success){

                log.error("请求saveJobGroup失败:" + result.getString("msg"));

            }

            return success;

        }catch (Exception e){

            e.printStackTrace();

            return false;

        }



    }



    public boolean saveAutoJobGroup() {

        try {

            String url =  this.url + prefix + "xxlcustapi/saveJobGroup";

            Map<String, String> params = new LinkedHashMap<>();

            params.put("appName","MDMApp");

            params.put("order", "1");

            params.put("title","数据汇集定时任务执行器");

            params.put("modelId","MDM");

            params.put("addressType","0");

//            params.put("addressList",local);

            String s = null;

            Map<String, Object> paramMap = new HashMap<>();

            paramMap.putAll(params);

@@ -103,8 +131,8 @@
    public boolean removeJobGroup() {

        try {

            String url =  this.url + prefix + "xxlcustapi/saveJobGroup";

            MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

            params.set("modelid","MDM");

            Map<String, String> params = new LinkedHashMap<>();

            params.put("modelid","MDM");

            Map<String, Object> paramMap = new HashMap<>();

            paramMap.putAll(params);

            String urlParamsByMap = HttpUtils.getUrlParamsByMap(paramMap);

@@ -127,21 +155,21 @@
        try {

            String jobId = createJobId(assemble.getId());

            String url =  this.url + prefix + "xxlcustapi/addJob";

            MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

            params.set("modelId","MDM");

            params.set("modelJobId", jobId);

            params.set("jobCron",assemble.getCron());

            params.set("author",assemble.getUserId());

            params.set("executorHandler","assembleJob");

            params.set("executorParam",assemble.getId());

            params.set("cronGen_display",assemble.getCron());

            params.set("executorBlockStrategy","DISCARD_LATER");

            params.set("executorTimeout","0");

            params.set("executorFailRetryCount","3");

            params.set("triggerStatus","1");

            params.set("glueType","BEAN");

            params.set("executorRouteStrategy","FIRST");

            params.set("jobDesc","创建汇集job");

            Map<String, String> params = new LinkedHashMap<>();

            params.put("modelId","MDM");

            params.put("modelJobId", jobId);

            params.put("jobCron",assemble.getCron());

            params.put("author",assemble.getUserId());

            params.put("executorHandler","assembleJob");

            params.put("executorParam",assemble.getId());

            params.put("cronGen_display",assemble.getCron());

            params.put("executorBlockStrategy","DISCARD_LATER");

            params.put("executorTimeout","0");

            params.put("executorFailRetryCount","0");

            params.put("triggerStatus","1");

            params.put("glueType","BEAN");

            params.put("executorRouteStrategy","FIRST");

            params.put("jobDesc","创建汇集job" + jobId);

            Map<String, Object> paramMap = new HashMap<>();

            paramMap.putAll(params);

            String urlParamsByMap = HttpUtils.getUrlParamsByMap(paramMap);

@@ -167,7 +195,7 @@
            id = DbUtils.getUUID();

        }

        try {

            String jobId  = "MDM-" + DbUtils.Bit16(id);

            String jobId  = "MDM-" + id;

            return jobId;

        } catch (Exception e) {

            e.printStackTrace();

@@ -177,22 +205,23 @@


    public boolean updateJob(SysAssemble assemble) {

        try {

            String jobId = createJobId(assemble.getId());

            String url =  this.url + prefix + "xxlcustapi/updateJob";

            MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

            params.set("modelId","MDM");

            params.set("modelJobId",assemble.getJobId());

            params.set("jobCron",assemble.getCron());

            params.set("author",assemble.getUserId());

            params.set("executorHandler","assembleJob");

            params.set("executorParam",assemble.getId());

            params.set("cronGen_display",assemble.getCron());

            params.set("executorBlockStrategy","DISCARD_LATER");

            params.set("executorTimeout","0");

            params.set("executorFailRetryCount","3");

            params.set("triggerStatus","1");

            params.set("glueType","BEAN");

            params.set("executorRouteStrategy","FIRST");

            params.set("jobDesc","更新汇集job");

            Map<String, String> params = new LinkedHashMap<>();

            params.put("modelId","MDM");

            params.put("modelJobId",assemble.getJobId());

            params.put("jobCron",assemble.getCron());

            params.put("author",assemble.getUserId());

            params.put("executorHandler","assembleJob");

            params.put("executorParam",assemble.getId());

            params.put("cronGen_display",assemble.getCron());

            params.put("executorBlockStrategy","DISCARD_LATER");

            params.put("executorTimeout","0");

            params.put("executorFailRetryCount","3");

            params.put("triggerStatus","1");

            params.put("glueType","BEAN");

            params.put("executorRouteStrategy","FIRST");

            params.put("jobDesc","更新汇集job" + jobId);

            Map<String, Object> paramMap = new HashMap<>();

            paramMap.putAll(params);

            String urlParamsByMap = HttpUtils.getUrlParamsByMap(paramMap);

@@ -215,9 +244,9 @@


        try {

            String url =  this.url + prefix + "xxlcustapi/removeJob";

            MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

            params.set("modelId","MDM");

            params.set("modelJobId", jobId);

            Map<String, String> params = new LinkedHashMap<>();

            params.put("modelId","MDM");

            params.put("modelJobId", jobId);



            Map<String, Object> paramMap = new HashMap<>();

            paramMap.putAll(params);

@@ -243,9 +272,9 @@
        }

        try {

            String url =  this.url + prefix + "xxlcustapi/queryJobLogById";

            MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

            params.set("modelId","MDM");

            params.set("modelJobId", assemble.getJobId());

            Map<String, String> params = new LinkedHashMap<>();

            params.put("modelId","MDM");

            params.put("modelJobId", assemble.getJobId());



            Map<String, Object> paramMap = new HashMap<>();

            paramMap.putAll(params);

@@ -271,10 +300,10 @@
        }

        try {

            String url =  this.url + prefix + "xxlcustapi/trigger";

            MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

            params.set("modelId","MDM");

            params.set("modelJobId", assemble.getJobId());

            params.set("executorParam", assemble.getId());

            Map<String, String> params = new LinkedHashMap<>();

            params.put("modelId","MDM");

            params.put("modelJobId", assemble.getJobId());

            params.put("executorParam", assemble.getId());



            Map<String, Object> paramMap = new HashMap<>();

            paramMap.putAll(params);

@@ -295,7 +324,7 @@
    }





    private  String     HttpRestClient(String url, HttpMethod method, MultiValueMap<String, String> formParams, String getParams,  MediaType mediaType) {

    private  String     HttpRestClient(String url, HttpMethod method, Map<String, String> formParams, String getParams,  MediaType mediaType) {

        if (!StringUtils.isEmpty(getParams)) {

            url = url + Constant.QUESTION + getParams;

        }

@@ -308,7 +337,7 @@
            headers.setContentType(mediaType);

        }



        HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<MultiValueMap<String, String>>(formParams, headers);

        HttpEntity<Map<String, String>> requestEntity = new HttpEntity<Map<String, String>>(formParams, headers);

        //  执行HTTP请求

        ResponseEntity<String> response = client.exchange(url, method, requestEntity, String.class);