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

app/controllers/attachments_controller.rb

@@ -25,7 +25,8 @@ class AttachmentsController < ApplicationController
     # 2. 上传到云
     upload_file = params["file"] || params["#{params[:file_param_name]}"] # 这里的file_param_name是为了方便其他插件名称
     uid_logger("#########################file_params####{params["#{params[:file_param_name]}"]}")
-    if upload_file
+    raise "未上传文件" unless upload_file
+
     folder = edu_setting('attachment_folder')
     raise "存储目录未定义" unless folder.present?
 
@@ -51,7 +52,7 @@ class AttachmentsController < ApplicationController
                                    author_id: current_user.id,
                                    cloud_url: remote_path).first
 
-      unless @attachment.present?
+    if @attachment.blank?
       @attachment = Attachment.new
       @attachment.filename = upload_file.original_filename
       @attachment.disk_filename = local_path[save_path.size + 1, local_path.size]
@@ -67,9 +68,6 @@ class AttachmentsController < ApplicationController
     end
 
     render_json
-    else
-      raise "未上传文件"
-    end
   end
 
   def destroy

app/controllers/boards_controller.rb

@@ -9,15 +9,10 @@ class BoardsController < ApplicationController
   end
 
   def show
-
-  end
-
-  def new
   end
 
   def create
     ActiveRecord::Base.transaction do
-      begin
       board = @course.course_board
       new_board = Board.new(board_params)
       new_board.course_id = @course.id
@@ -25,30 +20,28 @@ class BoardsController < ApplicationController
       new_board.parent_id = board.try(:id)
       new_board.position = board.children.count + 1
       new_board.save!
-        normal_status(0, "添加成功")
-      rescue Exception => e
-        uid_logger_error(e.message)
-        tip_exception(e.message)
-        raise ActiveRecord::Rollback
-      end
     end
+
+    normal_status(0, "添加成功")
   end
 
   # 子目录的拖动
   def move_category
     tip_exception("移动失败") if params[:position].blank?
-    unless params[:position].to_i == @board.position
+    return normal_status(-1, "位置没有变化") if params[:position].to_i == @board.position
+
     course_board = @course.course_board
+    ActiveRecord::Base.transaction do
       if params[:position].to_i < @board.position
-        course_board.children.where("position < #{@board.position} and position >= ?", params[:position]).update_all("position = position + 1")
+        course_board.children.where("position < ? and position >= ?", @board.position, params[:position])
+          .update_all("position = position + 1")
       else
-        course_board.children.where("position > #{@board.position} and position <= ?", params[:position]).update_all("position = position - 1")
+        course_board.children.where("position > ? and position <= ?", @board.position, params[:position])
+          .update_all("position = position - 1")
       end
       @board.update_attributes(position: params[:position])
-      normal_status(0, "移动成功")
-    else
-      normal_status(-1, "位置没有变化")
     end
+    normal_status(0, "移动成功")
   end
 
   def destroy

app/controllers/exercises_controller.rb

@@ -12,10 +12,10 @@ class ExercisesController < ApplicationController
   before_action :get_exercise_question_counts,only: [:show,:edit,:start_answer,:review_exercise,:blank_exercise,:export_exercise]
   before_action :validate_publish_time,only: [:commit_setting] #提交设置时，需判断时间是否符合
   before_action :check_course_public,only: [:set_public]
-  before_action :check_user_on_answer,only: [:show,:start_answer,:commit_exercise,:exercise_lists] #判断当前用户在试卷的权限/老师是否属于分班的权限
+  before_action :check_user_on_answer,only: [:show,:start_answer,:exercise_lists] #判断当前用户在试卷的权限/老师是否属于分班的权限
   before_action :only_student_in,only: [:start_answer]
   before_action :check_user_id_start_answer,only: [:start_answer,:review_exercise]
-  before_action :commit_user_exercise,only: [:start_answer,:exercise_lists,:review_exercise]   #判断试卷时间到用户是否提交
+  # before_action :commit_user_exercise,only: [:start_answer,:exercise_lists,:review_exercise]   #已有定时的任务
   before_action :check_exercise_time,only: [:commit_exercise] #提交试卷时，判断时间是否超过
   before_action :check_exercise_status,only: [:redo_modal,:redo_exercise]
   before_action :check_exercise_is_end, only: [:review_exercise]
