From 0e8110030b0eb4e8be3d1504554d56217e64d236 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 04 Jan 2018 16:25:57 +0800
Subject: [PATCH] 组织模块

---
 src/main/java/com/moral/controller/MobileController.java |   64 ++++++++++++++++++--------------
 1 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index 6fa4dec..1f4e182 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -1,15 +1,20 @@
 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.moral.common.bean.ResultBean;
+import com.moral.common.bean.AppData;
 import com.moral.entity.Device;
 import com.moral.entity.MonitorPoint;
 import com.moral.entity.OperateUser;
@@ -23,7 +28,7 @@
  * The Class MobileController.
  */
 @RestController
-@RequestMapping(value = "mobile")
+@RequestMapping("mobile")
 @CrossOrigin(origins = "*", maxAge = 3600)
 public class MobileController {
 
@@ -50,10 +55,10 @@
 	 * @param password the password
 	 * @return the result bean
 	 */
-	@GetMapping(value = "accountlogin")
-	public ResultBean<OperateUser> mobileLogin(String username, String password) {
+	@GetMapping("accountlogin")
+	public AppData<OperateUser> mobileLogin(String username, String password) {
 		OperateUser operateUser = operateUserService.mobileLogin(username,password);
-		return new ResultBean<OperateUser>(operateUser); 
+		return new AppData<OperateUser>(operateUser); 
 	}
 	
 	/**
@@ -64,10 +69,10 @@
 	 * @param newpassword the newpassword
 	 * @return the result bean
 	 */
-	@GetMapping(value = "upPassword")
-	public ResultBean<OperateUser> updatePassword(Integer uid, String password, String newpassword) {
+	@GetMapping("upPassword")
+	public AppData<OperateUser> updatePassword(Integer uid, String password, String newpassword) {
 		OperateUser operateUser = operateUserService.updatePassword(uid,password,newpassword);
-		return new ResultBean<OperateUser>(operateUser); 
+		return new AppData<OperateUser>(operateUser); 
 	}
 
 	/**
@@ -76,10 +81,10 @@
 	 * @param device the device
 	 * @return the result bean
 	 */
-	@GetMapping(value = "reportDevice")
-	public ResultBean<String> installDevice(Device device) {
+	@GetMapping("reportDevice")
+	public AppData<String> installDevice(Device device) {
 		deviceService.saveOrUpdateDevice(device);
-		return new ResultBean<String>("");
+		return new AppData<String>("");
 	}
 
 	/**
@@ -90,10 +95,11 @@
 	 * @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) {
-		List<Device> devices = deviceService.getInstallDevicesByOperateUser(uid,pageIndex,pageSize);
-		return new ResultBean<List<Device>>(devices);
+	@GetMapping("myRelease")
+	public AppData<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 AppData<List<Device>>(devices);
 	}
 
 	/**
@@ -102,33 +108,35 @@
 	 * @param mac the mac
 	 * @return the device by mac
 	 */
-	@GetMapping(value = "getEquInfoByMac")
-	public ResultBean<Device> getDeviceByMac(String mac) {
+	@GetMapping("getEquInfoByMac")
+	public AppData<Device> getDeviceByMac(@RequestParam(value="mac", required=true)String mac) {
 		Device device = deviceService.getDeviceByMac(mac);
-		return new ResultBean<Device>(device);
+		return new AppData<Device>(device);
 	}
 
 	/**
 	 * Gets the monitor points by area name.
 	 *
-	 * @param areaName the area name
+	 * @param request the area name
 	 * @return the monitor points by area name
 	 */
-	@GetMapping(value = "getMpointsByAreaName")
-	public ResultBean<List<MonitorPoint>> getMonitorPointsByAreaName(String areaName) {
-		List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByAreaName(areaName);
-		return new ResultBean<List<MonitorPoint>>(monitorPoints);
+	@GetMapping("getMpointsByAreaName")
+	public AppData<List<MonitorPoint>> getMonitorPointsByAreaName(HttpServletRequest request) {
+		Map<String, Object> parameters = getParametersStartingWith(request, null);
+		List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByAreaName(parameters);
+		return new AppData<List<MonitorPoint>>(monitorPoints);
 	}
 
 	/**
 	 * Gets the organizations by area name.
 	 *
-	 * @param areaName the area name
+	 * @param request the area name
 	 * @return the organizations by area name
 	 */
-	@GetMapping(value = "getOrgsByAreaName")
-	public ResultBean<List<Organization>> getOrganizationsByAreaName(String areaName) {
-		List<Organization> organizations = organizationService.getOrganizationsByAreaName(areaName);
-		return new ResultBean<List<Organization>>(organizations);
+	@GetMapping("getOrgsByAreaName")
+	public AppData<List<Organization>> getOrganizationsByAreaName(HttpServletRequest request) {
+		Map<String, Object> parameters = getParametersStartingWith(request, null);
+		List<Organization> organizations = organizationService.getOrganizationsByAreaName(parameters);
+		return new AppData<List<Organization>>(organizations);
 	}
 }

--
Gitblit v1.8.0