From a0341d4100c15c57fb645fd1f23225563e306712 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 28 Feb 2018 10:55:55 +0800
Subject: [PATCH] 设备和监控点 两模块修改，同步reids里的信息。数据字典功能添加
---
src/main/java/com/moral/controller/MobileController.java | 127 +++++++++++++++++++++++++++++++++---------
1 files changed, 99 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index d178bc7..1f4e182 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -1,71 +1,142 @@
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.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.
+ */
@RestController
-@RequestMapping(value = "mobile")
+@RequestMapping("mobile")
@CrossOrigin(origins = "*", maxAge = 3600)
public class MobileController {
+ /** The operate user service. */
@Resource
private OperateUserService operateUserService;
+ /** The device service. */
@Resource
private DeviceService deviceService;
- // 1������
- @GetMapping(value = "accountlogin")
- public ResultBean<OperateUser> mobileLogin(String username, String password) {
+ /** 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("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);
}
- // 4������������
- @GetMapping(value = "upPassword")
- public ResultBean<OperateUser> updatePassword(Integer uid, String password, String newpassword) {
+ /**
+ * Update password.������������
+ *
+ * @param uid the uid
+ * @param password the password
+ * @param newpassword the newpassword
+ * @return the result bean
+ */
+ @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);
}
- // 11������������
- @GetMapping(value = "reportDevice")
- public ResultBean<String> installDevice(Device device) {
+ /**
+ * Install device.������������
+ *
+ * @param device the device
+ * @return the result bean
+ */
+ @GetMapping("reportDevice")
+ public AppData<String> installDevice(Device device) {
deviceService.saveOrUpdateDevice(device);
- return new ResultBean<String>("");
+ return new AppData<String>("");
}
- // 5������������������(������)
- @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);
+ /**
+ * 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("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);
}
- @GetMapping(value = "getEquInfoByMac")
- public void getEquInfoByMac(String mac) {
+ /**
+ * Gets the device by mac.
+ *
+ * @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);
}
- @GetMapping(value = "getMpointsByAreaName")
- public void getMpointsByAreaName(String areaName) {
+ /**
+ * Gets the monitor points by area name.
+ *
+ * @param request the area name
+ * @return the monitor points by area name
+ */
+ @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);
}
- @GetMapping(value = "getOrgsByAreaName")
- public void getOrgsByAreaName(String areaName) {
-
+ /**
+ * Gets the organizations by area name.
+ *
+ * @param request the area name
+ * @return the organizations by area name
+ */
+ @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