From c0d555bcd9ff0e8fa35e5a8636bc4c05743dc1e9 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 14 Jun 2024 11:36:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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..e601fe8 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>
@@ -107,4 +108,10 @@
SgDeviceDO sgDeviceDO = sgDeviceService.getById(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