From dba72443e05e7b0a52ee85bfd9f4641aebc42c60 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 07 Dec 2017 08:58:09 +0800
Subject: [PATCH] app接口
---
src/main/java/com/moral/controller/ScreenController.java | 28 ++++------------------------
1 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index f752dc3..0da945c 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -26,15 +26,14 @@
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.exception.BusinessException;
-import com.moral.entity.Account;
+import com.moral.common.util.ValidateUtil;
import com.moral.service.AccountService;
import com.moral.service.DeviceService;
import com.moral.service.HistoryService;
/**
- * The Class ScreenController.
+ * The Class ScreenController.������������
*/
@RestController
@RequestMapping(value = "screen")
@@ -84,22 +83,6 @@
return resultMap;
}
- @GetMapping("login1")
- public ResultBean<Account> screenLogin1(HttpServletRequest request) {
- ResultBean<Account> resultBean = new ResultBean<Account>(ResultBean.FAIL);
- try {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
- resultBean.setMsg("������������������������������������");
- } else {
- resultBean = accountService.screenLogin1(parameters);
- }
- } catch (Exception e) {
- e.printStackTrace();
- resultBean = new ResultBean<Account>(e);
- }
- return resultBean;
- }
/**
* Gets the equipment states. ���������������������������������������
@@ -156,11 +139,8 @@
@GetMapping("sensor-standard")
public Map<String, Object> getStandardBySensor(@RequestParam("macKey") String macKey) {
Map<String, Object> result = new HashMap<String, Object>();
- if (isEmpty(macKey)) {
- throw new BusinessException("���������������������");
- } else {
- result.put("standard", getValue(macKey + "-standard"));
- }
+ ValidateUtil.notEmpty(macKey, "���������������������");
+ result.put("standard", getValue(macKey + "-standard"));
return result;
}
--
Gitblit v1.8.0