@@ -1006,6 +1006,7 @@ class ExercisesController < ApplicationController
   def start_answer
     ActiveRecord::Base.transaction do
       begin
+        @exercise_user_current = @exercise.exercise_users.exercise_commit_users(@exercise_current_user_id)&.first
         if @exercise_user_current.blank?
           if @user_course_identity > Course::ASSISTANT_PROFESSOR  #当为老师的时候，不创建exercise_user表，理论上老师是不能进入答题的
             exercise_user_params = {
@@ -1640,38 +1641,38 @@ class ExercisesController < ApplicationController
   end
 
   def check_exercise_time
-    @answer_committed_user = @exercise.exercise_users.exercise_commit_users(current_user.id).first
+    @answer_committed_user = @exercise.exercise_users.exercise_commit_users(current_user.id)&.first
     if @answer_committed_user.blank?
       normal_status(404,"答题用户不存在")
-    elsif @exercise.get_exercise_status(current_user.id) != 2 || @answer_committed_user.commit_status == 1   #
-      normal_status(-1,"提交错误,试卷已截止/用户已提交！")
-    end
-  end
-
-  def commit_user_exercise
-    @exercise_user_current = @exercise.exercise_users.exercise_commit_users(@exercise_current_user_id).first  #查找当前用户是否有过答题
-    if @user_course_identity == Course::STUDENT
-      if @exercise_user_current.present?
-        if @exercise.time > 0 && @exercise_user_current.start_at.present?  && (@exercise_user_current.commit_status == 0) &&
-            ((@exercise_user_current.start_at + (@exercise.time.to_i + 1).minutes) < Time.now)
-          #当前用户存在，且已回答，且试卷时间已过，且未提交，则自动提交。最好是前端控制
-          objective_score = calculate_student_score(@exercise,current_user)[:total_score]
-          subjective_score = @exercise_user_current.subjective_score < 0.0 ? 0.0 : @exercise_user_current.subjective_score
-          total_score = objective_score + subjective_score
-          commit_option = {
-              :status => 1,
-              :commit_status => 1,
-              :end_at => Time.now,
-              :objective_score => objective_score,
-              :score => total_score,
-              :subjective_score => subjective_score
-          }
-          @exercise_user_current.update_attributes(commit_option)
-          normal_status(0,"已交卷成功！")
-        end
-      end
-    end
-  end
+    # elsif @exercise.get_exercise_status(current_user.id) == 2 && @answer_committed_user.commit_status == 1  #当试卷截止时，会自动提交
+    #   normal_status(-1,"提交错误,试卷用户已提交！")
+    end
+  end
+
+  # def commit_user_exercise
+  #   @exercise_user_current = @exercise.exercise_users.exercise_commit_users(@exercise_current_user_id)&.first  #查找当前用户是否有过答题
+  #   if @user_course_identity == Course::STUDENT
+  #     if @exercise_user_current.present?
+  #       if @exercise.time > 0 && @exercise_user_current.start_at.present?  && (@exercise_user_current.commit_status == 0) &&
+  #           ((@exercise_user_current.start_at + (@exercise.time.to_i + 1).minutes) < Time.now)
+  #         #当前用户存在，且已回答，且试卷时间已过，且未提交，则自动提交。最好是前端控制
+  #         objective_score = calculate_student_score(@exercise,current_user)[:total_score]
+  #         subjective_score = @exercise_user_current.subjective_score < 0.0 ? 0.0 : @exercise_user_current.subjective_score
+  #         total_score = objective_score + subjective_score
+  #         commit_option = {
+  #             :status => 1,
+  #             :commit_status => 1,
+  #             :end_at => Time.now,
+  #             :objective_score => objective_score,
+  #             :score => total_score,
+  #             :subjective_score => subjective_score
+  #         }
+  #         @exercise_user_current.update_attributes(commit_option)
+  #         normal_status(0,"已交卷成功！")
+  #       end
+  #     end
+  #   end
+  # end
 
   #打回重做时的初步判断
   def check_exercise_status

app/controllers/homework_commons_controller.rb

@@ -134,7 +134,7 @@ class HomeworkCommonsController < ApplicationController
           @student_works = []
         end
       elsif @user_course_identity < Course::STUDENT
-        @student_works = @homework.teacher_works(@current_user.id)
+        @student_works = @homework.teacher_works(@member)
         @all_member_count = @student_works.count
       elsif @user_course_identity > Course::STUDENT && @homework.work_public
         @student_works = student_works

app/controllers/messages_controller.rb

@@ -43,9 +43,15 @@ class MessagesController < ApplicationController
     @page_size = params[:page_size] || 10
     @current_user = current_user || nil
 
-    @messages = @message.children.preload_messages
+    @messages = @message.children.preload_messages.includes(:message_detail, :praise_treads)
     @messages = @messages.ordered(sort: 1) unless @message.parent_id.nil?
 
+    @user_course_identity = current_user.course_identity(@message.board.course)
+    case @user_course_identity
+    when 5, 6, 7
+      @messages = @messages.visible
+    end
+
     @messages = @messages.page(@page).per(@page_size)
   end
 

app/controllers/poll_questions_controller.rb

@@ -197,22 +197,22 @@ class PollQuestionsController < ApplicationController
       begin
         opr = params[:opr]
         current_q_p = @poll_question.question_number.to_i  #问题的当前位置
-        last_q_p = @poll.poll_questions.last_poll(current_q_p)  #当前问题的前一个问题
-        next_q_p = @poll.poll_questions.next_poll(current_q_p)  # 当前问题的后一个问题
         if @poll.polls_status.to_i == 1
           if opr.present?
             if opr.to_s == "up"
+              last_q_p = @poll.poll_questions.last_poll(current_q_p)  #当前问题的前一个问题
               if last_q_p.present?
-                @poll_question.update_attribute(:question_number, (current_q_p - 1))
-                last_q_p.update_attribute(:question_number, (@poll_question.question_number.to_i + 1)) # 重新获取当前问题的位置
+                last_q_p.update_attribute("question_number", current_q_p) # 重新获取当前问题的位置
+                @poll_question.update_attribute("question_number", (current_q_p - 1))
                 normal_status(0, "问题上移成功！")
               else
                 normal_status(-1, "移动失败，已经是第一个问题了！")
               end
             elsif opr.to_s == "down"
+              next_q_p = @poll.poll_questions.next_poll(current_q_p)  #当前问题的后一个问题
               if next_q_p.present?
-                @poll_question.update_attribute(:question_number, (current_q_p + 1))
-                next_q_p.update_attribute(:question_number, (@poll_question.question_number.to_i - 1))
+                next_q_p.update_attribute("question_number", current_q_p)
+                @poll_question.update_attribute("question_number", (current_q_p + 1))
                 normal_status(0, "问题下移成功！")
               else
                 normal_status(-1, "移动失败，已经是最后一个问题了！")

app/controllers/poll_votes_controller.rb

@@ -123,7 +123,7 @@ class PollVotesController < ApplicationController
     if @poll_question.blank?
       normal_status(-1,"问卷试题不存在！")
     else
-      @poll = @poll_question.poll.includes(:poll_users)
+      @poll = @poll_question.poll
       @course = @poll.course
       if @poll.blank?
         normal_status(-1,"问卷不存在！")
@@ -134,17 +134,11 @@ class PollVotesController < ApplicationController
   end
 
   def check_answer_in_question
-    # poll_answer_ids = @poll_question.poll_answers.pluck(:id)
-    # if @poll_question.question_type == 1   #单选题/多选题
-    #   unless (params[:poll_answer_id].present? && poll_answer_ids.include?(params[:poll_answer_id].to_i)) || (params[:poll_answer_id].blank? && params[:vote_text].present?)
-    #     normal_status(-1, "答案ID错误！")
-    #   end
-    # end
     poll_user_status = @poll.get_poll_status(current_user.id)
     poll_user = @poll.poll_users.find_by(user_id: current_user.id) #当前用户
 
     question_type = @poll_question&.question_type
-    if [1,2].include?(question_type) && params[:poll_answer_id].blank?
+    if (question_type == 1) && params[:poll_answer_id].blank?
       normal_status(-1,"答案ID错误!")
     elsif question_type == 2
       user_vote_count = params[:poll_answer_id].size
@@ -153,10 +147,10 @@ class PollVotesController < ApplicationController
       else
         question_max_choices = 0
       end
-      if question_max_choices > 0 && user_vote_count > question_max_choices
+      if question_max_choices > 0 && (user_vote_count > question_max_choices)
         normal_status(-1,"多选题答案超过最大限制！")
       end
-    elsif (poll_user.present? && poll_user&.commit_status) || poll_user_status == 3
+    elsif (poll_user.present? && poll_user.commit_status == 1) || poll_user_status == 3
       normal_status(-1,"已提交/已结束的问卷不允许修改！")
     end
   end

app/helpers/courses_helper.rb

@@ -247,15 +247,15 @@ module CoursesHelper
   def left_group_info course
     group_info = []
     if course.course_groups_count > 0
+      none_group_count = course.students.where(course_group_id: 0).size
+      group_info << {category_id: 0, category_name: "未分班", position: course.course_groups.pluck(:position).max.to_i + 1,
+                     category_count: none_group_count, category_type: false,
+                     second_category_url: "/courses/#{@course.id}/course_groups/0"}
       course.course_groups.each do |course_group|
         group_info << {category_id: course_group.id, category_name: course_group.name, position: course_group.position,
                        category_count: course_group.course_members_count, category_type: false,
                        second_category_url: "/courses/#{@course.id}/course_groups/#{course_group.id}"}
       end
-      none_group_count = course.students.where(course_group_id: 0).size
-      group_info << {category_id: 0, category_name: "未分班", position: course.course_groups.pluck(:position).max.to_i + 1,
-                     category_count: none_group_count, category_type: false,
-                     second_category_url: "/courses/#{@course.id}/course_groups/0"}
     end
     group_info
   end

app/helpers/exercises_helper.rb

@@ -353,7 +353,8 @@ module ExercisesHelper
     score5 = 0.0  #实训题
     ques_stand = []  #问题是否正确
     exercise_questions = exercise.exercise_questions.includes(:exercise_answers,:exercise_shixun_answers,:exercise_standard_answers,:exercise_shixun_challenges)
-    exercise_questions.each do |q|
+    exercise_questions&.each do |q|
+      begin
         if q.question_type != 5
           answers_content = q.exercise_answers.where(user_id: user.id)  #学生的答案
         else
@@ -413,7 +414,7 @@ module ExercisesHelper
             score2 += 0.0
           end
         elsif q.question_type == 5   #实训题时，主观题这里不评分
-        q.exercise_shixun_challenges.each do |exercise_cha|
+          q.exercise_shixun_challenges&.each do |exercise_cha|
             game = Game.user_games(user.id,exercise_cha.challenge_id)&.first  #当前用户的关卡
             if game.present?
               exercise_cha_score = 0.0
@@ -450,7 +451,7 @@ module ExercisesHelper
             end
           end
         end
-      user_scores = answers_content.present? ? answers_content.score_reviewed.pluck(:score).sum : 0.0
+        user_scores = answers_content.blank? ? 0.0 : answers_content.score_reviewed.pluck(:score).sum
             if user_scores > 0.0
           stand_answer = 1
         else
@@ -464,6 +465,11 @@ module ExercisesHelper
             "user_score":user_scores.round(1)  #每个问题的总得分
         }
         ques_stand.push(ques_option)
