From 55b227d4bc75374bca89f413750d236669571a70 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Jun 2018 09:28:29 +0800
Subject: [PATCH] 大屏布局
---
src/main/java/com/moral/controller/MobileController.java | 79 +++++++++++++++++++++++++--------------
1 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index 47007b4..b9f1174 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -2,6 +2,7 @@
import static com.moral.common.util.WebUtils.getParametersStartingWith;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -9,20 +10,16 @@
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 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.
@@ -48,6 +45,9 @@
@Resource
private MonitorPointService monitorPointService;
+ @Resource
+ private ProfessionService professionService;
+
/**
* Mobile login.������
*
@@ -55,7 +55,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);
@@ -69,21 +69,27 @@
* @param newpassword the newpassword
* @return the result bean
*/
- @PostMapping("upPassword")
+ @RequestMapping("upPassword")
public AppData<OperateUser> updatePassword(Integer uid, String password, String newpassword) {
OperateUser operateUser = operateUserService.updatePassword(uid,password,newpassword);
return new AppData<OperateUser>(operateUser);
}
-
/**
- * Install device.������������
- *
- * @param device the device
- * @return the result bean
+ * ������ ������id ���������������������
*/
- @PostMapping("reportDevice")
- public AppData<String> installDevice(Device device) {
- deviceService.saveOrUpdateDevice(device);
+ @RequestMapping("deviceInfo")
+ public AppData<Device> deviceInfo(Integer id){
+ Device device = deviceService.queryById(id);
+ return new AppData<Device>(device);
+ }
+ /**
+ *
+ * @param equDeviceAdapter
+ * @return
+ */
+ @RequestMapping("reportDevice")
+ public AppData<String> installDevice(EquDeviceAdapter equDeviceAdapter) {
+ deviceService.addOrModify(equDeviceAdapter.toDevice());
return new AppData<String>("");
}
@@ -95,7 +101,7 @@
* @param pageSize the page size
* @return the install devices by operate user
*/
- @PostMapping("myRelease")
+ @RequestMapping("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);
@@ -108,10 +114,17 @@
* @param mac the mac
* @return the device by mac
*/
- @GetMapping("getEquInfoByMac")
- public AppData<Device> getDeviceByMac(@RequestParam(value="mac", required=true)String mac) {
- Device device = deviceService.getDeviceByMac(mac);
- return new AppData<Device>(device);
+ @RequestMapping("getEquInfoByMac")
+ public AppData<Map> getDeviceByMac(@RequestParam(value="mac", required=true)String mac) {
+ Device device = deviceService.getDeviceByMac(mac,false);//���������������
+ if(device!=null){
+ Map<String,Object> deviceMap = new HashMap<>(BeanMap.create(device));
+ deviceMap.put("monitorpointDetail",deviceMap.get("monitorPoint"));
+ deviceMap.remove("monitorPoint");
+ return new AppData<Map>(deviceMap);
+ }else{
+ return new AppData("mac���������������",AppData.FAIL);
+ }
}
/**
@@ -120,7 +133,7 @@
* @param request the area name
* @return the monitor points by area name
*/
- @GetMapping("getMpointsByAreaName")
+ @RequestMapping("getMpointsByAreaName")
public AppData<List<MonitorPoint>> getMonitorPointsByAreaName(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByAreaName(parameters);
@@ -133,7 +146,7 @@
* @param request the area name
* @return the organizations by area name
*/
- @GetMapping("getOrgsByAreaName")
+ @RequestMapping("getOrgsByAreaName")
public AppData<List<Organization>> getOrganizationsByAreaName(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
List<Organization> organizations = organizationService.getOrganizationsByAreaName(parameters);
@@ -146,7 +159,7 @@
* @param mobile
* @return
*/
- @PostMapping("sendSms")
+ @RequestMapping("sendSms")
public AppData<String> sendSms(String mobile) {
AppData apiData = new AppData();
@@ -190,12 +203,13 @@
}
/**
- * Send SMS
*
- * @param mobile
+ * @param username
+ * @param password
+ * @param code
* @return
*/
- @PostMapping("password")
+ @RequestMapping("password")
public AppData<String> password(String username, String password, String code){
AppData apiData = new AppData();
@@ -229,4 +243,11 @@
return apiData;
}
}
+
+ @RequestMapping("profession")
+ public AppData<List<Profession>> profession(){
+
+ List<Profession> professions = professionService.getProfessiontList();
+ return new AppData<List<Profession>>(professions);
+ }
}
--
Gitblit v1.8.0