From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/controller/SensorController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/SensorController.java b/screen-manage/src/main/java/com/moral/api/controller/SensorController.java
index eca08c3..605a065 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/SensorController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/SensorController.java
@@ -72,6 +72,17 @@
return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
}
+ @RequestMapping(value = "getAllSensorWithoutPage", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage getAllSensorWithoutPage(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Map<String,Object> resultMap = sensorService.getAllSensorWithoutPage();
+ if (!resultMap.containsKey("code")){
+ return ResultMessage.ok(resultMap);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
+ }
+
@RequestMapping(value = "deleteSensor", method = RequestMethod.POST)
@ResponseBody
public ResultMessage deleteSensor(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
--
Gitblit v1.8.0