+      rescue Exception => e
+        Rails.logger.info("calcuclate_score_have_error____________________________#{e}")
+        next
+      end
+
     end
     total_score = score1 + score2 + score5
     {

app/helpers/homework_commons_helper.rb

@@ -174,9 +174,9 @@ module HomeworkCommonsHelper
   end
 
   # 作品数统计：type： 1 已提交  0 未提交
-  def studentwork_count homework_common, type, user_id
-    student_works = homework_common.teacher_works(user_id)
-    type == 1 ? student_works.select{|work| work.work_status != 0}.size : student_works.select{|work| work.work_status = 0}.size
+  def studentwork_count homework_common, type, member
+    student_works = homework_common.teacher_works(member)
+    type == 1 ? student_works.where("work_status != 0").size : student_works.where(work_status: 0).size
   end
 
   # 上次查重的时间
@@ -223,10 +223,10 @@ module HomeworkCommonsHelper
   end
 
   # 作品状态
-  def homework_status homework, user_id
-    [{id: 0, name: "未提交",   count: homework.unfinished_count(user_id)},
-     {id: 1, name: "按时提交", count: homework.finished_count(user_id)},
-     {id: 2, name: "延时提交", count: homework.delay_finished_count(user_id)}]
+  def homework_status homework, member
+    [{id: 0, name: "未提交",   count: homework.unfinished_count(member)},
+     {id: 1, name: "按时提交", count: homework.finished_count(member)},
+     {id: 2, name: "延时提交", count: homework.delay_finished_count(member)}]
   end
 
   # 作品分数的显示

app/models/homework_common.rb

@@ -78,20 +78,20 @@ class HomeworkCommon < ApplicationRecord
   # 根据是否统一发布获取作业的作品列表
   def all_works
     student_works = self.unified_setting ? self.student_works :
-                        self.student_works.where(user_id: self.course.students.where(
-                            course_group_id: self.published_settings.pluck(:course_group_id)).
-                            pluck(:user_id))
+                        self.student_works.joins("join course_members on student_works.user_id=course_members.user_id").
+                            where(course_members: {course_group_id: self.published_settings.pluck(:course_group_id)})
   end
 
   # 分班权限的老师可见的作品列表
-  def teacher_works user_id
-    member = course.course_member(user_id)
+  def teacher_works member
+    # member = course.course_member(user_id)
     teacher_course_groups = member.try(:teacher_course_groups)
     all_student_works = self.all_works
     # 有分班权限的统计管理的分班且已发布的学生情况
     if member.present? && teacher_course_groups.size > 0
       group_ids = teacher_course_groups.pluck(:course_group_id)
-      all_student_works = all_student_works.where(user_id: course.students.where(course_group_id: group_ids).pluck(:user_id))
+      all_student_works = all_student_works.joins("join course_members course_members on student_works.user_id=course_members.user_id").
+          where(course_members: {course_group_id: group_ids})
     end
     all_student_works
   end
@@ -216,17 +216,17 @@ class HomeworkCommon < ApplicationRecord
   end
 
   # 作品未提交数
-  def unfinished_count user_id
-    self.teacher_works(user_id).unfinished.count
+  def unfinished_count member
+    self.teacher_works(member).unfinished.count
   end
 
   # 任务按时提交数
-  def finished_count user_id
-    self.teacher_works(user_id).finished.count
+  def finished_count member
+    self.teacher_works(member).finished.count
   end
 
-  def delay_finished_count user_id
-    self.teacher_works(user_id).delay_finished.count
+  def delay_finished_count member
+    self.teacher_works(member).delay_finished.count
   end
 
   # 分组作业的最大分组id

app/tasks/exercise_publish_task.rb

@@ -6,7 +6,7 @@ class ExercisePublishTask
     Rails.logger.info("log--------------------------------exercise_publish start")
     puts "--------------------------------exercise_publish start"
     exercises = Exercise.includes(:exercise_users).where("publish_time is not null and exercise_status = 1 and publish_time <=?",Time.now)
-    exercises.each do |exercise|
+    exercises&.each do |exercise|
       exercise.update_column('exercise_status', 2)
       course = exercise.course
       tid_str = ""
@@ -45,7 +45,7 @@ class ExercisePublishTask
 
     # 分组设置发布时间的测验
     exercise_group_settings = ExerciseGroupSetting.where("publish_time < ? and publish_time > ?", Time.now + 900, Time.now - 900)
-    exercise_group_settings.each do |exercise_group|
+    exercise_group_settings&.each do |exercise_group|
       exercise = exercise_group.exercise
       if exercise.present?
         course = exercise.course
@@ -71,11 +71,12 @@ class ExercisePublishTask
     puts "--------------------------------exercise_end start"
     # 1。统一设置的试卷
     exercises = Exercise.includes(:exercise_users,:exercise_questions).where("exercise_status = 2 AND unified_setting = true AND end_time <= ?",Time.now + 900)
-    exercises.each do |exercise|
+    exercises&.each do |exercise|
       ex_type = exercise.exercise_questions.pluck(:question_type).uniq
       exercise.update_column('exercise_status', 3)
-      exercise.exercise_users.each do |exercise_user|
-        if exercise_user&.commit_status == 0 && exercise_user&.start_at.present?
+      exercise.exercise_users&.each do |exercise_user|
+        begin
+          if (exercise_user&.commit_status == 0) && (exercise_user&.start_at.present?)
             s_score = calculate_student_score(exercise, exercise_user.user)[:total_score]
             if ex_type.include?(4)   #是否包含主观题
               subjective_score = exercise_user.subjective_score
@@ -94,6 +95,11 @@ class ExercisePublishTask
             }
             exercise_user.update_attributes(commit_option)
           end
