Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-22 8ad473d0e87886501a73cc408ebe7efbff25f373

 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);

   }



}