From 06b00a178d194d33370e44410c4f04a4164f86c7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Jun 2021 14:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java b/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
index dd7fc86..3da1027 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
@@ -46,6 +46,17 @@
return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
}
+ @RequestMapping(value = "getTimeSlot", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage getTimeSlot(HttpServletRequest request) {
+ Map<String,Object> parameters = WebUtils.getParametersStartingWith(request,null);
+ Map<String,Object> resultMap = deviceAdjustValueService.getTimeSlot(parameters);
+ if (!resultMap.containsKey("code")){
+ return ResultMessage.ok(resultMap);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
+ }
+
@RequestMapping(value = "updateOneDeviceAdjustValue", method = RequestMethod.POST)
@ResponseBody
public ResultMessage updateOneDeviceAdjustValue(@RequestBody Map<String, Object> parameters) {
@@ -58,4 +69,16 @@
return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
}
+ @RequestMapping(value = "deleteOneDeviceAdjustValue", method = RequestMethod.POST)
+ @ResponseBody
+ public ResultMessage deleteOneDeviceAdjustValue(@RequestBody Map<String, Object> parameters) {
+ Map<String,Object> resultMap = deviceAdjustValueService.deleteOne(parameters);
+ String msg = resultMap.get("msg").toString();
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
+ return ResultMessage.ok(msg);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
+ }
+
}
--
Gitblit v1.8.0