+        rescue Exception => e
+          Rails.logger.info("rescue errors ___________________________#{e}")
+          next
+        end
+
       end
     end
 
@@ -101,17 +107,17 @@ class ExercisePublishTask
     all_exercises = Exercise.includes(:exercise_group_settings,:exercise_users,:exercise_questions).where("unified_setting = false AND exercise_status = 2 AND end_time > ?",Time.now + 900)
     exercise_ids = all_exercises.blank? ? "(-1)" : "(" + all_exercises.map(&:id).join(",") + ")"
     ex_group_settings = ExerciseGroupSetting.where("end_time <= '#{Time.now}' and exercise_id in #{exercise_ids}")
-    ex_group_settings.each do |exercise_setting|
+    ex_group_settings&.each do |exercise_setting|
       exercise = exercise_setting.exercise
-      if exercise&.end_time <= Time.now
+      if exercise.end_time <= Time.now
         exercise.update_column('exercise_status', 3)
       end
 
       ex_types = exercise.exercise_questions.pluck(:question_type).uniq
       users = exercise.course.students.where(:course_group_id => exercise_setting.course_group_id)
       exercise_users = exercise.exercise_users.where(:user_id => users.pluck(:user_id))
-
-      exercise_users.each do |exercise_user|
+      exercise_users&.each do |exercise_user|
+        begin
           if exercise_user.commit_status == 0 && !exercise_user.start_at.nil?
             if ex_types.include?(4)   #是否包含主观题
               subjective_score = exercise_user.subjective_score
