From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/StBdDataController.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/StBdDataController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/StBdDataController.java
index ee2d617..ea6bf05 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/StBdDataController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/StBdDataController.java
@@ -2,19 +2,17 @@
import cn.gistack.sm.sjztmd.entity.StBdData;
import cn.gistack.sm.sjztmd.service.IStBdDataService;
+import cn.gistack.sm.sjztmd.vo.StBdDataVO;
+import cn.gistack.sm.sjztmd.vo.StBdVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@Slf4j
@Api(tags = "北斗平台监测数据")
@@ -33,18 +31,18 @@
*/
@ApiOperation(value="分页查询北斗平台监测数据", notes="分页查询北斗平台监测数据")
@GetMapping("/list")
- public R<IPage<StBdData>> list(StBdData stBdData, Query query) throws Exception {
- IPage<StBdData> pageList = stBdDataService.page(Condition.getPage(query), Condition.getQueryWrapper(stBdData));
+ public R<IPage<StBdData>> list(StBdVO stBdData, Query query) throws Exception {
+ IPage<StBdData> pageList = stBdDataService.selectAlarmRecordPage( query, stBdData);
return R.data(pageList);
}
/**
* 批量插入北斗平台监测数据
- * @param stBdDataStr 北斗平台监测数据
+ * @param stBdDataVO 北斗平台监测数据
* @return 插入结果
*/
@PostMapping("/insert")
- public R<Boolean> insert(String stBdDataStr){
- return R.status(stBdDataService.insertData(stBdDataStr));
+ public R<Boolean> insert(@RequestBody StBdDataVO stBdDataVO) throws Exception {
+ return R.status(stBdDataService.insertData(stBdDataVO)) ;
}
}
--
Gitblit v1.9.3