From d6a0ac523af2db9216d30fabf1063c095c5b41e1 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 06 Jul 2018 15:52:39 +0800
Subject: [PATCH] app接口

---
 src/main/java/com/moral/controller/MobileController.java |   91 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index b9f1174..7319f8a 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -9,17 +9,38 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.moral.common.util.Crypto;
-import com.moral.entity.*;
-import com.moral.entity.adapter.EquDeviceAdapter;
-import com.moral.service.*;
-import com.moral.util.MessageUtils;
-import com.taobao.api.ApiException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.cglib.beans.BeanMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.moral.common.bean.AppData;
+import com.moral.common.bean.ResultBean;
+import com.moral.common.util.Crypto;
+import com.moral.entity.Account;
+import com.moral.entity.Device;
+import com.moral.entity.MonitorPoint;
+import com.moral.entity.OperateUser;
+import com.moral.entity.Organization;
+import com.moral.entity.Profession;
+import com.moral.entity.adapter.EquDeviceAdapter;
+import com.moral.service.AccountService;
+import com.moral.service.DeviceService;
+import com.moral.service.HistoryService;
+import com.moral.service.MonitorPointService;
+import com.moral.service.OperateUserService;
+import com.moral.service.OrganizationService;
+import com.moral.service.ProfessionService;
+import com.moral.util.MessageUtils;
+import com.taobao.api.ApiException;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * The Class MobileController.
@@ -27,6 +48,7 @@
 @RestController
 @RequestMapping("mobile")
 @CrossOrigin(origins = "*", maxAge = 3600)
+@Api(tags = "Mobile", description = "APP������") 
 public class MobileController {
 
 	/** The operate user service. */
@@ -47,6 +69,12 @@
 
 	@Resource
 	private ProfessionService professionService;
+
+	@Resource
+	private AccountService accountService;
+
+	@Resource
+	private HistoryService historyService;
 
 	/**
 	 * Mobile login.������
@@ -250,4 +278,53 @@
 		List<Profession> professions = professionService.getProfessiontList();
 		return new AppData<List<Profession>>(professions);
 	}
+
+	@GetMapping("login")
+	@ApiOperation(value = "������������������", notes = "������������������")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "account", value = "������", required = true, paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "password", value = "������", required = true, paramType = "query", dataType = "String")
+	})
+	public ResultBean<Account> companyLogin(HttpServletRequest request){
+		Map<String, Object> parameters = getParametersStartingWith(request, null);
+		Account account = accountService.companyLogin(parameters);
+		return new ResultBean<Account>(account);
+	}
+
+	@GetMapping("devices")
+	@ApiOperation(value = "������������������")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "organizationId", value = "������Id", required = true, paramType = "query", dataType = "String"),
+	})
+	public ResultBean<List<Device>> getDevicesByOrganizationId(HttpServletRequest request){
+		Map<String, Object> parameters = getParametersStartingWith(request, null);
+		List<Device> devices = deviceService.getDevicesByOrganizationId(parameters);
+		return new ResultBean<List<Device>>(devices);
+	}
+
+	@GetMapping("sensors")
+	@ApiOperation(value = "���������������������������")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "deviceVersionId", value = "������������Id", required = true, paramType = "query", dataType = "Integer"),
+			@ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "deviceId", value = "������id", required = true, paramType = "query", dataType = "Integer"),
+	})
+	public ResultBean<List<Map<String, Object>>> getSensorsDataByDevice(HttpServletRequest request){
+		Map<String, Object> parameters = getParametersStartingWith(request, null);
+		List<Map<String, Object>> sensors = historyService.getSensorsDataByDevice(parameters);
+		return new ResultBean<List<Map<String, Object>>>(sensors);
+	}
+
+	@GetMapping("sensor")
+	@ApiOperation(value = "���������������������������")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "size", value = "������������������", required = true, paramType = "query", dataType = "Integer"),
+	})
+	public ResultBean<List<Map<String, Object>>> getSensorDataBySensorKey(HttpServletRequest request){
+		Map<String, Object> parameters = getParametersStartingWith(request, null);
+		List<Map<String, Object>> sensors = historyService.getSensorDataBySensorKey(parameters);
+		return new ResultBean<List<Map<String, Object>>>(sensors);
+	}
 }

--
Gitblit v1.8.0