From f74ecba5f577a41ec3c8d678a18773c8d9748eb8 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 18 Dec 2017 08:44:52 +0800
Subject: [PATCH] 机器激活码 接口
---
src/main/java/com/moral/controller/MobileController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index ca4d05e..09b9c68 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -28,7 +28,7 @@
* The Class MobileController.
*/
@RestController
-@RequestMapping(value = "mobile")
+@RequestMapping("mobile")
@CrossOrigin(origins = "*", maxAge = 3600)
public class MobileController {
@@ -55,7 +55,7 @@
* @param password the password
* @return the result bean
*/
- @GetMapping(value = "accountlogin")
+ @GetMapping("accountlogin")
public ResultBean<OperateUser> mobileLogin(String username, String password) {
OperateUser operateUser = operateUserService.mobileLogin(username,password);
return new ResultBean<OperateUser>(operateUser);
@@ -69,7 +69,7 @@
* @param newpassword the newpassword
* @return the result bean
*/
- @GetMapping(value = "upPassword")
+ @GetMapping("upPassword")
public ResultBean<OperateUser> updatePassword(Integer uid, String password, String newpassword) {
OperateUser operateUser = operateUserService.updatePassword(uid,password,newpassword);
return new ResultBean<OperateUser>(operateUser);
@@ -81,7 +81,7 @@
* @param device the device
* @return the result bean
*/
- @GetMapping(value = "reportDevice")
+ @GetMapping("reportDevice")
public ResultBean<String> installDevice(Device device) {
deviceService.saveOrUpdateDevice(device);
return new ResultBean<String>("");
@@ -95,9 +95,10 @@
* @param pageSize the page size
* @return the install devices by operate user
*/
- @GetMapping(value = "myRelease")
- 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);
+ @GetMapping("myRelease")
+ 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);
}
@@ -107,7 +108,7 @@
* @param mac the mac
* @return the device by mac
*/
- @GetMapping(value = "getEquInfoByMac")
+ @GetMapping("getEquInfoByMac")
public ResultBean<Device> getDeviceByMac(@RequestParam(value="mac", required=true)String mac) {
Device device = deviceService.getDeviceByMac(mac);
return new ResultBean<Device>(device);
@@ -119,7 +120,7 @@
* @param areaName the area name
* @return the monitor points by area name
*/
- @GetMapping(value = "getMpointsByAreaName")
+ @GetMapping("getMpointsByAreaName")
public ResultBean<List<MonitorPoint>> getMonitorPointsByAreaName(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByAreaName(parameters);
@@ -132,7 +133,7 @@
* @param areaName the area name
* @return the organizations by area name
*/
- @GetMapping(value = "getOrgsByAreaName")
+ @GetMapping("getOrgsByAreaName")
public ResultBean<List<Organization>> getOrganizationsByAreaName(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
List<Organization> organizations = organizationService.getOrganizationsByAreaName(parameters);
--
Gitblit v1.8.0