Merge branch 'feature/1020-tencent-im' of http://git.dayaedu.com/yonge/mec into feature/1020-tencent-im

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -1032,7 +1032,8 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 username = Optional.ofNullable(user.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
             }
             // 自动激活学生IM帐号
-            imGroupCoreService.register(userId,clientType, username, sysUserService.getImAvatar(user));
+//            imGroupCoreService.register(userId,clientType, username, sysUserService.getImAvatar(user));
+            imGroupCoreService.register(userId,clientType, username, avatar);
         } catch (Exception e) {
             log.error("register user error", e);
         }
@@ -1068,7 +1069,11 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         SysConfig studentAvatar = sysConfigService.findByParamName(SysConfigService.STUDENT_DEFAULT_AVATAR);
         while (!student.isEmpty()) {
             for (String[] next : student) {
-                register(next[0], next[1],studentAvatar.getParanValue());
+                String avatar = next[2];
+                if (StringUtils.isEmpty(avatar)) {
+                    avatar = studentAvatar.getParanValue();
+                }
+                register(next[0], next[1], avatar);
             }
             count += student.size();
             log.info("import im student success count:{}", count);
@@ -1084,7 +1089,11 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         List<String[]> staff = getStaff(page, rows);
         while (!staff.isEmpty()) {
             for (String[] next : staff) {
-                register(next[0], next[1],staffAvatar.getParanValue());
+                String avatar = next[2];
+                if (StringUtils.isEmpty(avatar)) {
+                    avatar = staffAvatar.getParanValue();
+                }
+                register(next[0], next[1], avatar);
             }
             count += staff.size();
             log.info("import im staff success count:{}", count);
@@ -1100,7 +1109,11 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         List<String[]> emps = getEmp(page, rows);
         while (!emps.isEmpty()) {
             for (String[] next : emps) {
-                register(next[0], next[1],empAvatar.getParanValue());
+                String avatar = next[2];
+                if (StringUtils.isEmpty(avatar)) {
+                    avatar = empAvatar.getParanValue();
+                }
+                register(next[0], next[1], avatar);
             }
             count += emps.size();
             log.info("import im emps success count:{}", count);
@@ -1115,7 +1128,11 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         List<String[]> teachers = getTeachers(page, rows);
         while (!teachers.isEmpty()) {
             for (String[] next : teachers) {
-                register(next[0], next[1], teacherAvatar.getParanValue());
+                String avatar = next[2];
+                if (StringUtils.isEmpty(avatar)) {
+                    avatar = teacherAvatar.getParanValue();
+                }
+                register(next[0], next[1], avatar);
             }
             count += teachers.size();
             log.info("import im teacher success count:{}", count);
@@ -1138,9 +1155,10 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         queryInfo.setRows(rows);
         PageInfo<Employee> employeePageInfo = employeeService.queryBaseInfoByPage(queryInfo);
         return employeePageInfo.getRows().stream().map(next -> {
-            String[] strList = new String[2];
+            String[] strList = new String[3];
             strList[0] = next.getUserId().toString();
             strList[1] = "SYSTEM";
+            strList[2] = next.getAvatar();
             return strList;
         }).collect(Collectors.toList());
     }
@@ -1150,9 +1168,10 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         IPage<SchoolStaffWrapper.SchoolStaff> iPage = schoolStaffService.selectBaseInfoByPage(staffPage,
                 new SchoolStaffWrapper.SchoolStaffQuery());
         return iPage.getRecords().stream().map(next -> {
-            String[] strList = new String[2];
+            String[] strList = new String[3];
             strList[0] = next.getUserId().toString();
             strList[1] = "SCHOOL";
+            strList[2] = next.getAvatar();
             return strList;
         }).collect(Collectors.toList());
     }
@@ -1163,9 +1182,10 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         queryInfo.setRows(rows);
         PageInfo<Student> studentPageInfo = studentService.queryBaseInfoByPage(queryInfo);
         return studentPageInfo.getRows().stream().map(next -> {
-            String[] strList = new String[2];
+            String[] strList = new String[3];
             strList[0] = next.getUserId().toString();
             strList[1] = "STUDENT";
+            strList[2] = next.getAvatar();
             return strList;
         }).collect(Collectors.toList());
     }
@@ -1176,9 +1196,10 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         queryInfo.setRows(rows);
         PageInfo<Teacher> teacherPageInfo = teacherService.queryBaseInfoByPage(queryInfo);
         return teacherPageInfo.getRows().stream().map(next -> {
-            String[] strList = new String[2];
+            String[] strList = new String[3];
             strList[0] = next.getId().toString();
             strList[1] = "TEACHER";
+            strList[2] = next.getAvatar();
             return strList;
         }).collect(Collectors.toList());
     }

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

@@ -30,6 +30,8 @@
         <result column="bank_card_" property="bankCard"/>
         <result column="open_bank_address_" property="openBankAddress"/>
 		<result column="tenant_id_" property="tenantId" />
+
+        <result column="avatar_" property="avatar"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.auth.api.entity.SysUser" id="SysUser">
@@ -455,7 +457,8 @@
     </sql>
 
     <select id="queryBaseInfoByPage" resultMap="Employee" parameterType="map">
-        SELECT * FROM employee
+        SELECT t.*,su.avatar_ FROM employee t
+        LEFT JOIN sys_user su on t.user_id_ = su.id_
         <include refid="global.limit"/>
     </select>
 

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

@@ -1447,7 +1447,7 @@
     </select>
 
     <select id="queryBaseInfoByPage" resultMap="Student" parameterType="map">
-        SELECT s.*,su.username_,su.phone_ FROM student s
+        SELECT s.*,su.username_,su.phone_,su.avatar_ FROM student s
         LEFT JOIN sys_user su ON  su.id_ = s.user_id_
         <include refid="global.limit"/>
     </select>

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

@@ -1578,7 +1578,7 @@
     <select id="queryBaseInfoByPage" resultMap="Teacher" parameterType="map">
         SELECT t.id_,su.real_name_,su.lock_flag_,t.subject_id_,su.phone_,t.organ_id_
         teacher_organ_id_,t.organ_id_,t.is_support_extra_practice_lesson_,t.dept_id_,t.dept_ids_,t.post_dept_ids_,
-        t.job_nature_,t.demission_date_,t.formal_staff_date_,t.is_probation_period_,t.memo_,su.del_flag_,t.is_settlement_salary_
+        t.job_nature_,t.demission_date_,t.formal_staff_date_,t.is_probation_period_,t.memo_,su.del_flag_,t.is_settlement_salary_,su.avatar_
         FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         ORDER BY t.id_ DESC