Merge remote-tracking branch 'origin/master'

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

@@ -39,7 +39,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @return
 	 */
 	public boolean batchSendMessage(MessageSender messageSender, String subject, String content, Map<Integer, String> receivers, Date triggerTime,
-			Integer readStatus, String memo, String group);
+			Integer readStatus, String memo, String group,String jpushType);
 
 	/**
 	 * 发送消息
@@ -53,7 +53,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @return
 	 */
 	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum messageType, Map<Integer, String> receivers, Date triggerTime,
-			Integer readStatus, String url, Object... args);
+			Integer readStatus, String url,String jpushType, Object... args);
 
 	/**
 	 * 发送消息
@@ -70,7 +70,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @return
 	 */
 	public void sendMessage(MessageSender messageSender, Integer userId, String title, String content, String receiver, Date triggerTime, Integer readStatus,
-			String url, String group);
+			String url, String group,String jpushType);
 
 	/**
 	 * 发送验证码

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

@@ -81,7 +81,7 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 			Integer userId = (Integer) mapper.getKey();
 			receivers.put(userId, userId + "");
 
-			sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_JOB_WAIT_REPLY, receivers, null, 0, "6?", mapper.getValue());
+			sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_JOB_WAIT_REPLY, receivers, null, 0, "6?", "TEACHER", mapper.getValue());
 		}
 	}
 }

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

@@ -442,7 +442,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 courseScheduleDto.setStudentNames(org.apache.commons.lang3.StringUtils.join(studentNames, ","));
             }
             courseScheduleDto.setSubjectName(subjectNameCourseMap.get(courseScheduleDto.getId()));
-            Long leaveStudentNum = courseLeaveStudentNumMap.get(courseScheduleDto.getClassGroupId());
+            Long leaveStudentNum = courseLeaveStudentNumMap.get(courseScheduleDto.getId());
             Long normalStudentNum = classGroupStudentNumMap.get(courseScheduleDto.getClassGroupId());
             if(Objects.nonNull(leaveStudentNum)&&Objects.nonNull(normalStudentNum)&&leaveStudentNum.intValue()==normalStudentNum.intValue()){
                 courseScheduleDto.setEnableAdjustInToday(1);
@@ -1613,7 +1613,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 //		HashMap<Integer,String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(StringUtils.join(teacherIds, ",")))), HashMap.class);
             if (map != null && map.size() > 0) {
                 sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_COURSE_SCHEDULE_CHANGE_RESULT,
-                        map, null, 0, "7");
+                        map, null, 0, "7","TEACHER");
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -1994,7 +1994,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             Map<Integer, String> receivers = new HashMap<Integer, String>();
             receivers.put(userId, userId + "");
 
-            sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_HAVE_COURSE_MESSAGE, receivers, null, 0, "2", size);
+            sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_HAVE_COURSE_MESSAGE, receivers, null, 0, "2","STUDENT", size);
         }
     }
 
@@ -2006,7 +2006,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 Map<Integer, String> receivers = new HashMap<Integer, String>();
                 receivers.put((Integer) mapper.getKey(), mapper.getKey() + "");
 
-                sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_ATTEND_COURSE_MESSAGE, receivers, null, 0, "2", mapper.getValue());
+                sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_ATTEND_COURSE_MESSAGE, receivers, null, 0, "2","STUDENT", mapper.getValue());
             }
         }
     }

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

@@ -113,9 +113,9 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
 
             sysUserCashAccountDetailService.insert(paymentDetail);
 
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_SUCCESS, map, null, 0, "1",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_SUCCESS, map, null, 0, "1","STUDENT",
                     studentPaymentOrder.getActualAmount(), info.getTitle());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_SPORADIC_PAYMENT_SUCCESS, yimei, null, 0, "1",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_SPORADIC_PAYMENT_SUCCESS, yimei, null, 0, "1","",
                     studentPaymentOrder.getActualAmount(), info.getTitle());
             return true;
         }
@@ -124,9 +124,9 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
                 sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, info.getTitle() + "支付失败");
             }
 
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, map, null, 0, "",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, map, null, 0, "","STUDENT",
                     studentPaymentOrder.getActualAmount(), info.getTitle());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, yimei, null, 0, "",
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_SPORADIC_PAYMENT_FAILED, yimei, null, 0, "", "",
                     studentPaymentOrder.getActualAmount(), info.getTitle());
             return false;
         }

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

@@ -168,7 +168,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	@Override
 	@Async
 	public boolean batchSendMessage(MessageSender messageSender, String subject, String content, Map<Integer, String> receivers, Date triggerTime,
-			Integer readStatus, String memo, String group) {
+			Integer readStatus, String memo, String group,String jpushType) {
 
 		if (receivers == null || receivers.size() == 0) {
 			throw new BizException("消息接收人不能为空");
@@ -186,7 +186,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 				// 立即发送
 				if (triggerTime == null || date.after(triggerTime)) {
 					status = SendStatusEnum.SENDING;
-					if (debugMode == true || messageSenderPluginContext.batchSend(messageSender, subject, content, tos, memo)) {
+					if (debugMode == true || messageSenderPluginContext.batchSend(messageSender, subject, content, tos, memo,jpushType)) {
 						status = SendStatusEnum.SUCCESSED;
 					} else {
 						status = SendStatusEnum.FAILED;
@@ -212,7 +212,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	@Override
 	@Async
 	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum type, Map<Integer, String> receivers, Date triggerTime, Integer readStatus,
-			String url, Object... args) {
+			String url,String jpushType, Object... args) {
 
 		if (receivers == null || receivers.size() == 0) {
 			throw new BizException("接收地址不能为空");
@@ -233,7 +233,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			try {
 				if (debugMode == true
 						|| messageSenderPluginContext.batchSend(messageSender, messageConfig.getDescription(),
-								MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url)) {
+								MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url,jpushType)) {
 					status = SendStatusEnum.SUCCESSED;
 				} else {
 					status = SendStatusEnum.FAILED;
@@ -257,7 +257,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	@Override
 	@Async
 	public void sendMessage(MessageSender messageSender, Integer userId, String title, String content, String receiver, Date triggerTime, Integer readStatus,
-			String url, String group) {
+			String url, String group,String jpushType) {
 		if (StringUtils.isBlank(receiver)) {
 			throw new BizException("接收地址不能为空");
 		}
@@ -268,7 +268,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if (triggerTime == null || date.after(triggerTime)) {
 			status = SendStatusEnum.SENDING;
 			try {
-				if (debugMode == true || messageSenderPluginContext.send(messageSender, receiver, title, content, url)) {
+				if (debugMode == true || messageSenderPluginContext.send(messageSender, receiver, title, content, url,jpushType)) {
 					status = SendStatusEnum.SUCCESSED;
 				} else {
 					status = SendStatusEnum.FAILED;
@@ -304,7 +304,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		}
 		Map<Integer, String> receivers = new HashMap<>(1);
 		receivers.put(userId, receiver);
-		batchSendMessage(messageSender, messageType, receivers, null, 1, "", code);
+		batchSendMessage(messageSender, messageType, receivers, null, 1, "","", code);
 		redisCache.put(key, code + "", CODE_EXPIRE);
 		redisCache.put(key1, code + "", CODE_INTERVAL_TIME);
 		return true;

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

@@ -109,10 +109,10 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
 		SysUser sysUser = sysUserFeignService.queryUserById(userId);
 		map.put(userId,sysUser.getPhone());
 		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.STUDENT_SMS_BALANCE_CONSUME,
-				map,null,0,null,decimal,balance);
+				map,null,0,null,"",decimal,balance);
 		map.put(userId,userId.toString());
 		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_BALANCE_CONSUME,
-				map,null,0,null,decimal,balance);
+				map,null,0,null,"",decimal,balance);
 		return true;
 	}
 

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

@@ -366,7 +366,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 			if (!redisCache.exists(key)) {
 				sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_SIGN_OUT_MESSAGE, receivers, null, 0,
-						"5?courseScheduleId=" + mapper.getCourseScheduleId(), mapper.getValue());
+						"5?courseScheduleId=" + mapper.getCourseScheduleId(), "TEACHER", mapper.getValue());
 				redisCache.put(key, 1, (int) DateUtil.getTomorrowZeroSeconds());
 			}
 		}

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

@@ -355,7 +355,7 @@
         SELECT cg.id_,cg.name_,cg.student_num_,cg.img_,mg.name_ group_name_ FROM class_group_teacher_mapper cgtm
         LEFT JOIN class_group cg ON cgtm.class_group_id_ = cg.id_
         LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
-        WHERE cgtm.user_id_ = #{userId} AND cg.del_flag_ = 0
+        WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR mg.director_user_id_ = #{userId}) AND cg.del_flag_ = 0
         <if test="search != null">
             AND cg.name_ LIKE CONCAT('%',#{search},'%')
         </if>

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

@@ -447,6 +447,7 @@
             cs.status_,
             cs.student_num_,
             cs.leave_student_num_,
+            cs.teach_mode_,
             cg.student_num_ total_student_num_,
             su.real_name_ teacher_name_,
             IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) attendance_status_,

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

@@ -299,8 +299,8 @@
 		FROM music_group mg
 		LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
 		LEFT JOIN class_group_teacher_mapper cgtm ON cg.id_ = cgtm.class_group_id_
-		WHERE (team_teacher_id_ = #{userId} OR educational_teacher_id_ = #{userId}
-		OR operator_user_id_ = #{userId} OR director_user_id_ = #{userId})
+		WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId}
+		 OR director_user_id_ = #{userId})
 		<if test="search != null and search != ''">
 			AND mg.name_ LIKE CONCAT('%',#{search},'%')
 		</if>

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

@@ -600,7 +600,7 @@
         </if>
     </select>
     <select id="queryUsernameByIds" resultType="java.util.Map" parameterType="list">
-        select id_ `key`,username_ `value` FROM sys_user s
+        select id_ `key`,real_name_ `value` FROM sys_user s
         WHERE s.id_ IN
         <foreach collection="userIds" item="item" open="(" close=")" separator=",">
             #{item}

mec-student/src/main/java/com/ym/mec/student/controller/SysMessageController.java

@@ -127,7 +127,7 @@ public class SysMessageController extends BaseController {
 		if (StringUtils.isBlank(mobileNo) || !CommonValidator.isMobileNo(mobileNo)) {
 			throw new BizException("请输入正确的手机号");
 		}
-		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url, group);
+		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url, group, "");
 		return succeed();
 	}
 }

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

@@ -100,7 +100,7 @@ public class SysMessageController extends BaseController {
 		if (StringUtils.isBlank(mobileNo) || !CommonValidator.isMobileNo(mobileNo)) {
 			throw new BizException("请输入正确的手机号");
 		}
-		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url, group);
+		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url, group,null);
 		return succeed();
 	}
 }

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/MessageSenderPlugin.java

@@ -10,10 +10,11 @@ public interface MessageSenderPlugin {
 	 * @param content 消息内容
 	 * @param receiver 收件人
 	 * @param url 链接地址
+	 * @param jpushType 极光应用类型
 	 * @return 是否发送成功
 	 * @throws IOException
 	 */
