Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/courses_controller.rb

@@ -132,7 +132,6 @@ class CoursesController < ApplicationController
       tip_exception(404, "找不到资源") if video.blank?
       tip_exception(403, "...") unless (video.user_id == current_user.id || current_user.admin_or_business?)
       video.destroy!
-      AliyunVod::Service.delete_video([video.uuid]) rescue nil
     end
 
     render_ok

app/controllers/users/videos_controller.rb

@@ -26,7 +26,6 @@ class Users::VideosController < Users::BaseController
     return render_error('该状态下不能删除视频') unless video.pending?
 
     video.destroy!
-    AliyunVod::Service.delete_video([video.uuid]) rescue nil
 
     render_ok
   end
@@ -60,8 +59,6 @@ class Users::VideosController < Users::BaseController
 
     video.destroy!
 
-    AliyunVod::Service.delete_video([video.uuid]) rescue nil
-
     render_ok
   end
 

app/controllers/weapps/courses_controller.rb

@@ -1,4 +1,6 @@
 class Weapps::CoursesController < Weapps::BaseController
+  include CustomSortable
+
   before_action :require_login
   before_action :set_course, except: [:create, :check_invite_code]
   before_action :user_course_identity, except: [:basic_info, :create, :check_invite_code]

app/libs/aliyun_vod/service/video_manage.rb

@@ -35,7 +35,9 @@ module AliyunVod::Service::VideoManage
     }.merge(base_params)
 
     result = request(:post, params)
+    Rails.logger.info("#######:#{result['Mezzanine']['VideoStreamList'][0]['CodecName']}")
     result['Mezzanine']['VideoStreamList'][0]['CodecName']
+
   rescue => e
     Rails.logger.info "读取视频编码信息失败: #{video_id}, #{e.message}"
   end

app/models/video.rb

@@ -1,6 +1,13 @@
 class Video < ApplicationRecord
   include AASM
 
+  alias_method :hard_destroy, :destroy
+  default_scope -> { where(delete_state: nil) }
+  scope :deleted, -> { unscope(where: :delete_state).where.not(delete_state: nil) }
+
+  BEGIN_DELETE = 1 # 标记软删除
+  FINISH_DELETE = 2 # 视频资源完成删除
+
   # 标准视频转码组
   NORMAL_TRANSCODE_GROUP_ID = 'a0277c5c0c7458458e171b0cee6ebf5e'
 
@@ -41,4 +48,17 @@ class Video < ApplicationRecord
   def video_play_duration
     (play_duration / (60*60.0)).ceil
   end
+
+  def destroy
+    run_callbacks(:destroy) do
+      if persisted?
+        update_column(:delete_state, Video::BEGIN_DELETE)
+        AliyunVod::Service.delete_video([self.uuid])
+      end
+
+      @destroyed = true
+    end
+    freeze
+  end
+
 end

app/services/videos/batch_publish_service.rb

@@ -32,8 +32,10 @@ class Videos::BatchPublishService < ApplicationService
         # 标清转码为h264
         if AliyunVod::Service.get_meta_code_info(video.uuid).start_with?('h264', 'h265')
           video.transcoded = true
-          result = AliyunVod::Service.get_play_info(video.uuid)
+          #Rails.logger.info("####video.uuid:#{video.uuid}")
-          video.play_url = result['PlayInfoList']['PlayInfo'][0]['PlayURL']
+          #result = AliyunVod::Service.get_play_info(video.uuid)
+         # Rails.logger.info("####video.result:#{result}")
+          #video.play_url = result['PlayInfoList']['PlayInfo'][0]['PlayURL']
         else
           AliyunVod::Service.submit_transcode_job(video.uuid, Video::NORMAL_TRANSCODE_GROUP_ID)
         end

app/services/videos/dispatch_callback_service.rb

@@ -18,11 +18,14 @@ class Videos::DispatchCallbackService < ApplicationService
       video.save!
     when 'SnapshotComplete' then # 封面截图完成
       return if video.cover_url.present?
-
+      result = AliyunVod::Service.get_play_info(video.uuid) rescue nil
-      video.update!(cover_url: params['CoverUrl'])
+      play_url = result['PlayInfoList']['PlayInfo'][0]['PlayURL'] if result
+      video.update!(cover_url: params['CoverUrl'], play_url: play_url)
     when 'StreamTranscodeComplete' then # 转码完成
-      return if video.play_url.present?
+      #return if video.play_url.present?
       video.update!(play_url: params['FileUrl'], transcoded: true)
