Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

svr/svr-quota/src/main/java/com/yihu/jw/quota/etl/util/ElasticsearchUtil.java

@@ -114,6 +114,9 @@ public class ElasticsearchUtil {
            dealSorter = SortBuilders.fieldSort("_id").order(SortOrder.DESC);
        }
        SearchRequest searchRequest = new SearchRequest(index);
        SearchSourceBuilder builder = new SearchSourceBuilder();
        builder.sort(dealSorter);
        searchRequest.source(builder);
        actionGet = restHighLevelClient.search(searchRequest,RequestOptions.DEFAULT);
        SearchHits hits = actionGet.getHits();
        List<Map<String, Object>> matchRsult = new LinkedList<Map<String, Object>>();

svr/svr-quota/src/main/java/com/yihu/jw/quota/service/job/JobService.java

@@ -47,7 +47,7 @@ public class JobService {
            params.put("startTime", startDate);
            params.put("endTime", endDate);
            String quotaCode = quotaVo.getCode().replace("_", "");
            String quotaCodeImmediately = quotaCode + "immediately1";
            String quotaCodeImmediately = quotaCode + "immediately2";
            boolean existJob = quartzHelper.isExistJob(quotaCode);
            boolean existJobImmediately = quartzHelper.isExistJob(quotaCodeImmediately);
            if (existJob && "0".equals(quotaVo.getJobStatus())) {
@@ -88,7 +88,7 @@ public class JobService {
            QuotaVo quotaVo = new QuotaVo();
            BeanUtils.copyProperties(tjQuota, quotaVo);
            String quotaCode = quotaVo.getCode().replace("_", "");
            String quotaCodeImmediately = quotaCode + "immediately";
            String quotaCodeImmediately = quotaCode + "immediately2";
            boolean existJob = quartzHelper.isExistJob(quotaCode);
            boolean existJobImmediately = quartzHelper.isExistJob(quotaCodeImmediately);
            if (existJob) {