-	public boolean send(String subject, String content, String receiver, String url) throws Exception;
+	public boolean send(String subject, String content, String receiver, String url, String jpushType) throws Exception;
 
 	/**
 	 * 批量发送消息至目的地
@@ -21,8 +22,9 @@ public interface MessageSenderPlugin {
 	 * @param content 消息内容
 	 * @param receivers 收件人列表
 	 * @param url 链接地址
+	 * @param jpushType 极光应用类型
 	 * @return 是否发送成功
 	 * @throws IOException
 	 */
-	public boolean batchSend(String subject, String content, String[] receivers, String url) throws Exception;
+	public boolean batchSend(String subject, String content, String[] receivers, String url, String jpushType) throws Exception;
 }

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/MessageSenderPluginContext.java

@@ -66,11 +66,11 @@ public class MessageSenderPluginContext implements ApplicationContextAware {
 	 * @return 是否发送成功
 	 * @throws IOException
 	 */
-	public boolean send(MessageSender messageSender, String subject, String content, String receiver, String url) throws Exception {
+	public boolean send(MessageSender messageSender, String subject, String content, String receiver, String url, String jpushType) throws Exception {
 
 		messageSenderPlugin = getMessageSenderPlugin(messageSender);
 
-		return messageSenderPlugin.send(subject, content, receiver, url);
+		return messageSenderPlugin.send(subject, content, receiver, url,jpushType);
 	}
 
 	/**
@@ -83,11 +83,11 @@ public class MessageSenderPluginContext implements ApplicationContextAware {
 	 * @return 是否发送成功
 	 * @throws IOException
 	 */
-	public boolean batchSend(MessageSender messageSender, String subject, String content, String[] receivers, String url) throws Exception {
+	public boolean batchSend(MessageSender messageSender, String subject, String content, String[] receivers, String url, String jpushType) throws Exception {
 
 		messageSenderPlugin = getMessageSenderPlugin(messageSender);
 
-		return messageSenderPlugin.batchSend(subject, content, receivers, url);
+		return messageSenderPlugin.batchSend(subject, content, receivers, url,jpushType);
 	}
 
 	@Override

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

@@ -21,11 +21,20 @@ import com.ym.mec.util.http.HttpUtil;
 @Service
 public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean {
 
-	@Value("${push.jiguang.appKey:0e7422e1d6e73637e678716a}")
-	private String appKey = "7e0282ca92c12c8c45a93bb3";
+	@Value("${push.jiguang.appKey.student}")
+	private String studentAppKey;
+	@Value("${push.jiguang.masterSecret.student}")
+	private String studentMasterSecret;
 
-	@Value("${push.jiguang.masterSecret:c2361016604eab56ab2db2ac}")
-	private String masterSecret = "d47430e2f4755ef5dc050ac5";
+	@Value("${push.jiguang.appKey.teacher}")
+	private String teacherAppKey;
+	@Value("${push.jiguang.masterSecret.teacher}")
+	private String teacherMasterSecret;
+
+	@Value("${push.jiguang.appKey.system}")
+	private String systemAppKey;
+	@Value("${push.jiguang.masterSecret.system}")
+	private String systemMasterSecret;
 
 	@Value("${push.jiguang.apns_production:false}")
 	private boolean apns_production = true; // 推送环境 True 表示推送生产环境，False 表示要推送开发环境
@@ -105,8 +114,19 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 	 * @param alert 推送消息
 	 * @param content 推送内容
 	 */
-	private String push(String[] alias, String alert, String content, String url) {
-		String base64_auth_string = encryptBASE64(this.appKey + ":" + this.masterSecret);
+	private String push(String[] alias, String alert, String content, String url,String type) {
+		String base64_auth_string = "";
+		switch (type){
+			case "STUDENT":
+				base64_auth_string = encryptBASE64(this.studentAppKey + ":" + this.studentMasterSecret);
+				break;
+			case "TEACHER":
+				base64_auth_string = encryptBASE64(this.teacherAppKey + ":" + this.teacherMasterSecret);
+				break;
+			default:
+				base64_auth_string = encryptBASE64(this.systemAppKey + ":" + this.systemMasterSecret);
+				break;
+		}
 		String authorization = "Basic " + base64_auth_string;
 		return sendPostRequest(generateJson(alias, alert, content, url).toString(), authorization);
 	}
@@ -142,7 +162,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		// 参数检查
-		if (StringUtils.isBlank(appKey)) {
+		/*if (StringUtils.isBlank(appKey)) {
 			throw new RuntimeException("Init parameter [appKey] can not blank");
 		}
 		if (StringUtils.isBlank(masterSecret)) {
@@ -150,13 +170,13 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 		}
 		if (StringUtils.isBlank(reqURL)) {
 			throw new RuntimeException("Init parameter [reqURL] can not blank");
-		}
+		}*/
 	}
 
 	@Override
-	public boolean send(String subject, String content, String receiver, String url) throws IOException {
+	public boolean send(String subject, String content, String receiver, String url, String type) throws IOException {
 		String[] alias = { receiver };
-		String result = this.push(alias, subject, content, url);
+		String result = this.push(alias, subject, content, url,type);
 		JSONObject json = JSONObject.parseObject(result);
 		if (json.containsKey("error")) {
 			JSONObject jsonObject = json.getJSONObject("error");
@@ -166,8 +186,8 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 	}
 
 	@Override
-	public boolean batchSend(String subject, String content, String[] receivers, String url) throws IOException {
-		String result = this.push(receivers, subject, content, url);
+	public boolean batchSend(String subject, String content, String[] receivers, String url, String type) throws IOException {
+		String result = this.push(receivers, subject, content, url,type);
 		JSONObject json = JSONObject.parseObject(result);
 		if (json.containsKey("error")) {
 			JSONObject jsonObject = json.getJSONObject("error");
@@ -176,12 +196,28 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 		return true;
 	}
 
-	public void setAppKey(String appKey) {
-		this.appKey = appKey;
+	public void setStudentAppKey(String studentAppKey) {
+		this.studentAppKey = studentAppKey;
+	}
+
+	public void setStudentMasterSecret(String studentMasterSecret) {
+		this.studentMasterSecret = studentMasterSecret;
+	}
+
+	public void setTeacherAppKey(String teacherAppKey) {
+		this.teacherAppKey = teacherAppKey;
+	}
+
+	public void setTeacherMasterSecret(String teacherMasterSecret) {
+		this.teacherMasterSecret = teacherMasterSecret;
 	}
 
-	public void setMasterSecret(String masterSecret) {
-		this.masterSecret = masterSecret;
+	public void setSystemAppKey(String systemAppKey) {
+		this.systemAppKey = systemAppKey;
+	}
+
+	public void setSystemMasterSecret(String systemMasterSecret) {
+		this.systemMasterSecret = systemMasterSecret;
 	}
 
 	public void setApns_production(boolean apns_production) {
@@ -196,7 +232,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 		this.reqURL = reqURL;
 	}
 
-	public static void main(String[] args) throws IOException {
+	/*public static void main(String[] args) throws IOException {
 		
 		String str = "2094588";
 		
@@ -204,6 +240,6 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 		JiguangPushPlugin plugin = new JiguangPushPlugin();
 		
 		plugin.batchSend("基础技能训练报名通知", "家长您好：经五路小学比赛团乐团基础技能训练已经开始缴费。请您在收到本通知后，点击http://mstuonline.dayaedu.com/#/smallRegister?musicGroupId=19121912014300001 进行缴费，若有疑问请咨询800-8208820", str.split(","), "5?http://mstudev.dayaedu.com/#/smallRegister?musicGroupId=19121912014300001");
-	}
+	}*/
 
 }

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

@@ -36,7 +36,7 @@ public class MOxintongSMSPlugin implements MessageSenderPlugin, InitializingBean
 	}
 
 	@Override
-	public boolean send(String subject, String content, String receiver, String url) throws IOException {
+	public boolean send(String subject, String content, String receiver, String url, String jpushType) throws IOException {
 		Map<String, Object> reqParams = new HashMap<String, Object>();
 		reqParams.put("username", username);
 		reqParams.put("pwd", pwd);
@@ -58,7 +58,7 @@ public class MOxintongSMSPlugin implements MessageSenderPlugin, InitializingBean
 	}
 
 	@Override
-	public boolean batchSend(String subject, String content, String[] receivers, String url) throws IOException {
+	public boolean batchSend(String subject, String content, String[] receivers, String url, String jpushType) throws IOException {
 		StringBuilder stringBuilder = new StringBuilder();
 		for (int i = 0; i < receivers.length - 1; i++) {
 			stringBuilder.append(receivers[i]).append(",");

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

@@ -70,7 +70,7 @@ public class ShiyuanSMSPlugin implements MessageSenderPlugin, InitializingBean {
 	}
 
 	@Override
-	public boolean send(String subject, String content, String receiver, String url) throws IOException {
+	public boolean send(String subject, String content, String receiver, String url,String jpushType) throws IOException {
 		try {
 			Map<String, Object> reqParams = new HashMap<String, Object>();
 			reqParams.put("account", account);
@@ -93,7 +93,7 @@ public class ShiyuanSMSPlugin implements MessageSenderPlugin, InitializingBean {
 	}
 
 	@Override
-	public boolean batchSend(String subject, String content, String[] receivers, String url) throws IOException {
+	public boolean batchSend(String subject, String content, String[] receivers, String url,String jpushType) throws IOException {
 		StringBuilder stringBuilder = new StringBuilder("");
 		for (int i = 0; i < receivers.length - 1; i++) {
 			stringBuilder.append(receivers[i]).append(",");

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

@@ -53,7 +53,7 @@ public class YimeiSmsPlugin implements MessageSenderPlugin, InitializingBean {
 	}
 
 	@Override
-	public boolean send(String subject, String content, String receiver, String url) throws Exception {
+	public boolean send(String subject, String content, String receiver, String url,String jpushType) throws Exception {
 		String result = getParam(subject, content, receiver, host + "/simpleinter/sendSMS");
 		JSONObject json = JSONObject.parseObject(result);
 		if ("SUCCESS".equals(json.get("code"))) {
@@ -65,7 +65,7 @@ public class YimeiSmsPlugin implements MessageSenderPlugin, InitializingBean {
 	}
 
 	@Override
-	public boolean batchSend(String subject, String content, String[] receivers, String url) throws Exception {
+	public boolean batchSend(String subject, String content, String[] receivers, String url,String jpushType) throws Exception {
 		String join = StringUtils.join(receivers, ",");
 		String result = getParam(subject, content, join, host + "/simpleinter/sendSMS");
 		logger.info("调用短信接口返回:{}", result);

mec-web/src/main/java/com/ym/mec/web/controller/SysMessageController.java

@@ -139,7 +139,7 @@ public class SysMessageController extends BaseController {
 		if (StringUtils.isBlank(mobileNo) || !CommonValidator.isMobileNo(mobileNo)) {
 			throw new BizException("请输入正确的手机号");
 		}
-		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url, group);
+		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url, group,null);
 		return succeed();
 	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/EducationCourseScheduleController.java

@@ -57,10 +57,9 @@ public class EducationCourseScheduleController extends BaseController {
             throw new BizException("请登录");
         }
         Employee employee = employeeDao.get(user.getId());
-        if(Objects.isNull(employee)){
-            throw new BizException("员工信息不存在");
+        if(Objects.nonNull(employee)){
+            queryInfo.setOrganIdList(employee.getOrganIdList());
         }
-        queryInfo.setOrganIdList(employee.getOrganIdList());
         return succeed(scheduleService.getCourseSchedulesWithDateByEdu(queryInfo));
     }