From cf42a18aba4da77141dd0ea65918444636f899e1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 07 Dec 2020 10:50:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/SensorController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/SensorController.java b/src/main/java/com/moral/controller/SensorController.java
index 3e6a47c..dd004ca 100644
--- a/src/main/java/com/moral/controller/SensorController.java
+++ b/src/main/java/com/moral/controller/SensorController.java
@@ -56,6 +56,12 @@
return new ResultBean<List<Sensor>>(sensors);
}
+ @GetMapping("allById")
+ public ResultBean<List<Map<String, Object>>> getAllSensorsById() {
+ List<Map<String, Object>> sensors = sensorService.getSensorByDId("1230");
+ return new ResultBean<List<Map<String, Object>>>(sensors);
+ }
+
@GetMapping("getSenosrsByOrgId")
public ResultBean<List<Sensor>> getSenosrsByOrgId(Integer organizationId, String regionCode) {
Map<String, Object> parameters = new HashMap<>();
--
Gitblit v1.8.0