Merge remote-tracking branch 'origin/saas' into saas

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

@@ -9,6 +9,7 @@ import com.ym.mec.common.enums.BaseEnum;
 public enum  ParamEnum implements BaseEnum<Integer, ParamEnum> {
 
     ONE(1,""),
+    // INIT_PASSWORD(123456,"初始密码"),
     INIT_PASSWORD(123456,"初始密码"),
     TEACHER_ATTENDANCE_TIME_GAP(-20,"教师正常签到时差");
 

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

@@ -96,7 +96,10 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 			Employee employee1 = employeeDao.get(user.getId());
 			if(employee1 == null){
 				if(StringUtils.isEmpty(user.getPassword())){
-					employee.setPassword(new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
+					// 修改 gym + 联系人手机后4位
+					int phoneStrLen = employee.getPhone().length();
+					employee.setPassword(new BCryptPasswordEncoder().encode("gym" + employee.getPhone().substring(phoneStrLen - 4, phoneStrLen)));
+					// employee.setPassword(new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
 				}
 				employee.setUserId(user.getId());
 				employee.setId(user.getId());

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

@@ -220,6 +220,18 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         if (studentRegistration == null) {
             throw new BizException("学员信息不存在");
         }
+        
+        Student student = studentService.get(userId);
+        if(student == null){
+        	throw new BizException("用户[{}]信息获取失败", userId);
+        }
+        
+        if(!StringUtils.equals(student.getSubjectIdList(), subId+"")){
+        	student.setSubjectIdList(subId + "");
+        	student.setUpdateTime(new Date());
+        	studentService.update(student);
+        }
+        
         //批量调剂（未缴费学员）
         int i = studentRegistrationDao.batchUpdateSubject(userId, subId, musicGroupId);
         if (i > 0) {
@@ -493,6 +505,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         //更新年级信息
         student.setCurrentGradeNum(studentRegistration.getCurrentGradeNum());
         student.setCurrentClass(studentRegistration.getCurrentClass());
+        student.setSubjectIdList(studentRegistration.getSubjectId() + "");
         studentDao.update(student);
 
         if (updateNameFlag) {

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

@@ -648,6 +648,15 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                     subjectChangeDao.update(change);
                 }
             }
+            
+            //更新学生声部
+            Student student = studentDao.get(userId);
+            if(student == null){
+            	throw new BizException("学生[{}]信息查询失败", userId);
+            }
+            student.setSubjectIdList(subjectChange.getChangeSubjectId() + "");
+            student.setUpdateTime(nowDate);
+            studentDao.update(student);
 
             //乐保处理
             studentInstrumentService.subjectChangeUpdateInstrument(subjectChange);

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

@@ -314,6 +314,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if (Objects.equals(messageSender.getSendMode(), "EMAIL")) {
 			Integer userId = receivers.keySet().stream().findFirst().orElse(-1);
 			loadEmailInfo(userId);
+			LOGGER.info("batch 发送邮件 {} ", userId);
 		}
 		if(StringUtils.isNotEmpty(jpushType) && jpushType == "STUDENT"){
 			//如果不是缴费信息
@@ -345,6 +346,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if (messageConfig == null) {
 			throw new BizException("消息类型错误");
 		}else if(messageConfig.getSendFlag() == null || messageConfig.getSendFlag() == 0){
+			LOGGER.error("batch 发送标志为空" );
 			return;
 		}
 		Date date = new Date();
@@ -374,13 +376,13 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		} else if (messageSender.getSendMode().equals("EMAIL")) {
 			mode = MessageSendMode.EMAIL;
 		}
+		LOGGER.info("batch 添加消息");
 		addMessage(receivers, messageConfig.getDescription(), MessageFormatter.arrayFormat(messageConfig.getContent(), args), triggerTime, mode, status, errorMsg, readStatus,
 				url, messageConfig.getGroup(),jpushType);
 		TenantContextHolder.clearTenantId();
 	}
 
 
-
 	@Override
 	@Async
 	public void batchPushMessage(MessageTypeEnum type, Map<Integer, String> receivers, Date triggerTime, Integer readStatus,
@@ -477,21 +479,31 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			mode = MessageSendMode.PUSH;
 		} else if (messageSender.getSendMode().equals("EMAIL")) {
 			mode = MessageSendMode.EMAIL;
+			LOGGER.info("发送邮件 {} ");
 		}
 		Map<Integer, String> receivers = new HashMap<Integer, String>();
 		receivers.put(userId, receiver);
+		LOGGER.info("添加消息 {} ", title);
 		addMessage(receivers, title, content, triggerTime, mode, status, errorMsg, readStatus, url, null,jpushType);
 	}
 
 	private void loadEmailInfo(Integer userId) {
 		SysUser user = sysUserFeignService.queryUserById(userId);
-		SysEmail email1 = sysEmailService.getOne(new WrapperUtil<SysEmail>().hasEq("tenant_id_", user.getTenantId()).queryWrapper());
-		messageSenderPluginContext.sysEmail.setHostName(email1.getHostName());
-		messageSenderPluginContext.sysEmail.setSmtpPort(email1.getSmtpPort());
-		messageSenderPluginContext.sysEmail.setUserName(email1.getUserName());
-		messageSenderPluginContext.sysEmail.setPassword(email1.getPassword());
-		messageSenderPluginContext.sysEmail.setFromName(email1.getFromName());
-		messageSenderPluginContext.sysEmail.setFrom(email1.getFrom());
+		if (user == null) {
+			LOGGER.error("用户Id {} 找不到用户", userId);
+			return;
+		}
+		try {
+			SysEmail email1 = sysEmailService.getOne(new WrapperUtil<SysEmail>().hasEq("tenant_id_", user.getTenantId()).queryWrapper());
+			messageSenderPluginContext.sysEmail.setHostName(email1.getHostName());
+			messageSenderPluginContext.sysEmail.setSmtpPort(email1.getSmtpPort());
+			messageSenderPluginContext.sysEmail.setUserName(email1.getUserName());
+			messageSenderPluginContext.sysEmail.setPassword(email1.getPassword());
+			messageSenderPluginContext.sysEmail.setFromName(email1.getFromName());
+			messageSenderPluginContext.sysEmail.setFrom(email1.getFrom());
+		} catch (Exception e) {
+		    LOGGER.error("设置邮件配置错误: {} " + e);
+		}
 	}
 
 	@Override

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

@@ -5,6 +5,8 @@ import org.apache.commons.mail.DefaultAuthenticator;
 import org.apache.commons.mail.Email;
 import org.apache.commons.mail.EmailException;
 import org.apache.commons.mail.SimpleEmail;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;
 
@@ -13,6 +15,8 @@ import com.ym.mec.thirdparty.message.MessageSenderPlugin;
 @Service
 public class CommEmailPlugin implements MessageSenderPlugin, InitializingBean {
 
+	private final static Logger log = LoggerFactory.getLogger(CommEmailPlugin.class);
+
 	private String hostName;
 
 	private int smtpPort;
@@ -88,6 +92,10 @@ public class CommEmailPlugin implements MessageSenderPlugin, InitializingBean {
 
 	@Override
 	public boolean send(String subject, String content, String receiver, String url, String jpushType, String sound, String channelId) throws Exception {
+		if (hostName == null || hostName.equals("")) {
+			log.error("邮件配置未能加载");
+			return false;
+		}
 		this.checkProperties();
 		Email email = new SimpleEmail();
 		email.setHostName(hostName);