From b3a56423e65c33c2c2cc905cb5a0b6af6f1601e7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sun, 03 Sep 2023 13:18:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateDetailController.java | 65 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 24 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 d819dd2..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
@@ -2,6 +2,8 @@
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -9,6 +11,9 @@
import org.springframework.web.bind.annotation.RequestBody;
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;
import com.moral.api.entity.ManageCoordinateDetail;
@@ -29,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();
}
@@ -49,8 +57,21 @@
* @return
*/
@PostMapping("batch")
- public ResultMessage getInserts(){
- return null;
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "coordinateId", value = "������id", 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 getInserts(@RequestBody Map<String,Object> params){
+ if (!params.containsKey("coordinateId") || !params.containsKey("time1")|| !params.containsKey("time2")) {
+ 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();
}
/**
@@ -64,27 +85,23 @@
}
- /**
- * ������������������
- * @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")
- public ResultMessage selectAll(){
- return null;
+ @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"),
+ @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 selectAll(@RequestBody Map<String,Object> params){
+ 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);
}
}
--
Gitblit v1.8.0