@@ -131,6 +137,11 @@ class ExercisePublishTask
             }
             exercise_user.update_attributes(commit_option)
           end
+        rescue Exception => e
+          Rails.logger.info("unified_setting_false_rescue errors ___________________________#{e}")
+          next
+        end
+
       end
     end
     Rails.logger.info("log--------------------------------exercise_end end")

app/views/homework_commons/index.json.jbuilder

@@ -23,8 +23,8 @@ json.homeworks @homework_commons.each do |homework|
   json.allow_late homework.allow_late
 
   unless curr_status[:status].include?("未发布")
-    json.commit_count studentwork_count homework, 1, @user.id
-    json.uncommit_count studentwork_count homework, 0, @user.id
+    json.commit_count studentwork_count homework, 1, @member
+    json.uncommit_count studentwork_count homework, 0, @member
   end
 
   if @user_course_identity < Course::STUDENT

app/views/homework_commons/works_list.json.jbuilder

@@ -20,12 +20,12 @@ if @user_course_identity < Course::STUDENT
   if @homework.homework_type != "practice"
     json.teacher_comment teacher_comment @homework, @current_user.id
   end
-  json.task_status homework_status @homework, @current_user.id
+  json.task_status homework_status @homework, @member
   json.course_group_info course_group_info @course, @current_user.id
 
 elsif @user_course_identity == Course::STUDENT
-  json.commit_count studentwork_count @homework, 1, @current_user.id
-  json.uncommit_count studentwork_count @homework, 0, @current_user.id
+  json.commit_count studentwork_count @homework, 1, @member
+  json.uncommit_count studentwork_count @homework, 0, @member
   json.left_time left_time @homework, @current_user.id
 
   if @homework.homework_type == "practice"

app/views/messages/reply_list.json.jbuilder

@@ -1,6 +1,6 @@
 json.partial! "commons/success"
 json.data do
-  json.user_course_identity @current_user.course_identity(@message.board.course)
+  json.user_course_identity @user_course_identity
   json.id @message.id
   json.total_count @messages.total_count
   json.total_replies_count @message.total_replies_count