From 7894fc69ea496dbcc024870d002850af71b68f49 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 08 Dec 2017 17:31:37 +0800
Subject: [PATCH] app 接口
---
src/main/java/com/moral/ScreenApiApplication.java | 2 +
src/main/java/com/moral/controller/MobileController.java | 58 +++++++++++++++++++++++++++--
src/main/java/com/moral/mapper/UserMapper.java | 6 +-
src/main/java/com/moral/service/impl/OperateUserServiceImpl.java | 2 +
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 2 +
src/main/resources/mapper/UserMapper.xml | 10 +++++
6 files changed, 73 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moral/ScreenApiApplication.java b/src/main/java/com/moral/ScreenApiApplication.java
index b2ae97d..fd6ee33 100644
--- a/src/main/java/com/moral/ScreenApiApplication.java
+++ b/src/main/java/com/moral/ScreenApiApplication.java
@@ -2,8 +2,10 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
@SpringBootApplication
+@EnableTransactionManagement
public class ScreenApiApplication {
public static void main(String[] args) {
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index 8fcf666..6fa4dec 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -19,63 +19,113 @@
import com.moral.service.OperateUserService;
import com.moral.service.OrganizationService;
+/**
+ * The Class MobileController.
+ */
@RestController
@RequestMapping(value = "mobile")
@CrossOrigin(origins = "*", maxAge = 3600)
public class MobileController {
+ /** The operate user service. */
@Resource
private OperateUserService operateUserService;
+ /** The device service. */
@Resource
private DeviceService deviceService;
+ /** The organization service. */
@Resource
private OrganizationService organizationService;
+ /** The monitor point service. */
@Resource
private MonitorPointService monitorPointService;
- // 1������
+ /**
+ * Mobile login.������
+ *
+ * @param username the username
+ * @param password the password
+ * @return the result bean
+ */
@GetMapping(value = "accountlogin")
public ResultBean<OperateUser> mobileLogin(String username, String password) {
OperateUser operateUser = operateUserService.mobileLogin(username,password);
return new ResultBean<OperateUser>(operateUser);
}
- // 4������������
+ /**
+ * Update password.������������
+ *
+ * @param uid the uid
+ * @param password the password
+ * @param newpassword the newpassword
+ * @return the result bean
+ */
@GetMapping(value = "upPassword")
public ResultBean<OperateUser> updatePassword(Integer uid, String password, String newpassword) {
OperateUser operateUser = operateUserService.updatePassword(uid,password,newpassword);
return new ResultBean<OperateUser>(operateUser);
}
- // 11������������
+ /**
+ * Install device.������������
+ *
+ * @param device the device
+ * @return the result bean
+ */
@GetMapping(value = "reportDevice")
public ResultBean<String> installDevice(Device device) {
deviceService.saveOrUpdateDevice(device);
return new ResultBean<String>("");
}
- // 5������������������(������)
+ /**
+ * 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(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 device by mac.
+ *
+ * @param mac the mac
+ * @return the device by mac
+ */
@GetMapping(value = "getEquInfoByMac")
public ResultBean<Device> getDeviceByMac(String mac) {
Device device = deviceService.getDeviceByMac(mac);
return new ResultBean<Device>(device);
}
+ /**
+ * Gets the monitor points by area name.
+ *
+ * @param areaName 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);
}
+ /**
+ * Gets the organizations by area name.
+ *
+ * @param areaName 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);
diff --git a/src/main/java/com/moral/mapper/UserMapper.java b/src/main/java/com/moral/mapper/UserMapper.java
index d8af37d..9070663 100644
--- a/src/main/java/com/moral/mapper/UserMapper.java
+++ b/src/main/java/com/moral/mapper/UserMapper.java
@@ -1,11 +1,11 @@
package com.moral.mapper;
import com.moral.entity.auth.AuthUser;
-//import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
-//@Mapper
-//@Repository
+@Mapper
+@Repository
public interface UserMapper {
public AuthUser findByUsername(String name);
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index d286c8f..5623fd7 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import com.github.pagehelper.PageHelper;
@@ -59,6 +60,7 @@
}
@Override
+ @Transactional
public void saveOrUpdateDevice(Device device) {
ValidateUtil.notNull(device, "param.is.null");
ValidateUtil.notEmpty(device.getMac(), "param.is.null");
diff --git a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
index 30c9889..ec67a24 100644
--- a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
@@ -3,6 +3,7 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import com.moral.common.exception.BusinessException;
@@ -39,6 +40,7 @@
}
@Override
+ @Transactional
public OperateUser updatePassword(Integer uid, String password, String newPassword) {
OperateUser operateUser = operateUserMapper.selectByPrimaryKey(uid);
if (ObjectUtils.isEmpty(operateUser) || !Crypto.md5(password).equals(operateUser.getPassword())) {
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
new file mode 100644
index 0000000..65e04c7
--- /dev/null
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.moral.mapper.UserMapper">
+
+ <select id="findByUsername" resultType="com.moral.entity.auth.AuthUser">
+
+ </select>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0