From 87edfeea2b218924a9a4b37912fcdaf180cc9150 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 08 May 2018 13:25:09 +0800
Subject: [PATCH] test
---
src/main/java/com/moral/controller/MobileController.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index 9bc8e52..dec5579 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -10,6 +10,8 @@
import javax.servlet.http.HttpServletRequest;
import com.moral.common.util.Crypto;
+import com.moral.entity.*;
+import com.moral.service.*;
import com.moral.util.MessageUtils;
import com.taobao.api.ApiException;
import org.apache.commons.lang3.StringUtils;
@@ -17,14 +19,6 @@
import org.springframework.web.bind.annotation.*;
import com.moral.common.bean.AppData;
-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.
@@ -50,6 +44,9 @@
@Resource
private MonitorPointService monitorPointService;
+ @Resource
+ private ProfessionService professionService;
+
/**
* Mobile login.������
*
@@ -57,7 +54,7 @@
* @param password the password
* @return the result bean
*/
- @PostMapping("accountlogin")
+ @RequestMapping("accountlogin")
public AppData<OperateUser> mobileLogin(String username, String password) {
OperateUser operateUser = operateUserService.mobileLogin(username,password);
return new AppData<OperateUser>(operateUser);
@@ -259,4 +256,11 @@
return apiData;
}
}
+
+ @GetMapping("profession")
+ public AppData<List<Profession>> profession(){
+
+ List<Profession> professions = professionService.getProfessiontList();
+ return new AppData<List<Profession>>(professions);
+ }
}
--
Gitblit v1.8.0