update

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserDao.java

@@ -79,4 +79,10 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @param imToken
 	 */
 	void refreshImToken(@Param("userId") Integer userId, @Param("imToken") String imToken);
+
+	/**
+	 * 保存student
+	 * @param userId
+	 */
+    void saveStudent(@Param("userId") Integer userId, @Param("lesseeOrganId") Integer lesseeOrganId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysUserService.java

@@ -97,4 +97,10 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * @param sysUser
 	 */
     void refreshImToken(SysUser sysUser);
+
+	/**
+	 * 保存student数据
+	 * @param userId
+	 */
+	void saveStudent(Integer userId,Integer lesseeOrganId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -169,6 +169,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 				sysUser.setUserType("STUDENT");
 				sysUser.setOrganId(lesseeOrganId);
 				sysUserDao.insert(sysUser);
+				sysUserService.saveStudent(sysUser.getId(),lesseeOrganId);
 				//添加用户现金账户
 				imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
 				userFeignService.createCashAccount(sysUser.getId());
@@ -205,4 +206,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		sysUserDao.refreshImToken(sysUser.getId(),sysUser.getImToken());
 	}
 
+	@Override
+	public void saveStudent(Integer userId,Integer lesseeOrganId) {
+		sysUserDao.saveStudent(userId,lesseeOrganId);
+	}
+
 }

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -80,6 +80,9 @@
         (user_id_,available_minutes_,frozen_minutes_,status_,create_time_,update_time_)
 		VALUES(#{userId},0,0,1,NOW(),NOW())
     </insert>
+    <insert id="saveStudent">
+        INSERT INTO student (user_id_,subject_id_list_,create_time_,update_time_) VALUES(#{userId},#{lesseeOrganId},NOW(),NOW())
+    </insert>
 
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.ym.mec.auth.api.entity.SysUser">

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentCourseHomeworkCommentDto.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -34,9 +35,19 @@ public class StudentCourseHomeworkCommentDto {
     /**  */
     private java.util.Date createTime;
 
+    private ImSendTypeEnum msgType;
+
     @ApiModelProperty(value = "回复",required = false)
     private List<StudentCourseHomeworkCommentDto> replys;
 
+    public ImSendTypeEnum getMsgType() {
+        return msgType;
+    }
+
+    public void setMsgType(ImSendTypeEnum msgType) {
+        this.msgType = msgType;
+    }
+
     public Integer getIsTeacher() {
         return isTeacher;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ExtracurricularExercisesMessage.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -27,7 +28,17 @@ public class ExtracurricularExercisesMessage {
 	
 	/** 父级编号 */
 	private Long parentId;
-	
+
+	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT_MSG;
+
+	public ImSendTypeEnum getMsgType() {
+		return msgType;
+	}
+
+	public void setMsgType(ImSendTypeEnum msgType) {
+		this.msgType = msgType;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Student.java

@@ -22,7 +22,15 @@ public class Student {
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	public Student(Integer userId, String subjectIdList) {
+		this.userId = userId;
+		this.subjectIdList = subjectIdList;
+	}
+
+	public Student() {
+	}
+
 	public void setUserId(Integer userId){
 		this.userId = userId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentCourseHomeworkReply.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -32,6 +33,17 @@ public class StudentCourseHomeworkReply {
 
 	private boolean extra;
 
+	//false  文本，true其他需要跳转
+	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT_MSG;
+
+	public ImSendTypeEnum getMsgType() {
+		return msgType;
+	}
+
+	public void setMsgType(ImSendTypeEnum msgType) {
+		this.msgType = msgType;
+	}
+
 	public boolean isExtra() {
 		return extra;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ImSendTypeEnum.java

@@ -0,0 +1,39 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 融云消息类型
+ */
+public enum ImSendTypeEnum implements BaseEnum<String, ImSendTypeEnum> {
+	TXT_MSG("txt", "文本"),
+	IMG_MSG("img", "图片"),
+	VC_MSG("vc", "语言"),
+	FILE_MSG("file", "文件");
+
+	private String code;
+
+	private String msg;
+
+	ImSendTypeEnum(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public String getCode() {
+		return this.code;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/service/StudentService.java

@@ -9,4 +9,6 @@ public interface StudentService extends BaseService<Integer, Student> {
 
     PageInfo findStudentVipGroupList(StudentQueryInfo queryInfo);
 
+    Long upSet(Student student);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

@@ -176,6 +176,8 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
 
     String COURSE_AFTER_BUFFER_TIME = "course_after_buffer_time";
 
+    String NEW_MSG_PUSH = "您收到一条作业回复，请点击查看";
+
     /**
      * @return com.ym.mec.biz.dal.entity.SysConfig
      * @params paramName

mec-biz/src/main/java/com/ym/mec/biz/service/SysMessageService.java

@@ -34,7 +34,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param messageType
 	 * @return
 	 */
-	void batchSendImMessage(MessageTypeEnum messageType,String senderId, String[] targetIds,String url, Object... args);
+	void batchSendImMessage(MessageTypeEnum messageType,String senderId,String extra, String[] targetIds,String url, Object... args);
 
 	/**
 	 * 批量发送消息

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

@@ -239,7 +239,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
                     Map<Integer, String> userMap = new HashMap<>();
                     userMap.put(courseScheduleStudentPayment.getUserId(), courseScheduleStudentPayment.getUserId().toString());
                     String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
-                    sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND,courseScheduleReview.getTeacherId().toString(),
+                    sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND,courseScheduleReview.getTeacherId().toString(),null,
                                                     new String[]{courseScheduleStudentPayment.getUserId().toString()},
                                                     null,courseSchedule.getName(), dateStr,courseHomework.getContent());
                     sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_REMIND,

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

@@ -9,9 +9,11 @@ import com.ym.mec.biz.dal.dto.StudentCourseHomeworkCommentDto;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercises;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercisesMessage;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply;
+import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.page.StudentCourseHomeworkReplyQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesMessageService;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -69,10 +71,17 @@ public class ExtracurricularExercisesMessageServiceImpl extends BaseServiceImpl<
 			Map<Integer, String> userMap = new HashMap<>();
 			userMap.put(extracurricularExercisesReply.getUserId(),extracurricularExercisesReply.getUserId().toString());
 			String notifyUrl = "3?courseScheduleID=" + extracurricularExercisesReply.getId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1";
-
-			sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_TEACHER_REPLY_IM,extracurricularExercises.getTeacherId().toString(),
-					new String[]{extracurricularExercisesReply.getUserId().toString()},
-					null, extracurricularExercises.getTitle(), extracurricularExercisesMessage.getContent());
+			String extra = "";
+			if (extracurricularExercisesMessage.getMsgType() != ImSendTypeEnum.TXT_MSG){
+				extra = "dayaedu?courseScheduleID=" + extracurricularExercisesReply.getId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1&" + "userId=" + extracurricularExercisesReply.getUserId();
+				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_TEACHER_REPLY_IM,extracurricularExercises.getTeacherId().toString(),extra,
+						new String[]{extracurricularExercisesReply.getUserId().toString()},
+						null, extracurricularExercises.getTitle(), SysConfigService.NEW_MSG_PUSH);
+			}else {
+				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_TEACHER_REPLY_IM,extracurricularExercises.getTeacherId().toString(),extra,
+						new String[]{extracurricularExercisesReply.getUserId().toString()},
+						null, extracurricularExercises.getTitle(), extracurricularExercisesMessage.getContent());
+			}
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.EXTRA_TEACHER_REPLY_PUSH,
 					userMap, null, 0, notifyUrl, "STUDENT", extracurricularExercises.getTitle());
 		}else if("STUDENT".equals(extracurricularExercisesMessage.getRole())&&Objects.nonNull(extracurricularExercisesReply.getAttachments())){
@@ -82,9 +91,17 @@ public class ExtracurricularExercisesMessageServiceImpl extends BaseServiceImpl<
 
 			String notifyUrl = "9?courseScheduleID=" + extracurricularExercisesReply.getId() +
 					"&userId=" + extracurricularExercisesReply.getUserId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1";
-			sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_STUDENT_REPLY_IM,extracurricularExercisesReply.getUserId().toString(),
-					new String[]{extracurricularExercises.getTeacherId().toString()},
-					null,extracurricularExercises.getTitle(), extracurricularExercisesMessage.getContent());
+			String extra = "";
+			if (extracurricularExercisesMessage.getMsgType() != ImSendTypeEnum.TXT_MSG){
+				extra = "dayaedu?courseScheduleID=" + extracurricularExercisesReply.getId() + "&userId=" + extracurricularExercisesReply.getUserId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1";
+				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_STUDENT_REPLY_IM,extracurricularExercisesReply.getUserId().toString(),extra,
+						new String[]{extracurricularExercises.getTeacherId().toString()},
+						null,extracurricularExercises.getTitle(), SysConfigService.NEW_MSG_PUSH);
+			}else {
+				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_STUDENT_REPLY_IM,extracurricularExercisesReply.getUserId().toString(),extra,
+						new String[]{extracurricularExercises.getTeacherId().toString()},
+						null,extracurricularExercises.getTitle(), extracurricularExercisesMessage.getContent());
+			}
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.EXTRA_STUDENT_REPLY_PUSH,
 					userMap, null, 0, notifyUrl, "TEACHER", extracurricularExercises.getTitle(), user.getUsername());
 		}

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

@@ -146,7 +146,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			userMap.put(extracurricularExercises.getTeacherId(), extracurricularExercises.getTeacherId().toString());
 			SysUser user = teacherDao.getUser(existExtra.getUserId());
 			String notifyUrl = "9?courseScheduleID=" + existExtra.getId() + "&userId=" + existExtra.getUserId() + "&studentCourseHomeworkId=" + existExtra.getId()+ "&extra=1";
-			sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_SUBMIT_IM,existExtra.getUserId().toString(),
+			sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_SUBMIT_IM,existExtra.getUserId().toString(),null,
 					new String[]{extracurricularExercises.getTeacherId().toString()},
 					null,extracurricularExercises.getTitle());
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.EXTRA_SUBMIT_PUSH,

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

@@ -78,7 +78,7 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 			extracurricularExercisesReplyDao.insert(studentExtraExercise);
 
 			String notifyUrl = "3?courseScheduleID=" + studentExtraExercise.getId() + "&studentCourseHomeworkId=" + studentExtraExercise.getId() + "&extra=1";
-			sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_REMIND_IM,exercises.getTeacherId().toString(),
+			sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_REMIND_IM,exercises.getTeacherId().toString(),null,
 					new String[]{studentId.toString()},
 					null, exercises.getTitle(), dateStr,exercises.getContent());
 

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

@@ -9,10 +9,13 @@ import com.ym.mec.biz.dal.dto.StudentCourseHomeworkCommentDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.biz.dal.entity.StudentCourseHomeworkReply;
+import com.ym.mec.biz.dal.entity.SysConfig;
+import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.page.StudentCourseHomeworkReplyQueryInfo;
 import com.ym.mec.biz.service.StudentCourseHomeworkReplyService;
 import com.ym.mec.biz.service.StudentCourseHomeworkService;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -63,9 +66,17 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 		String notifyUrl = "9?courseScheduleID=" + studentCourseHomework.getId() +
 				"&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
 		String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
-		sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),
-				new String[]{courseSchedule.getActualTeacherId().toString()},
-				null,courseDate,courseSchedule.getName(),bean.getContent());
+		String extra = "";
+		if (bean.getMsgType() != ImSendTypeEnum.TXT_MSG){
+			extra = "dayaedu?courseScheduleID=" + studentCourseHomework.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
+			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),extra,
+					new String[]{courseSchedule.getActualTeacherId().toString()},
+					null,courseDate,courseSchedule.getName(),SysConfigService.NEW_MSG_PUSH);
+		}else {
+			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),extra,
+					new String[]{courseSchedule.getActualTeacherId().toString()},
+					null,courseDate,courseSchedule.getName(),bean.getContent());
+		}
 		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_STUDENT_REPLY_PUSH,
 				userMap, null, 0, notifyUrl, "TEACHER", courseDate,courseSchedule.getName(), user.getUsername());
 		return super.insert(bean);
@@ -90,9 +101,18 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 		SysUser user = teacherDao.get(courseSchedule.getActualTeacherId());
 		String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
 		String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
-		sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getActualTeacherId().toString(),
-				new String[]{studentCourseHomework.getUserId().toString()},
-				null, courseDate,courseSchedule.getName(),bean.getContent());
+		String extra = "";
+		if (bean.getMsgType() != ImSendTypeEnum.TXT_MSG){
+			extra = "dayaedu?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0&" + "userId=" + studentCourseHomework.getUserId();
+			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getActualTeacherId().toString(),extra,
+					new String[]{studentCourseHomework.getUserId().toString()},
+					null, courseDate,courseSchedule.getName(),SysConfigService.NEW_MSG_PUSH);
+		}else {
+			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getActualTeacherId().toString(),extra,
+					new String[]{studentCourseHomework.getUserId().toString()},
+					null, courseDate,courseSchedule.getName(),bean.getContent());
+		}
+
 		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH,
 				userMap, null, 0, notifyUrl, "STUDENT", user.getRealName(), courseSchedule.getName());
 		super.insert(bean);

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

@@ -113,7 +113,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             SysUser user = teacherDao.getUser(bean.getUserId());
             String notifyUrl = "9?courseScheduleID=" + bean.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId() + "&extra=0";
             String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
-            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH,bean.getUserId().toString(),
+            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH,bean.getUserId().toString(),null,
                     new String[]{courseSchedule.getActualTeacherId().toString()},
                     null,courseDate,courseSchedule.getName());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_SUBMIT_PUSH,

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

@@ -5,11 +5,13 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.StudentManageService;
+import com.ym.mec.biz.service.StudentService;
 import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.exception.BizException;
@@ -42,6 +44,8 @@ public class StudentManageServiceImpl implements StudentManageService {
     @Autowired
     private TeacherDao teacherDao;
     @Autowired
+    private StudentService studentService;
+    @Autowired
     private MusicGroupDao musicGroupDao;
     @Autowired
     private StudentRegistrationDao studentRegistrationDao;
@@ -393,6 +397,7 @@ public class StudentManageServiceImpl implements StudentManageService {
             throw new BizException("手机号已被占用");
         }
         teacherDao.updateUser(sysUser);
+        studentService.upSet(new Student(userId,sysUser.getOrganId().toString()));
         return userId;
     }
 

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

@@ -10,11 +10,9 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implements StudentService {
@@ -46,4 +44,20 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
 		pageInfo.setRows(dataList);
 		return pageInfo;
 	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public Long upSet(Student student) {
+		if(student.getUserId() == null){
+			return studentDao.insert(student);
+		}else {
+			if(studentDao.get(student.getUserId()) == null){
+				return studentDao.insert(student);
+			}else {
+				student.setUpdateTime(new Date());
+				studentDao.update(student);
+				return student.getUserId().longValue();
+			}
+		}
+	}
 }

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

@@ -172,7 +172,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public void batchSendImMessage(MessageTypeEnum type, String senderId, String[] targetIds, String url, Object... args) {
+	public void batchSendImMessage(MessageTypeEnum type, String senderId,String extra, String[] targetIds, String url, Object... args) {
 		SysMessageConfig messageConfig = sysMessageConfigService.queryByType(type);
 		if (messageConfig == null) {
 			throw new BizException("消息类型错误");
@@ -187,7 +187,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		privateMessage.setObjectName("RC:TxtMsg");
 		privateMessage.setTargetId(targetIds);
 		privateMessage.setSenderId(senderId);
-		privateMessage.setContent(new ImTxtMessage(content,null));
+		privateMessage.setContent(new ImTxtMessage(content,extra));
 		imFeignService.privateSend(privateMessage);
 	}
 

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

@@ -14,6 +14,7 @@
 		<result column="content_" property="content" />
 		<result column="create_time_" property="createTime" />
 		<result column="parent_id_" property="parentId" />
+		<result column="msg_type_" property="msgType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -33,14 +34,17 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO extracurricular_exercises_message (id_,extracurricular_exercises_reply_id_,user_id_,role_,content_,create_time_,parent_id_)
-		VALUES(#{id},#{extracurricularExercisesReplyId},#{userId},#{role},#{content},NOW(),#{parentId})
+		INSERT INTO extracurricular_exercises_message (id_,extracurricular_exercises_reply_id_,user_id_,role_,content_,create_time_,parent_id_,msg_type_)
+		VALUES(#{id},#{extracurricularExercisesReplyId},#{userId},#{role},#{content},NOW(),#{parentId},#{msgType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercisesMessage">
 		UPDATE extracurricular_exercises_message
 		<set>
+			<if test="msgType != null">
+			msg_type_ = #{msgType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+			</if>
 			<if test="parentId != null">
 			parent_id_ = #{parentId},
 			</if>
@@ -100,7 +104,8 @@
 			suc.avatar_,
 			IF(suc.user_type_ LIKE '%STUDENT%',0,1) is_teacher_,
 			eem.content_ comment_content_,
-			eem.create_time_ comment_time
+			eem.create_time_ comment_time,
+			eem.msg_type_
 		FROM
 			extracurricular_exercises_message eem
 		LEFT JOIN sys_user suc ON eem.user_id_=suc.id_

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

@@ -13,16 +13,18 @@
         <result column="content_" property="content"/>
         <result column="create_time_" property="createTime"/>
         <result column="parent_id_" property="parentId"/>
+        <result column="msg_type_" property="msgType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
     <resultMap id="studentCourseHomeworkComment" type="com.ym.mec.biz.dal.dto.StudentCourseHomeworkCommentDto">
-        <result property="replyId" column="comment_id_"></result>
-        <result property="userId" column="comment_user_id_"></result>
-        <result property="userName" column="comment_user_name_"></result>
+        <result property="replyId" column="comment_id_"/>
+        <result property="userId" column="comment_user_id_"/>
+        <result property="userName" column="comment_user_name_"/>
         <result property="avatar" column="avatar_"/>
         <result property="isTeacher" column="is_teacher_"/>
-        <result property="content" column="comment_content_"></result>
-        <result property="createTime" column="comment_time"></result>
+        <result property="content" column="comment_content_"/>
+        <result property="createTime" column="comment_time"/>
+        <result property="msgType" column="msg_type_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -39,8 +41,8 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentCourseHomeworkReply" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO student_course_homework_reply
-        (id_,student_course_homework_id_,user_id_,content_,create_time_,parent_id_)
-        VALUES(#{id},#{studentCourseHomeworkId},#{userId},#{content},now(),#{parentId})
+        (id_,student_course_homework_id_,user_id_,content_,create_time_,parent_id_,msg_type_)
+        VALUES(#{id},#{studentCourseHomeworkId},#{userId},#{content},now(),#{parentId},#{msgType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -50,6 +52,9 @@
             <if test="parentId != null">
                 parent_id_ = #{parentId},
             </if>
+            <if test="msgType != null">
+                msg_type_ = #{msgType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="studentCourseHomeworkId != null">
                 student_course_homework_id_ = #{studentCourseHomeworkId},
             </if>
@@ -115,7 +120,8 @@
             suc.avatar_,
             IF(suc.user_type_ LIKE '%STUDENT%',0,1) is_teacher_,
             schr.content_ comment_content_,
-            schr.create_time_ comment_time
+            schr.create_time_ comment_time,
+            schr.msg_type_
         FROM
             student_course_homework_reply schr
             LEFT JOIN sys_user suc ON schr.user_id_=suc.id_

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

@@ -31,11 +31,6 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Student" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
 		INSERT INTO student (user_id_,subject_id_list_,create_time_,update_time_) VALUES(#{userId},#{subjectIdList},NOW(),NOW())
 	</insert>
 	

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseHomeworkReplyController.java

@@ -59,6 +59,7 @@ public class TeacherCourseHomeworkReplyController extends BaseController {
             ExtracurricularExercisesMessage extracurricularExercisesMessage=new ExtracurricularExercisesMessage();
             extracurricularExercisesMessage.setExtracurricularExercisesReplyId(studentCourseHomeworkReply.getStudentCourseHomeworkId());
             extracurricularExercisesMessage.setContent(studentCourseHomeworkReply.getContent());
+            extracurricularExercisesMessage.setMsgType(studentCourseHomeworkReply.getMsgType());
             extracurricularExercisesMessage.setUserId(user.getId());
             extracurricularExercisesMessage.setRole("TEACHER");
             extracurricularExercisesMessageService.addStudentExtraExerciseComment(extracurricularExercisesMessage);