From 59d80f82ef195f03b714fa0e9aec5d21d119c335 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 11 Dec 2017 14:37:30 +0800
Subject: [PATCH] 接口 增加校验

---
 src/main/java/com/moral/controller/MobileController.java |   92 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index d178bc7..ca4d05e 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -1,71 +1,141 @@
 package com.moral.controller;
 
+import static com.moral.common.util.WebUtils.getParametersStartingWith;
+
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 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.github.pagehelper.PageHelper;
-import com.moral.common.bean.PageBean;
 import com.moral.common.bean.ResultBean;
 import com.moral.entity.Device;
+import com.moral.entity.MonitorPoint;
 import com.moral.entity.OperateUser;
+import com.moral.entity.Organization;
 import com.moral.service.DeviceService;
+import com.moral.service.MonitorPointService;
 import com.moral.service.OperateUserService;
+import com.moral.service.OrganizationService;
 
+/**
+ * The Class MobileController.
+ */
 @RestController
 @RequestMapping(value = "mobile")
 @CrossOrigin(origins = "*", maxAge = 3600)
 public class MobileController {
 
+	/** The operate user service. */
 	@Resource
 	private OperateUserService operateUserService;
 
+	/** The device service. */
 	@Resource
 	private DeviceService deviceService;
 
-	// 1������
+	/** The organization service. */
+	@Resource
+	private OrganizationService organizationService;
+
+	/** The monitor point service. */
+	@Resource
+	private MonitorPointService monitorPointService;
+
+	/**
+	 * Mobile login.������
+	 *
+	 * @param username the username
+	 * @param password the password
+	 * @return the result bean
+	 */
 	@GetMapping(value = "accountlogin")
 	public ResultBean<OperateUser> mobileLogin(String username, String password) {
 		OperateUser operateUser = operateUserService.mobileLogin(username,password);
 		return new ResultBean<OperateUser>(operateUser); 
 	}
 	
-	// 4������������
+	/**
+	 * Update password.������������
+	 *
+	 * @param uid the uid
+	 * @param password the password
+	 * @param newpassword the newpassword
+	 * @return the result bean
+	 */
 	@GetMapping(value = "upPassword")
 	public ResultBean<OperateUser> updatePassword(Integer uid, String password, String newpassword) {
 		OperateUser operateUser = operateUserService.updatePassword(uid,password,newpassword);
 		return new ResultBean<OperateUser>(operateUser); 
 	}
 
-	// 11������������
+	/**
+	 * Install device.������������
+	 *
+	 * @param device the device
+	 * @return the result bean
+	 */
 	@GetMapping(value = "reportDevice")
 	public ResultBean<String> installDevice(Device device) {
 		deviceService.saveOrUpdateDevice(device);
 		return new ResultBean<String>("");
 	}
 
-	// 5������������������(������)
+	/**
+	 * Gets the install devices by operate user.������������
+	 *
+	 * @param uid the uid
+	 * @param pageIndex the page index
+	 * @param pageSize the page size
+	 * @return the install devices by operate user
+	 */
 	@GetMapping(value = "myRelease")
-	public ResultBean<List<Device>> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize) {
+	public ResultBean<List<Device>> getInstallDevicesByOperateUser(@RequestParam(value="uid", required=true)Integer uid, @RequestParam(defaultValue="0")Integer pageIndex, @RequestParam(defaultValue="0")Integer pageSize) {
 		List<Device> devices = deviceService.getInstallDevicesByOperateUser(uid,pageIndex,pageSize);
 		return new ResultBean<List<Device>>(devices);
 	}
 
+	/**
+	 * Gets the device by mac.
+	 *
+	 * @param mac the mac
+	 * @return the device by mac
+	 */
 	@GetMapping(value = "getEquInfoByMac")
-	public void getEquInfoByMac(String mac) {
+	public ResultBean<Device> getDeviceByMac(@RequestParam(value="mac", required=true)String mac) {
+		Device device = deviceService.getDeviceByMac(mac);
+		return new ResultBean<Device>(device);
 	}
 
+	/**
+	 * Gets the monitor points by area name.
+	 *
+	 * @param areaName the area name
+	 * @return the monitor points by area name
+	 */
 	@GetMapping(value = "getMpointsByAreaName")
-	public void getMpointsByAreaName(String areaName) {
+	public ResultBean<List<MonitorPoint>> getMonitorPointsByAreaName(HttpServletRequest request) {
+		Map<String, Object> parameters = getParametersStartingWith(request, null);
+		List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByAreaName(parameters);
+		return new ResultBean<List<MonitorPoint>>(monitorPoints);
 	}
 
+	/**
+	 * Gets the organizations by area name.
+	 *
+	 * @param areaName the area name
+	 * @return the organizations by area name
+	 */
 	@GetMapping(value = "getOrgsByAreaName")
-	public void getOrgsByAreaName(String areaName) {
-
+	public ResultBean<List<Organization>> getOrganizationsByAreaName(HttpServletRequest request) {
+		Map<String, Object> parameters = getParametersStartingWith(request, null);
+		List<Organization> organizations = organizationService.getOrganizationsByAreaName(parameters);
+		return new ResultBean<List<Organization>>(organizations);
 	}
 }

--
Gitblit v1.8.0