From d56ba0ec51cf2b0afa00bbf6ddb0c02ac16393fa Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Mon, 26 Aug 2024 11:16:55 +0800
Subject: [PATCH] fix:分页查询设备接口修改提交
---
screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateDetailController.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 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 4d33cd0..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
@@ -43,8 +43,11 @@
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
Integer integer = manageCoordinateDetailService.insertCoordinate(params);
- if (integer==null){
+ if (integer==1){
return ResultMessage.ok("������������������");
+ }
+ if (integer==2){
+ return ResultMessage.ok("������������������");
}
return ResultMessage.ok();
}
@@ -61,11 +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());
}
-
- return null;
+ Integer integer = manageCoordinateDetailService.batchAll(params);
+ if (integer!=200){
+ return ResultMessage.ok("������������");
+ }
+ return ResultMessage.ok(integer);
}
/**
@@ -78,20 +84,6 @@
return null;
}
-
- /**
- * ������������������
- * @param id
- * @return
- */
- @GetMapping("delete")
- public ResultMessage delete(Integer id){
- if (id==null){
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- }
- manageCoordinateDetailService.deleteCoordinate(id);
- return ResultMessage.ok();
- }
/**
@@ -106,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