修改消息弹窗出现的问题，修改邮件发送后的日志存储

liwei2917
1 parent 22c78bf4
Showing 5 changed files with 25 additions and 14 deletions
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/java/com/cnlive/shenhe/job/LiveApplyJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/EmailServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/CommonConst.java
src/main/resources/templates/common/head.html
@@ -131,10 +131,10 @@ public class UsersController {
         shyUser =usersService.select(shyUser);
         boolean isShow_chinnal=false;//是否显示频道消息框
         boolean isShow_liveApply=false;//是否显示直播申请消息框  
-        if(CommonUtils.isNotEmpty(shyUser.getNotice_show())&&shyUser.getNotice_show().contains("1")){
+        if(CommonUtils.isNotEmpty(shyUser.getNotice_show())&&shyUser.getNotice_show().contains(CommonConst.NOTICE_CHANNAL.toString())){
         	isShow_chinnal=true;
         }
-        if(CommonUtils.isNotEmpty(shyUser.getNotice_show())&&shyUser.getNotice_show().contains("2")){
+        if(CommonUtils.isNotEmpty(shyUser.getNotice_show())&&shyUser.getNotice_show().contains(CommonConst.NOTICE_LIVEAPPLY.toString())){
         	isShow_liveApply=true;
         }
         Map<String,Object> map=new HashMap<>();
@@ -93,17 +93,17 @@ public class LiveApplyJob {
         	String app_id = email_app_id; //开发者对应的id，与app_key相对应
         	String app_key = email_app_key; //开发者帐号对应的key. 请开发者谨慎保管此值。
         	String URL = email_send_URL;//调用邮件发送服务器的地址
-        	List<String> shyEmailList=emailServiceImpl.getEmailSendList(CommonConst.EMAIL_LIVEAPPLY);
+        	List<ShyEmail> shyEmailList=emailServiceImpl.getEmailSendList(CommonConst.EMAIL_LIVEAPPLY);
         	logger.info("直播申请邮件通知开始，共"+shyLiveApplyList.size()+"个申请，每个申请通知"+shyEmailList.size()+"个邮箱");
         	for(ShyLiveapply liveApply : shyLiveApplyList){
         		Integer notice_state = liveApply.getEmail_notice_state();//初始化通知状态
         		String notice_msg = liveApply.getEmail_notice_msg();//初始化通知消息
-        		for(String emailAddr:shyEmailList){//循环需要发送邮件的邮箱
+        		for(ShyEmail shyEmail:shyEmailList){//循环需要发送邮件的邮箱
         			String startTime=CommonUtils.formatDate(liveApply.getPre_start_time(), "yyyy-MM-dd HH:mm:ss");
         			String endTime=CommonUtils.isNotNull(liveApply.getPre_end_time())?CommonUtils.formatDate(liveApply.getPre_end_time(), "yyyy-MM-dd HH:mm:ss"):"待定";
         			String content = liveApply.getSender()+"__"+liveApply.getMobile()+"__"+liveApply.getOrganization()+"__"+liveApply.getTheme()+"__"+startTime+"__"+endTime+"__"+liveApply.getLive_place()+"__"+liveApply.getPush_url()+"__"+liveApply.getPull_url();
         			String dateTime=CommonUtils.getCurrentDate("yyyy-MM-dd HH:mm:ss");//获取一个格式化后的当前时间
-//        			String emailAddr = "642522156@qq.com";
+        			String emailAddr = shyEmail.getEmail();
         			String title = "新直播开播申请";
         			String templateId = "4017";
         			Map<String, String> params = new HashMap<>();
@@ -121,21 +121,21 @@ public class LiveApplyJob {
         				JSONObject result=JSONObject.parseObject(post.get("result"));
         				if (result == null) {
         					notice_state=CommonConst.NOTICE_FAIL;
-        					notice_msg=notice_msg+","+dateTime+" 邮件服务器调用失败,result为空";
+        					notice_msg=notice_msg+"\n"+dateTime+" 邮件服务器调用失败,result为空";
         					break;
         				}
         				Integer code = result.getInteger("errorCode");
         				if (code != 0) {
         					notice_state=CommonConst.NOTICE_FAIL;
-        					notice_msg=notice_msg+","+dateTime+" 邮件服务器调用失败,result返回消息为："+result.getString("errorMessage");
+        					notice_msg=notice_msg+"\n"+dateTime+" 邮件服务器调用失败,result返回消息为："+result.getString("errorMessage");
         					break;
         				}else{
         					notice_state=CommonConst.NOTICE_SUCCESS;
-        					notice_msg=notice_msg+","+dateTime+" 邮件"+emailAddr+"发送成功";
+        					notice_msg=notice_msg+"\n"+dateTime+" 邮件"+emailAddr+"("+shyEmail.getRemark()+")发送成功";
         				}
         			} catch (Exception e) {
         				notice_state=CommonConst.NOTICE_FAIL;
-        				notice_msg=notice_msg+","+dateTime+" 邮件服务器调用失败,服务器报错了";
+        				notice_msg=notice_msg+"\n"+dateTime+" 邮件服务器调用失败,服务器报错了";
         				break;
         			}
         		}
@@ -119,18 +119,18 @@ public class EmailServiceImpl {
 	 * @param emailSendType
 	 * @return
 	 */
-	public List<String> getEmailSendList(Integer emailSendType) {
+	public List<ShyEmail> getEmailSendList(Integer emailSendType) {
 		ShyEmail shyEmail= new ShyEmail();
 		shyEmail.setIs_delete(false);
 		shyEmail.setIs_enable(true);
 		List<ShyEmail> shyEmailList = shyEmailMapper.select(shyEmail);
-        List<String> emailList = new ArrayList<String>();
+        List<ShyEmail> emailList = new ArrayList<ShyEmail>();
         for (ShyEmail shyEmail2 : shyEmailList) {
             if (CommonUtils.isNotEmpty(shyEmail2.getNotice_type())) {
                 String[] business = shyEmail2.getNotice_type().split(",");
                 List<String> asList = Arrays.asList(business);
                 if (asList.contains(emailSendType + "")) {
-                	emailList.add(shyEmail2.getEmail());
+                	emailList.add(shyEmail2);
                 }
             }
         }
@@ -103,6 +103,17 @@ public class CommonConst {
     //白名单设置
     public static JSONObject BUSINESS = JSONObject.parseObject("{\"1\":\"点播业务\",\"2\":\"评论业务\",\"3\":\"图文业务\",\"4\":\"频道业务\",\"5\":\"直播申请业务\"}");
+    
+    /**
+     * 弹窗消息：频道
+     */
+    public static Integer NOTICE_CHANNAL = 1;
+    
+    /**
+     * 弹窗消息：直播申请
+     */
+    public static Integer NOTICE_LIVEAPPLY = 2;
+    
     //通知消息设置
     public static JSONObject NOTICE = JSONObject.parseObject("{\"1\":\"频道通知\",\"2\":\"直播申请通知\"}");
@@ -133,7 +133,7 @@
   			 	},1000); 
 	});
-	function notice_liveApply(){ 
+	function notice_channel(){ 
 		$.ajax({
 			type:'get',
 			dataType:'json',
@@ -146,7 +146,7 @@
 			}
 		});
 	} 
-	function notice_channel(){ 
+	function notice_liveApply(){ 
 		$.ajax({
 			type:'get',
 			dataType:'json',