From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateDetailController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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..019bfa9 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
@@ -64,14 +64,14 @@
@ApiImplicitParam(name = "time2", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String")
})
public ResultMessage getInserts(@RequestBody Map<String,Object> params){
- if (!params.containsKey("coordinateId") || !params.containsKey("time1")|| !params.containsKey("time2")) {
+ if (!params.containsKey("coordinateId")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
Integer integer = manageCoordinateDetailService.batchAll(params);
if (integer!=200){
return ResultMessage.ok("������������");
}
- return ResultMessage.ok();
+ return ResultMessage.ok(integer);
}
/**
@@ -98,10 +98,22 @@
@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);
return ResultMessage.ok(rsMap);
}
+
+ @PostMapping("queryAll")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "mac", value = "mac���", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time1", value = "���������������2021-08-18", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time2", value = "���������������2021-08-18", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultMessage queryAll(@RequestBody Map<String,Object> params){
+ manageCoordinateDetailService.queryAll(params);
+ return ResultMessage.ok();
+ }
}
--
Gitblit v1.8.0