From ea75e686ed771fa377f688d9eaf8027740265aa1 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Aug 2023 15:58:18 +0800
Subject: [PATCH] chore:测试提交
---
screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateDetailController.java | 44 ++++++++++++++++++--------------------------
1 files changed, 18 insertions(+), 26 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 97ed93a..dcd38d9 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
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -33,17 +34,20 @@
/**
* ������������������
- * @param manageCoordinateDetail
+ * @param
* @return
*/
@PostMapping("insert")
- public ResultMessage insert(@RequestBody ManageCoordinateDetail manageCoordinateDetail){
- if (ObjectUtils.isEmpty(manageCoordinateDetail)){
+ public ResultMessage insert(@RequestBody Map<String,Object> params){
+ if (ObjectUtils.isEmpty(params)){
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- Integer integer = manageCoordinateDetailService.insertCoordinate(manageCoordinateDetail);
- if (integer==null){
+ Integer integer = manageCoordinateDetailService.insertCoordinate(params);
+ if (integer==1){
return ResultMessage.ok("������������������");
+ }
+ if (integer==2){
+ return ResultMessage.ok("������������������");
}
return ResultMessage.ok();
}
@@ -63,9 +67,11 @@
if (!params.containsKey("coordinateId") || !params.containsKey("time1")|| !params.containsKey("time2")) {
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();
}
/**
@@ -79,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"),
@@ -106,10 +98,10 @@
@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);
}
}
--
Gitblit v1.8.0