From 13cf9137af55a60854a89c48c01dd0b841b98f8e Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Wed, 1 Feb 2023 09:53:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=A5=E5=8F=A3:/queryHuan?= =?UTF-8?q?gDao=20=E6=B7=BB=E5=8A=A0startTime=E5=92=8CendTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xkrs/controller/FirePointController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xkrs/controller/FirePointController.java b/src/main/java/com/xkrs/controller/FirePointController.java index cbcf1c2..a5114c4 100644 --- a/src/main/java/com/xkrs/controller/FirePointController.java +++ b/src/main/java/com/xkrs/controller/FirePointController.java @@ -81,12 +81,16 @@ public class FirePointController { return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointList, locale); } + /** + * 定制接口：查询黄岛区的火点 + */ @GetMapping("/queryHuangDao") - public String queryHuangDao(@RequestHeader(value = "Authorization") String token) { + public String queryHuangDao(@RequestHeader(value = "Authorization") String token, @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime, @RequestParam(value = "satelliteType", required = false) String satelliteType, @RequestParam(value = "landType", required = false) String landType) { if (TextUtils.isEmpty(token) || (!token.equals("Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxNTcyNjI0MDI1MSIsImlzcyI6Imh0dHBzOi8vd3d3Lm1pY3Jvc2VydmljZS5jb20iLCJhdWQiOiIxNTcyNjI0MDI1MSIsImF1dGhzIjoiYXV0aF9nZW5lcmFsX3VzZXIiLCJleHAiOjE2NzUyMzQzNjl9.iE9o6KblAgQP8Q0Vx7AJOV6BVYCOJrfpU886IZiARGdIVm77dx3l1UHM-bTMUlaVyG7-9BY0sOfCD3wHfLT3MA"))) { return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, "无效token", locale); } - List firePointList = firePointQueryHelper.queryFirePoint("370211", "2023-01-01 00:00:10", null, null, null); + String finalStartTime = TextUtils.isEmpty(startTime) ? "2023-01-01 00:00:10" : startTime; + List firePointList = firePointQueryHelper.queryFirePoint("370211", finalStartTime, endTime, satelliteType, landType); return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointList, locale); }