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/MonitorPointController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java b/screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java
index 9fbaa7f..afb30a5 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java
@@ -42,10 +42,10 @@
//return null;
}
- @RequestMapping(value = "updateSensor", method = RequestMethod.POST)
+ @RequestMapping(value = "updateMonitorPoint", method = RequestMethod.POST)
@ResponseBody
- public ResultMessage updateSensor(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
- Map<String,Object> resultMap = sensorService.updateSensor(parameters);
+ public ResultMessage updateMonitorPoint(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
+ Map<String,Object> resultMap = monitorPointService.updateMonitorPoint(parameters);
String msg = resultMap.get("msg").toString();
int code = Integer.parseInt(resultMap.get("code").toString());
if (code == 0){
@@ -65,13 +65,13 @@
return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
}
- @RequestMapping(value = "deleteSensor", method = RequestMethod.POST)
+ @RequestMapping(value = "deleteMonitorPoint", method = RequestMethod.POST)
@ResponseBody
- public ResultMessage deleteSensor(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
+ public ResultMessage deleteMonitorPoint(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
if (!parameters.containsKey("id")){
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- Map<String,Object> resultMap = sensorService.deleteSensor(parameters);
+ Map<String,Object> resultMap = monitorPointService.deleteMonitorPoint(parameters);
String msg = resultMap.get("msg").toString();
int code = Integer.parseInt(resultMap.get("code").toString());
if (code == 0){
@@ -79,4 +79,15 @@
}
return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
}
+
+ @RequestMapping(value = "getMonitorPointByFuzzy", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage getMonitorPointByFuzzy(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Map<String,Object> resultMap = monitorPointService.getMonitorPointByFuzzy(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