+    when 'DeleteMediaComplete' #完成云端视频删除
+      video.update_column(:delete_state, Video::FINISH_DELETE)
     end
 
   rescue => ex

app/views/weapps/courses/course_videos.json.jbuilder

@@ -1,4 +1,4 @@
 json.count @count
 json.videos @videos do |video|
-    json.partial! 'users/videos/video', locals: { video: video.video }
+    json.partial! 'users/videos/video', locals: { video: video }
 end

db/migrate/20200310080919_add_delete_state_to_video.rb

@@ -0,0 +1,6 @@
+class AddDeleteStateToVideo < ActiveRecord::Migration[5.2]
+  def change
+    add_column :videos, :delete_state, :integer
+    add_index :videos, :delete_state
+  end
+end

public/react/scripts/build.js

@@ -191,7 +191,8 @@ function generateNewIndexJsp() {
     if (err) {
       return console.log(err);
     }
-    const newVersion = '1.1.1'
+    const newVersion  = Date.parse(new Date());
+
     let cdnHost = 'https://shixun.educoder.net'
     cdnHost = 'https://ali-cdn.educoder.net'
     cdnHost = ''

public/react/src/modules/courses/Resource/index.js

@@ -101,36 +101,43 @@ class Fileslists extends Component{
 		}
 	}
   componentDidUpdate = (prevProps) => {
-    if(prevProps.match.params.main_id != this.props.match.params.main_id){
+
-			this.getcourse_groupslists()
+    if(prevProps.coursesidtype!=this.props.coursesidtype||prevProps.match.params.main_id!=this.props.match.params.main_id||prevProps.match.params.Id!=this.props.match.params.Id){
-			this.setState({
+
-				isSpin:true,
+
-				checkBoxValues:[],
+      if(this.props.match.params.main_id){
-				checkAllValue:false,
+        this.getcourse_groupslists()
-			})
+        this.setState({
-      if(this.props.match.params.main_id!=undefined){
+          isSpin:true,
-				this.setState({
+          checkBoxValues:[],
-					child:false,
+          checkAllValue:false,
-					sort:"desc"
+        })
-				})
+        if(this.props.match.params.main_id!=undefined){
-        this.seactall(undefined,"desc");
+          this.setState({
+            child:false,
+            sort:"desc"
+          })
+          this.seactall(undefined,"desc");
+        }
       }
-    }
+
-    if(prevProps.match.params.Id != this.props.match.params.Id){
+      if(this.props.match.params.Id){
-			this.getcourse_groupslists()
+        this.getcourse_groupslists()
-			this.setState({
+        this.setState({
-				isSpin:true,
+          isSpin:true,
-				checkBoxValues:[],
+          checkBoxValues:[],
-				checkAllValue:false,
+          checkAllValue:false,
-			})
+        })
-      if(this.props.match.params.Id!=undefined){
+        if(this.props.match.params.Id!=undefined){
-				this.setState({
+          this.setState({
-					child:true,
+            child:true,
-					sort:"desc"
+            sort:"desc"
-				})
+          })
-        this.seactall(parseInt(this.props.match.params.Id),"desc")
+          this.seactall(parseInt(this.props.match.params.Id),"desc")
+        }
       }
     }
+
   }
 
   updadatalist=(id)=>{
@@ -916,7 +923,7 @@ class Fileslists extends Component{
 							{
 								`
 								 .filesnameslist{
-										max-width: 200px;
+										max-width: 370px;
 										overflow: hidden;
 										text-overflow: ellipsis;
 										white-space: nowrap;

public/react/src/modules/courses/Video/MoveBox.js

@@ -53,12 +53,21 @@ class MoveBox extends Component{
       video_ids:[id],
       new_category_id:selectSubId
     }).then(result=>{
+
       if(result){
+
         const { setMoveVisible , successFunc , updataleftNavfun} = this.props;
         updataleftNavfun && updataleftNavfun();
         setMoveVisible && setMoveVisible(false);
         successFunc && successFunc();
-      }
+
+	      try {
+					this.props.showNotification(result.data.message);
+				}catch (e) {
+
+				}
+
+			}
     }).catch(error=>{
       console.log(error);
     })
@@ -69,7 +78,7 @@ class MoveBox extends Component{
     const { data , selectSubId } = this.state;
 
     let list = data && data.course_second_categories && data.course_second_categories.length>0?data.course_second_categories:undefined;
-    
+
     return(
       <Modal
         visible={visible}
@@ -125,4 +134,4 @@ class MoveBox extends Component{
     )
   }
 }
-export default MoveBox;
+export default MoveBox;

public/react/src/modules/courses/busyWork/CommonWorkList.js

@@ -295,9 +295,11 @@ function buildColumns(that, student_works, studentData) {
       key: 'user_comment_count',
       dataIndex: 'user_comment_count',
 
-      render: (student_score, record) => (
+      render: (user_comment_count, record) => (
         <span  style={{color:'#989898', cursor: 'default'}}>
-          {record.user_comment_count}
+           <Tooltip title={"在匿评期间评阅的作品数量"}>
+             {record.user_comment_count}
+            </Tooltip>
       </span>
       ),
     })
@@ -690,7 +692,7 @@ class CommonWorkList extends Component{
 
       id, user_name, user_login, student_id, group_name, work_status, update_time, teacher_score, teaching_asistant_score, student_score,
 			ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count,
-      late_penalty, absence_penalty, appeal_penalty
+      late_penalty, absence_penalty, appeal_penalty,user_comment_count
 
 			, end_immediately, publish_immediately
       , homework_id, visible, work_group, project_info, is_leader
@@ -740,7 +742,7 @@ class CommonWorkList extends Component{
     }else{
       StudentData=isStudent ? [{ id, user_name, user_login, student_id, group_name, work_status, update_time, teacher_score, teaching_asistant_score, student_score,
       ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count,
-      late_penalty, absence_penalty, appeal_penalty, project_info, is_leader,
+      late_penalty, absence_penalty, appeal_penalty, project_info, is_leader,user_comment_count,
       work_group, isMine: true }] : []
     }
     const columns = buildColumns(this, student_works, StudentData)
@@ -773,7 +775,7 @@ class CommonWorkList extends Component{
 
     const hasData = this.state.homework_status && this.state.homework_status.indexOf("未发布") == -1 // student_works && !!student_works.length && page == 1 &&
 
-		// console.log(StudentData)
+	   console.log(StudentData)
 		// console.log(student_works)
     return(
       <React.Fragment>

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -548,7 +548,11 @@ class Coursesleftnav extends Component{
 							description:result.data.message
 						});
 
-
+						if(positiontype==="shixun_homeworks"){
+              this.updasaveNavmoda()
+              trigger('updateNavSuccess')
+              this.props.history.push(`/classrooms/${coursesId}/shixun_homework/${result.data.category_id}`);
+            }
 						if(positiontype==="files"){
               this.updasaveNavmoda()
               trigger('updateNavSuccess')
@@ -561,7 +565,7 @@ class Coursesleftnav extends Component{
 							this.props.history.push(`/classrooms/${coursesId}/boards/${result.data.category_id}`);
 						}
 
-            if(positiontype!="course_groups"){
+            if(positiontype!="course_groups"&&positiontype!="shixun_homeworks"){
               this.updasaveNavmoda()
             }
 

public/react/src/modules/courses/shixunHomework/shixunHomework.js

@@ -146,27 +146,31 @@ class ShixunHomework extends Component{
 
   componentDidUpdate = (prevProps) => {
 
-    if(prevProps.match.params.main_id != this.props.match.params.main_id){
+    if(prevProps.coursesidtype!=this.props.coursesidtype||prevProps.match.params.main_id!=this.props.match.params.main_id||prevProps.match.params.category_id!=this.props.match.params.category_id) {
-      if(this.props.match.params.main_id!=undefined){
+
-      	this.setState({
+      if(this.props.match.params.main_id){
-					checkedtype:false,
+        if(this.props.match.params.main_id!=undefined){
-					orders:"8",
+          this.setState({
-					order:undefined,
+            checkedtype:false,
-					page:1
+            orders:"8",
-				})
+            order:undefined,
-        this.seactall();
+            page:1
+          })
+          this.seactall();
+        }
       }
-    }
+      if(this.props.match.params.category_id){
-    if(prevProps.match.params.category_id != this.props.match.params.category_id){
+        if(this.props.match.params.category_id!=undefined){
-      if(this.props.match.params.category_id!=undefined){
+          this.setState({
-				this.setState({
+            checkedtype:false,
-					checkedtype:false,
+            orders:"8",
-					orders:"8",
+            order:undefined,
-					order:undefined,
+            page:1
-					page:1
+          })
-				})
+          this.seactall(parseInt(this.props.match.params.category_id))
-        this.seactall(parseInt(this.props.match.params.category_id))
+        }
       }
+
     }
 
   }