Merge branch 'dev' of liubing/wlyy2.0 into dev

business/es-service/src/main/java/com/yihu/jw/es/util/ElasticsearchUtil.java

@@ -2693,4 +2693,8 @@ public class ElasticsearchUtil {
        return excute(sql.toString(), SaveModel.class, "", "");
    }
    public List searchBySql(String sql){
        return excute(sql, SaveModel.class, "", "");
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/statistics/OpenStatisticsEndpoint.java

@@ -232,4 +232,14 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping("searchBySql")
    @ApiOperation(value = "ES查询")
    public ListEnvelop searchBySql(
            @RequestParam(required = true) String sql) {
        try {
            return ListEnvelop.getSuccess("查询成功",statisticsService.searchBySql(sql));
        } catch (Exception e) {
            return failedListEnvelopException2(e);
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -1071,6 +1071,8 @@ public class StatisticsService {
            List<SaveModel> saveModelAdds = elasticsearchUtil.findDateQuotaLevelList(start,endDate, area,level, "46", SaveModel.timeLevel_ZL, "3",null,null,null);
            for (SaveModel saveModelTmp:saveModelAdds){
                JSONObject json = new JSONObject();
                SaveModel saveMode2 = elasticsearchUtil.findOneDateQuotaLevels(endDate,endDate, area,level, "46", SaveModel.timeLevel_DDL, "3",null,null,saveModelTmp.getSlaveKey3());
                json.put("total",saveMode2.getResult2().longValue());
                json.put("num",saveModelTmp.getResult2().longValue());
                json.put("code",saveModelTmp.getSlaveKey3());
                json.put("name",saveModelTmp.getSlaveKey3Name());
@@ -1296,4 +1298,11 @@ public class StatisticsService {
        }
        return DateUtil.dateToStrShort(cal.getTime());
    }
    public List searchBySql(String sql){
        if (sql.startsWith("select")||sql.startsWith("SELECT")){
            return elasticsearchUtil.searchBySql(sql);
        }
        return null;
    }
}