直播申请审核增加拉流来源

liwei2917
1 parent 2d210fbb
Showing 4 changed files with 31 additions and 3 deletions
src/main/java/com/cnlive/shenhe/api/LiveApplyControllerApi.java
src/main/java/com/cnlive/shenhe/entity/ShyLiveapply.java
src/main/java/com/cnlive/shenhe/job/LiveApplyJob.java
src/main/resources/mapper/ShyLiveapplyMapper.xml
@@ -69,6 +69,7 @@ public class LiveApplyControllerApi {
         String livePlace = json.getString("livePlace");//直播地点
         String pushUrl = json.getString("pushUrl");//推流地址
         String pullUrl = json.getString("pullUrl");//拉流地址
+        String pullSource = json.getString("pullSource");//拉流来源
         String platforms = json.getString("platforms");//播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
         String startTime = json.getString("preStartTime");//预计开始时间
         Date timestamp_start =null;
@@ -104,6 +105,7 @@ public class LiveApplyControllerApi {
         	shyliveApply.setLive_place(livePlace);//直播地点
         	shyliveApply.setPush_url(pushUrl);//推流地址
         	shyliveApply.setPull_url(pullUrl);//拉流地址
+        	shyliveApply.setPull_source(pullSource);//拉流来源
         	shyliveApply.setPlatforms(platforms);//播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
         	shyliveApply.setCallback(callback);//设置回调地址
         	shyliveApply.setReceive(CommonConst.RECEIVE_BEFORE);
@@ -133,6 +135,7 @@ public class LiveApplyControllerApi {
         	shyliveApply1.setLive_place(livePlace);//直播地点
         	shyliveApply1.setPush_url(pushUrl);//推流地址
         	shyliveApply1.setPull_url(pullUrl);//拉流地址
+        	shyliveApply1.setPull_source(pullSource);//拉流来源
         	shyliveApply1.setPlatforms(platforms);//播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
         	shyliveApply1.setCallback(callback);//设置回调地址
         	liveApplyServiceImpl.getShenheType(shyliveApply1);//获取审核类型
@@ -92,6 +92,11 @@ public class ShyLiveapply {
     private String pull_url;
  
     /**
+     * 拉流来源
+     */
+    private String pull_source;
+
+    /**
      * 播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
      */
     private String platforms;
@@ -466,6 +471,24 @@ public class ShyLiveapply {
     }
  
     /**
+     * 获取拉流来源
+     *
+     * @return pull_source - 拉流来源
+     */
+    public String getPull_source() {
+        return pull_source;
+    }
+
+    /**
+     * 设置拉流来源
+     *
+     * @param pull_source 拉流来源
+     */
+    public void setPull_source(String pull_source) {
+        this.pull_source = pull_source;
+    }
+
+    /**
      * 获取播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
      *
      * @return platforms - 播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
@@ -97,6 +97,7 @@ public class LiveApplyJob {
         	List<ShyEmail> shyEmailList=emailServiceImpl.getEmailSendList(CommonConst.EMAIL_LIVEAPPLY);
         	logger.info("直播申请邮件通知开始，共"+shyLiveApplyList.size()+"个申请，每个申请通知"+shyEmailList.size()+"个邮箱");
         	for(ShyLiveapply liveApply : shyLiveApplyList){
+        		logger.info("当前发送邮件的直播申请id为："+liveApply.getId());
         		Integer notice_state = liveApply.getEmail_notice_state();//初始化通知状态
         		String notice_msg = liveApply.getEmail_notice_msg();//初始化通知消息
         		//显示spid简称
@@ -107,7 +108,7 @@ public class LiveApplyJob {
         		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 content = liveApply.getSender()+"__"+liveApply.getMobile()+"__"+liveApply.getOrganization()+"__"+liveApply.getTheme()+"__"+startTime+"__"+endTime+"__"+liveApply.getLive_place()+"__"+liveApply.getPush_url()+"__"+liveApply.getPull_source()+","+liveApply.getPull_url();
         			String dateTime=CommonUtils.getCurrentDate("yyyy-MM-dd HH:mm:ss");//获取一个格式化后的当前时间
         			String emailAddr = shyEmail.getEmail();
         			String title = liveApply.getSpid_desc()+"新直播开播申请";
@@ -123,7 +124,7 @@ public class LiveApplyJob {
         			httpUtil.setParamMap(params);
         			try {
         				Map<String, String> post = httpUtil.post(URL);
-        				logger.info(post.get("result"));
+        				logger.info("当前发送邮件用户为："+emailAddr+",发送邮件的直播申请审核云id为："+liveApply.getId()+"结果为："+post.get("result"));
         				JSONObject result=JSONObject.parseObject(post.get("result"));
         				if (result == null) {
         					notice_state=CommonConst.NOTICE_FAIL;
@@ -22,6 +22,7 @@
     <result column="live_place" jdbcType="VARCHAR" property="live_place" />
     <result column="push_url" jdbcType="VARCHAR" property="push_url" />
     <result column="pull_url" jdbcType="VARCHAR" property="pull_url" />
+    <result column="pull_source" jdbcType="VARCHAR" property="pull_source" />
     <result column="platforms" jdbcType="VARCHAR" property="platforms" />
     <result column="callback" jdbcType="VARCHAR" property="callback" />
     <result column="shenhe_type" jdbcType="INTEGER" property="shenhe_type" />
@@ -31,9 +32,9 @@
     <result column="auditor" jdbcType="VARCHAR" property="auditor" />
     <result column="shenhe_msg" jdbcType="VARCHAR" property="shenhe_msg" />
     <result column="email_notice_state" jdbcType="INTEGER" property="email_notice_state" />
-    <result column="email_notice_msg" jdbcType="VARCHAR" property="email_notice_msg" />
     <result column="created_at" jdbcType="TIMESTAMP" property="created_at" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updated_at" />
     <result column="simple_content" jdbcType="LONGVARCHAR" property="simple_content" />
+    <result column="email_notice_msg" jdbcType="LONGVARCHAR" property="email_notice_msg" />
   </resultMap>
 </mapper>
 \ No newline at end of file