From 54b040d85ec19336d076956f1a416363e471d5ca Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Fri, 14 Jun 2024 18:00:50 +0800
Subject: [PATCH] 设备分页问题

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java
index 0df9160..3367d4f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java
@@ -15,6 +15,7 @@
 
 import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -101,10 +102,16 @@
 	 * @param id
 	 * @return
 	 */
-	@ApiOperation(value="巡查记录-通过id查询", notes="子设备-通过id查询")
+	@ApiOperation(value="子设备-通过id查询", notes="子设备-通过id查询")
 	@GetMapping(value = "/queryById")
 	public R queryById(@RequestParam(name="id",required=true) String id) {
-		SgDeviceDO sgDeviceDO = sgDeviceService.getById(id);
+		SgDeviceDO sgDeviceDO = sgDeviceService.getSgDeviceById(id);
 		return R.data(sgDeviceDO);
 	}
+
+	@GetMapping(value = "/getDeviceList")
+	public R queryPageList(@RequestParam(name="programId",required=true) String programId) {
+		List<SgDeviceDO> page = sgDeviceService.getDeviceList(programId);
+		return R.data(page);
+	}
 }

--
Gitblit v1.9.3