From 4b4a35fc7cc56a8b304ca35f0a9ec0bdd2e0e036 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 22 Apr 2024 11:41:48 +0800
Subject: [PATCH] fix:路径规划补充提交
---
screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateDetailController.java | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 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 407774b..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,12 +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);
}
/**
@@ -80,26 +85,12 @@
}
- /**
- * ������������������
- * @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();
- }
-
/**
* ���������������
* @return
*/
- @GetMapping("select")
+ @PostMapping("select")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
@ApiImplicitParam(name = "coordinateId", value = "������id", required = true, paramType = "query", dataType = "String"),
@@ -107,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> map = manageCoordinateDetailService.selectCoordinate(params);
- return null;
+ 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