From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Thu, 14 Dec 2023 15:38:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa --- screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateDetailController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateDetailController.java b/screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateDetailController.java index 972f489..38955aa 100644 --- a/screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateDetailController.java +++ b/screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateDetailController.java @@ -71,7 +71,7 @@ if (integer!=200){ return ResultMessage.ok("������������"); } - return ResultMessage.ok(); + return ResultMessage.ok(integer); } /** @@ -98,7 +98,7 @@ @ApiImplicitParam(name = "time2", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String") }) public ResultMessage selectAll(@RequestBody Map<String,Object> params){ - if (!params.containsKey("coordinateId") || !params.containsKey("time1")|| !params.containsKey("time2")) { + if (!params.containsKey("coordinateId") || !params.containsKey("time1")|| !params.containsKey("time2")|| !params.containsKey("mac")) { return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); } Map<String,Object> rsMap = manageCoordinateDetailService.selectCoordinate(params); -- Gitblit v1.8.0