From 60163c2fb5098fc522f8e80b131128d2c9a33e42 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Fri, 26 Jan 2018 14:44:05 +0800 Subject: [PATCH] 组织配置 --- src/main/java/com/moral/controller/ScreenController.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index f101ce2..ad5b59f 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -26,6 +26,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONReader; import com.alibaba.fastjson.TypeReference; +import com.moral.common.bean.ResultBean; import com.moral.common.util.ValidateUtil; import com.moral.service.AccountService; import com.moral.service.DeviceService; @@ -196,14 +197,16 @@ } @GetMapping("check-activate") - public Map<String, Object> checkActivate(String macCpuCode) { - return machineActivateService.checkActivate(macCpuCode); + public ResultBean<Integer> checkActivate(String macCpuCode) { + Integer result = machineActivateService.checkActivate(macCpuCode); + return new ResultBean<Integer>(result); } @PostMapping("activate-machine") - public Map<String, Object> activateMachine(HttpServletRequest request) { + public ResultBean<Integer> activateMachine(HttpServletRequest request) { Map<String, Object> parameters = getParametersStartingWith(request, null); - return machineActivateService.activateMachine(parameters); + Integer result = machineActivateService.activateMachine(parameters); + return new ResultBean<Integer>(result); } } -- Gitblit v1.8.0