update,修改realName取成userName的bug

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -304,7 +304,7 @@
             s.id_ school_id_,
             s.address_,
             s.longitude_latitude_,
-            su.username_ teacher_name_,
+            su.real_name_ teacher_name_,
             ta.sign_in_time_
         FROM
           course_schedule cs
@@ -333,7 +333,7 @@
             s.id_ school_id_,
             s.address_,
             s.longitude_latitude_,
-            su.username_ teacher_name_,
+            su.real_name_ teacher_name_,
             ta.sign_in_time_,
             cs.schoole_id_
         FROM
@@ -506,7 +506,7 @@
             CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
             CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
             cs.status_,
-            su.username_ teacher_name_,
+            su.real_name_ teacher_name_,
             IF(sa.status_ IS NULL,'NORMAL',sa.status_) attendance_status_,
             csc.id_ IS NOT NULL complaint_status_,
             cs.teach_mode_
@@ -533,7 +533,7 @@
         SELECT
             cs.id_ seal_class_id_,
             cg.name_,
-            su.username_ teacher_name_,
+            su.real_name_ teacher_name_,
             cs.type_,
             cs.id_,
             cs.class_group_id_,
@@ -570,7 +570,7 @@
         SELECT
             cs.id_ seal_class_id_,
             cg.name_,
-            su.username_ teacher_name_,
+            su.real_name_ teacher_name_,
             cs.type_,
             cs.id_,
             cs.class_group_id_,
@@ -869,7 +869,7 @@
     <select id="findStudentCourseScheduleNotStartRecords" resultMap="studentCourseScheduleRecord">
         SELECT
             cs.teacher_id_,
-            su.username_ teacher_name_,
+            su.real_name_ teacher_name_,
             cs.id_ course_schedule_id_,
             cs.name_,
             cs.class_date_,
@@ -1139,7 +1139,7 @@
             cs.status_,
             cs.actual_teacher_id_,
             cs.teach_mode_,
-            su.username_,
+            su.real_name_ username_,
             cg.total_class_times_
         FROM
             course_schedule_teacher_salary csts
@@ -1281,7 +1281,7 @@
             cg.id_ class_group_id_,
             cg.name_ class_group_name_,
             csts.user_id_,
-            su.username_,
+            su.real_name_ username_,
             cs.student_num_,
             cg.student_num_ total_student_num_,
             cs.leave_student_num_,

mec-biz/src/main/resources/config/mybatis/DemoGroupMapper.xml

@@ -214,7 +214,7 @@
     <select id="findDemoGroupList" resultMap="studentDemoGroupListDto">
         SELECT
             dg.id_ demo_group_id_,
-            su.username_,
+            su.real_name_ username_,
             su.avatar_,
             t.introduction_,
             s.name_ subject_name_,

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -245,7 +245,7 @@
 
 	<select id="findTeachersByStuId" resultMap="BasicUserDto">
 		SELECT DISTINCT
-			su.username_,
+			su.real_name_ username_,
 			su.id_ user_id_,
 			su.avatar_ head_url_,
 			gender_,

mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -121,7 +121,8 @@
     </update>
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
-        SELECT su.id_ user_id_,su.username_,su.gender_,su.phone_ parents_phone_,su.real_name_,su.birthdate_,su.nation_,
+        SELECT su.id_ user_id_,su.username_,su.gender_,su.phone_ parents_phone_,su.real_name_,
+        su.birthdate_,su.nation_,
         CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_
         FROM sys_user su
         <include refid="findStudentsByOrganIdSql"/>
@@ -232,7 +233,7 @@
             cg.type_ class_group_type_,
             CONCAT(cs.class_date_," ",cs.start_class_time_) course_date_,
             cs.status_ course_status_,
-            su.username_ teacher_name_
+            su.real_name_ teacher_name_
         FROM class_group cg
             LEFT JOIN class_group_student_mapper cgsm ON cg.id_=cgsm.class_group_id_
             LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -362,7 +362,7 @@
     <select id="findTeacherByMusicGroup" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
         SELECT
             su.id_ user_id_,
-            su.username_
+            su.real_name_ username_
         FROM
           class_group_teacher_mapper cgtm
             LEFT JOIN class_group cg ON cg.id_=cgtm.class_group_id_
@@ -506,13 +506,14 @@
     </select>
 
     <select id="queryMusicGroupStudents" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
-        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,GROUP_CONCAT(s.name_) subject_name_,su.user_type_
+        SELECT su.real_name_ username_,su.id_ user_id_,su.avatar_ head_url_,
+        su.gender_,GROUP_CONCAT(s.name_) subject_name_,su.user_type_
         FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)
         WHERE FIND_IN_SET(t.id_,#{teacherIds})
         <if test="search != null">
-            AND su.username_ LIKE CONCAT('%',#{search},'%')
+            AND su.real_name_ LIKE CONCAT('%',#{search},'%')
         </if>
         GROUP BY t.id_
     </select>

mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -376,7 +376,7 @@
         SELECT
             vg.*,
             vga.name_ vip_group_activity_name_,
-            su.username_,
+            su.real_name_ username_,
             cg.student_num_,
             cg.subject_id_list_,
             cg.total_class_times_,

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/JiguangPushPlugin.java

@@ -1,19 +1,16 @@
 package com.ym.mec.thirdparty.message.provider;
 
-import java.io.IOException;
-import java.util.HashMap;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.thirdparty.exception.ThirdpartyException;
 import com.ym.mec.thirdparty.message.MessageSenderPlugin;
 import com.ym.mec.util.http.HttpUtil;
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import java.io.IOException;
+import java.util.HashMap;
 
 /**
  * 极光推送