From b5bd5e3f3c4ff6cf1d165f7e8f3c41c630ece1f2 Mon Sep 17 00:00:00 2001
From: 504987307@qq.com <504987307@qq.com>
Date: Sat, 29 Feb 2020 11:25:11 +0800
Subject: [PATCH] 用户信息接口 添加数据
---
cloud/user_search/src/main/java/com/sincere/userSearch/mapper/UserMapper.java | 3 +++
cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherGroup.java | 23 +++++++++++++++++++++++
cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherInfo.java | 36 ++++++++++++++++++++++++++++++++++++
cloud/user_search/src/main/java/com/sincere/userSearch/service/impl/UserServiceImpl.java | 22 ++++++++++++++++++++++
cloud/user_search/src/main/resources/mapper/UserMapper.xml | 18 +++++++++++++++++-
5 files changed, 101 insertions(+), 1 deletion(-)
create mode 100644 cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherGroup.java
diff --git a/cloud/user_search/src/main/java/com/sincere/userSearch/mapper/UserMapper.java b/cloud/user_search/src/main/java/com/sincere/userSearch/mapper/UserMapper.java
index 4d709ff..e9c5fba 100644
--- a/cloud/user_search/src/main/java/com/sincere/userSearch/mapper/UserMapper.java
+++ b/cloud/user_search/src/main/java/com/sincere/userSearch/mapper/UserMapper.java
@@ -1,6 +1,7 @@
package com.sincere.userSearch.mapper;
import com.sincere.userSearch.model.StudentInfo;
+import com.sincere.userSearch.model.TeacherGroup;
import com.sincere.userSearch.model.TeacherInfo;
import java.util.List;
@@ -14,4 +15,6 @@ public interface UserMapper {
StudentInfo selectParentInfo(int studentId) ;
List<String> selectChildrenId(String userId) ;
+
+ List<TeacherGroup> selectTeacherGroup(int teacherId);
}
diff --git a/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherGroup.java b/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherGroup.java
new file mode 100644
index 0000000..00bbb75
--- /dev/null
+++ b/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherGroup.java
@@ -0,0 +1,23 @@
+package com.sincere.userSearch.model;
+
+public class TeacherGroup {
+
+ private int num ;
+ private String groupName ;
+
+ public int getNum() {
+ return num;
+ }
+
+ public void setNum(int num) {
+ this.num = num;
+ }
+
+ public String getGroupName() {
+ return groupName;
+ }
+
+ public void setGroupName(String groupName) {
+ this.groupName = groupName;
+ }
+}
diff --git a/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherInfo.java b/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherInfo.java
index eb21a8b..88d160c 100644
--- a/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherInfo.java
+++ b/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherInfo.java
@@ -5,14 +5,26 @@ import java.util.List;
public class TeacherInfo {
private String userId ;
+ private int sex ;
private String userName ;
private String mobile ;
private int schoolId ;
private String schoolName ;
private String face ;
private String pass ;
+ private List<Integer> userTypes ;
+ private String teacherNum ;
+ private List<String> groups ;
private List<TeacherClassInfo> classInfos ;
+ public int getSex() {
+ return sex;
+ }
+
+ public void setSex(int sex) {
+ this.sex = sex;
+ }
+
public String getUserId() {
return userId;
}
@@ -76,4 +88,28 @@ public class TeacherInfo {
public void setPass(String pass) {
this.pass = pass;
}
+
+ public List<Integer> getUserTypes() {
+ return userTypes;
+ }
+
+ public void setUserTypes(List<Integer> userTypes) {
+ this.userTypes = userTypes;
+ }
+
+ public String getTeacherNum() {
+ return teacherNum;
+ }
+
+ public void setTeacherNum(String teacherNum) {
+ this.teacherNum = teacherNum;
+ }
+
+ public List<String> getGroups() {
+ return groups;
+ }
+
+ public void setGroups(List<String> groups) {
+ this.groups = groups;
+ }
}
diff --git a/cloud/user_search/src/main/java/com/sincere/userSearch/service/impl/UserServiceImpl.java b/cloud/user_search/src/main/java/com/sincere/userSearch/service/impl/UserServiceImpl.java
index 00cb709..230f3d6 100644
--- a/cloud/user_search/src/main/java/com/sincere/userSearch/service/impl/UserServiceImpl.java
+++ b/cloud/user_search/src/main/java/com/sincere/userSearch/service/impl/UserServiceImpl.java
@@ -4,10 +4,12 @@ import com.sincere.userSearch.mapper.QyhApplyMapper;
import com.sincere.userSearch.mapper.UserMapper;
import com.sincere.userSearch.model.StudentInfo;
import com.sincere.userSearch.model.TeacherClassInfo;
+import com.sincere.userSearch.model.TeacherGroup;
import com.sincere.userSearch.model.TeacherInfo;
import com.sincere.userSearch.service.UserService;
import com.sincere.userSearch.vo.rep.ZnxwRepVo;
import com.sincere.userSearch.vo.req.ZnxwReqVo;
+import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,6 +40,26 @@ public class UserServiceImpl implements UserService {
teacherClassInfos.add(classInfo);
}
}
+ List<Integer> userTypes = new ArrayList<>();
+ for(TeacherClassInfo info : teacherClassInfos){
+ if(!userTypes.contains(info.getUserType())){
+ userTypes.add(info.getUserType());
+ }
+ }
+ teacherInfo.setUserTypes(userTypes);
+ try {
+ List<TeacherGroup> list = userMapper.selectTeacherGroup(teacherInfo.getClassInfos().get(0).getTeacherId());
+ if(list != null && list.size() > 0){
+ teacherInfo.setTeacherNum(list.get(0).getNum()+"");
+ List<String> groups = new ArrayList<>();
+ for(TeacherGroup group : list){
+ groups.add(group.getGroupName());
+ }
+ teacherInfo.setGroups(groups);
+ }
+ }catch (Exception e){
+
+ }
teacherInfo.setClassInfos(teacherClassInfos);
}
return teacherInfos ;
diff --git a/cloud/user_search/src/main/resources/mapper/UserMapper.xml b/cloud/user_search/src/main/resources/mapper/UserMapper.xml
index 2b7b1f2..abedf16 100644
--- a/cloud/user_search/src/main/resources/mapper/UserMapper.xml
+++ b/cloud/user_search/src/main/resources/mapper/UserMapper.xml
@@ -4,6 +4,7 @@
<resultMap id="TeacherInfo" type="com.sincere.userSearch.model.TeacherInfo">
<result column="user_id" property="userId"/>
+ <result column="sex" property="sex"/>
<result column="name" property="userName"/>
<result column="mobile" property="mobile"/>
<result column="face" property="face"/>
@@ -22,7 +23,7 @@
</collection>
</resultMap>
<select id="selectTeacherInfo" parameterType="java.lang.String" resultMap="TeacherInfo">
- SELECT u.user_id , u.name , u.mobile , u.face , u.pass, s.school_id AS schoolid, s.numType, s.school_name AS schoolname,s.school_area as schoolArea,
+ SELECT u.user_id , u.name , u.sex , u.mobile , u.face , u.pass, s.school_id AS schoolid, s.numType, s.school_name AS schoolname,s.school_area as schoolArea,
c.class_id AS classid, c.class_name AS classname,
sj.subject_id AS subjectid, sj.subject_name AS subjectname, sj.subId as SysSubjectId,
ur.usertype, ur.customerId AS TeacherId,c.grade AS grade,(SELECT grade FROM dbo.SZ_Grade WHERE id=c.grade) gradename
@@ -34,6 +35,21 @@
WHERE ur.usertype not in (2,3,33,34) AND ur.state=1 AND ur.user_id=#{userId} order by ur.class_id desc
</select>
+ <resultMap id="TeacherGroup" type="com.sincere.userSearch.model.TeacherGroup">
+ <result column="num" property="num"/>
+ <result column="group_name" property="groupName"/>
+ </resultMap>
+ <select id="selectTeacherGroup" parameterType="java.lang.Integer" resultMap="TeacherGroup">
+ SELECT
+ SZ_Teacher.num ,
+ SZ_TeaGroup.group_name
+ FROM
+ SZ_Teacher
+ JOIN SZ_Teacher_Group ON SZ_Teacher.teacher_id = SZ_Teacher_Group.teacher_id
+ join SZ_TeaGroup on SZ_Teacher_Group.group_id = SZ_TeaGroup.group_id
+ WHERE
+ SZ_Teacher.teacher_id = ${teacherId}
+ </select>
<resultMap id="StudentInfo" type="com.sincere.userSearch.model.StudentInfo">
<result column="user_id" property="userId"/>
--
libgit2 0.21.0