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/mapper/ProfessionMapper.java            |    9 ++++
 src/main/java/com/moral/controller/MobileController.java        |   22 ++++++----
 src/main/java/com/moral/entity/Profession.java                  |   13 ++++++
 src/main/java/com/moral/service/ProfessionService.java          |   10 +++++
 src/main/resources/mapper/ProfessionMapper.xml                  |    9 ++++
 src/main/java/com/moral/service/impl/ProfessionServiceImpl.java |   22 +++++++++++
 6 files changed, 76 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);
+	}
 }
diff --git a/src/main/java/com/moral/entity/Profession.java b/src/main/java/com/moral/entity/Profession.java
new file mode 100644
index 0000000..624a1ad
--- /dev/null
+++ b/src/main/java/com/moral/entity/Profession.java
@@ -0,0 +1,13 @@
+package com.moral.entity;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+
+@Data
+public class Profession {
+    @Id
+    private Integer id;
+
+    private String name;
+}
diff --git a/src/main/java/com/moral/mapper/ProfessionMapper.java b/src/main/java/com/moral/mapper/ProfessionMapper.java
new file mode 100644
index 0000000..552cfb9
--- /dev/null
+++ b/src/main/java/com/moral/mapper/ProfessionMapper.java
@@ -0,0 +1,9 @@
+package com.moral.mapper;
+
+import com.moral.common.mapper.BaseMapper;
+import com.moral.entity.Profession;
+
+import java.util.List;
+
+public interface ProfessionMapper extends BaseMapper<Profession> {
+}
diff --git a/src/main/java/com/moral/service/ProfessionService.java b/src/main/java/com/moral/service/ProfessionService.java
new file mode 100644
index 0000000..0d91271
--- /dev/null
+++ b/src/main/java/com/moral/service/ProfessionService.java
@@ -0,0 +1,10 @@
+package com.moral.service;
+
+import com.moral.entity.Profession;
+
+import java.util.List;
+
+public interface ProfessionService {
+
+    public List<Profession> getProfessiontList();
+}
diff --git a/src/main/java/com/moral/service/impl/ProfessionServiceImpl.java b/src/main/java/com/moral/service/impl/ProfessionServiceImpl.java
new file mode 100644
index 0000000..19bc47b
--- /dev/null
+++ b/src/main/java/com/moral/service/impl/ProfessionServiceImpl.java
@@ -0,0 +1,22 @@
+package com.moral.service.impl;
+
+import com.moral.entity.Profession;
+import com.moral.mapper.ProfessionMapper;
+import com.moral.service.ProfessionService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class ProfessionServiceImpl implements ProfessionService {
+
+    @Resource
+    private ProfessionMapper professionMapper;
+
+    @Override
+    public List<Profession> getProfessiontList() {
+
+        return professionMapper.selectAll();
+    }
+}
diff --git a/src/main/resources/mapper/ProfessionMapper.xml b/src/main/resources/mapper/ProfessionMapper.xml
new file mode 100644
index 0000000..2b6902b
--- /dev/null
+++ b/src/main/resources/mapper/ProfessionMapper.xml
@@ -0,0 +1,9 @@
+<?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.ProfessionMapper" >
+    <resultMap id="BaseResultMap" type="com.moral.entity.Profession" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="name" property="name" jdbcType="VARCHAR" />
+    </resultMap>
+</mapper>
\ No newline at end of file

--
Gitblit v1.8.0