From d666793c93e91026e129f00bae414217690635ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 27 May 2021 13:20:34 +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 574b980..eca08c3 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
@@ -86,4 +86,15 @@
}
return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
}
+
+ @RequestMapping(value = "getSensorByFuzzy", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage getSensorByFuzzy(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Map<String,Object> resultMap = sensorService.getSensorByFuzzy(parameters);
+ if (!resultMap.containsKey("code")){
+ return ResultMessage.ok(resultMap);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
+ }
}
--
Gitblit v1.8.0