Commit d3970aba authored by tianyiming's avatar tianyiming

refactor: 提交大屏综合统计查询接口

parent bee59c90
...@@ -34,6 +34,15 @@ public enum StatisticalAnalysisEnum { ...@@ -34,6 +34,15 @@ public enum StatisticalAnalysisEnum {
} }
} }
public static Map<String, String> getKey = new HashMap<>();
static {
for (StatisticalAnalysisEnum e : StatisticalAnalysisEnum.values()) {
getKey.put(e.code, e.key);
}
}
/** /**
* 根据code获取枚举实例(优化版) * 根据code获取枚举实例(优化版)
* @param code 枚举编码 * @param code 枚举编码
......
...@@ -189,11 +189,11 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController { ...@@ -189,11 +189,11 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
* @return inspectStatus * @return inspectStatus
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/dp/page") @PostMapping(value = "/dp/statistics")
@ApiOperation(httpMethod = "POST", value = "大屏综合统计查询接口", notes = "大屏综合统计查询接口") @ApiOperation(httpMethod = "POST", value = "大屏综合统计查询接口", notes = "大屏综合统计查询接口")
public ResponseModel<JSONObject> queryDpStatistics(@RequestBody Map<String, Object> map) { public ResponseModel<JSONObject> queryDpStatistics(@RequestBody Map<String, Object> map) {
JSONObject jsonObject = new JSONObject(map); JSONObject jsonObject = new JSONObject(map);
return ResponseHelper.buildResponse(statisticalAnalysisService.queryForPage(jsonObject)); return ResponseHelper.buildResponse(statisticalAnalysisService.queryDpStatistics(jsonObject));
} }
/** /**
......
...@@ -4,7 +4,7 @@ import org.elasticsearch.index.query.BoolQueryBuilder; ...@@ -4,7 +4,7 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryBuilders;
public class QueryBuilderUtils { public class QueryBuilderUtils {
// 复制BoolQueryBuilder
public static BoolQueryBuilder copyBoolQuery(BoolQueryBuilder original) { public static BoolQueryBuilder copyBoolQuery(BoolQueryBuilder original) {
if (original == null) { if (original == null) {
return QueryBuilders.boolQuery(); return QueryBuilders.boolQuery();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment