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

Gemfile

@@ -84,6 +84,7 @@ gem 'rails-i18n', '~> 5.1'
 
 # job
 gem 'sidekiq'
+gem 'sinatra'
 
 # batch insert
 gem 'bulk_insert'

Gemfile.lock

@@ -142,6 +142,7 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
+    mustermann (1.0.3)
     mysql2 (0.5.2)
     nio4r (2.3.1)
     nokogiri (1.8.4)
@@ -265,6 +266,11 @@ GEM
     simple_xlsx_reader (1.0.4)
       nokogiri
       rubyzip
+    sinatra (2.0.5)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.5)
+      tilt (~> 2.0)
     spreadsheet (1.2.3)
       ruby-ole (>= 1.0)
     spring (2.0.2)
@@ -341,6 +347,7 @@ DEPENDENCIES
   selenium-webdriver
   sidekiq
   simple_xlsx_reader
+  sinatra
   spreadsheet
   spring
   spring-watcher-listen (~> 2.0.0)

app/controllers/exercise_questions_controller.rb

@@ -223,7 +223,6 @@ class ExerciseQuestionsController < ApplicationController
           end
         end
         #试卷未发布时，当标准答案存在时，可修改标准答案内容，可增删标准答案，否则只能修改标准答案，不能增删标准答案
-        st_count = 0
         @exercise_answers_array = @exercise_question.exercise_standard_answers  #问卷的全部标准答案
         if standard_answer.present?
           if @exercise_question.question_type <= 2 #选择题/判断题，标准答案为一个或多个
@@ -232,7 +231,6 @@ class ExerciseQuestionsController < ApplicationController
             old_left_standard_choices = exercise_standard_choices - common_standard_choices # 以前的差集共同的，剩余的表示需要删掉
             new_left_standard_choices = standard_answer - common_standard_choices # 传入的标准答案差集共同的，剩余的表示需要新建
             if old_left_standard_choices.count > 0
-              st_count += 1
               @exercise_answers_array.standard_by_ids(old_left_standard_choices).destroy_all
             end
             if new_left_standard_choices.count > 0  #新建标准答案
@@ -258,7 +256,6 @@ class ExerciseQuestionsController < ApplicationController
 
             #删除多余的选项
             if old_ex_answer_choice_ids.count > new_ex_answer_choice_ids.count  #有减少的填空
-              st_count += 1
               delete_ex_answer_choice_ids = old_ex_answer_choice_ids - new_ex_answer_choice_ids
               old_ex_answer.standard_by_ids(delete_ex_answer_choice_ids).destroy_all
             end
@@ -284,7 +281,6 @@ class ExerciseQuestionsController < ApplicationController
                     ex_answer_pre[n-1].update(standard_option)
                   end
                   if new_add_choice.count > 0  #表示有新增的
-                    st_count += 1
                     new_add_choice.each do |i|
                       standard_option = {
                           :exercise_question_id => @exercise_question.id,
@@ -306,7 +302,6 @@ class ExerciseQuestionsController < ApplicationController
                     ex_answer_pre[index].update(standard_option)
                   end
                   if new_delete_choice.count > 0  #表示填空题的答案有删减的
-                    st_count += 1
                     new_delete_choice.each do |d|
                       ex_answer_pre[d-1].destroy
                     end
@@ -350,8 +345,9 @@ class ExerciseQuestionsController < ApplicationController
           @exercise_question.shixun_name = shixun_name
         end
 
-        #当标准答案修改时，如有已提交的学生，需重新计算分数
-        if st_count > 0
+        #当试卷已发布时（试卷的总状态),当标准答案修改时，如有已提交的学生，需重新计算分数.
+
+        if @exercise.exercise_status == 2
           ex_users_committed = @exercise.exercise_users.exercise_user_committed
           if ex_users_committed.size > 0
             ex_users_committed.each do |ex_user|
@@ -587,15 +583,15 @@ class ExerciseQuestionsController < ApplicationController
     if @exercise_question.present?
       @exercise = @exercise_question.exercise
       if @exercise.blank?
-        tip_exception(404)
+        tip_exception(404,"试卷不存在")
       else
         @course = @exercise.course
         if @course.blank?
-          tip_exception(404)
+          tip_exception(404,"课堂不存在")
         end
       end
     else
-      tip_exception(404)
+      tip_exception(404,"试卷问题不存在")
     end
   end
 

app/controllers/graduation_tasks_controller.rb

@@ -129,7 +129,7 @@ class GraduationTasksController < ApplicationController
         if @user_course_identity >= Course::STUDENT
           tip_exception(403, "无权限操作")
         elsif complete_works == 0
-          normal_status(-1,"暂无用户提交！")
+          normal_status(-1,"暂无用户提交")
         else
           respond_to do |format|
             format.xlsx{
@@ -164,7 +164,7 @@ class GraduationTasksController < ApplicationController
       @work_count = @work_list.count
       @all_work_count = @work_list.count
       if params[:format] == "xlsx" || params[:format] == "zip"
-        normal_status(-1,"作业未发布")
+        normal_status(-1,"毕设任务未发布")
       end
     end
   end

app/controllers/homework_commons_controller.rb

@@ -106,7 +106,7 @@ class HomeworkCommonsController < ApplicationController
 
     student_works = @homework.all_works
     @all_member_count = student_works.size
-    if @homework.publish_time.nil? || @homework.publish_time > Time.now
+    if @homework.publish_time.blank? || (@homework.publish_time > Time.now)
       @student_works = []
       if params[:format] == "xlsx" || params[:format] == "zip"
         normal_status(-1,"作业未发布")
@@ -250,7 +250,7 @@ class HomeworkCommonsController < ApplicationController
       challenge_settings = @homework.homework_challenge_settings
       myshixuns.find_each(batch_size: 100) do |myshixun|
         work = student_works.select{|work| work.user_id == myshixun.user_id}.first
-        if work && myshixun && (work.update_time.nil? || work.update_time < myshixun.updated_at)
+        if work && myshixun && (work.update_time.nil? || work.update_time < myshixun.games.pluck(:updated_at).max)
           games = myshixun.games.where(challenge_id: challenge_settings.pluck(:challenge_id))
           HomeworksService.new.update_myshixun_work_score work, myshixun, games, @homework, challenge_settings
         end
@@ -271,7 +271,7 @@ class HomeworkCommonsController < ApplicationController
     myshixun = Myshixun.find_by(shixun_id: params[:shixun_id], user_id: current_user.id)
     ActiveRecord::Base.transaction do
       begin
-        if work && myshixun && (work.update_time.nil? || work.update_time < myshixun.updated_at)
+        if work && myshixun && (work.update_time.nil? || work.update_time < myshixun.games.pluck(:updated_at).max)
           challenge_settings = @homework.homework_challenge_settings
           games = myshixun.games.where(challenge_id: challenge_settings.pluck(:challenge_id))
           HomeworksService.new.update_myshixun_work_score work, myshixun, games, @homework, challenge_settings
@@ -1117,7 +1117,7 @@ class HomeworkCommonsController < ApplicationController
 =end
 
               # 更新所有学生的效率分(重新取homework确保是更新后的)
-              HomeworksService.new.update_student_eff_score HomeworkCommon.find_by(id: homework.id) if !homework.allow_late && homework.end_time <= time
+              HomeworkEndUpdateScoreJob.perform_later(homework.id) if !homework.allow_late && homework.end_time <= time
             end
           end
           homework.save!

app/controllers/myshixuns_controller.rb

@@ -18,7 +18,7 @@ class MyshixunsController < ApplicationController
   # REDO等删除是否可以做成异步
   # 前段需要按照操作过程提示
   def reset_my_game
-    unless (current_user.admin? || current_user.id == @myshixun.user_id)
+    unless current_user.admin?
       tip_exception("403", "")
     end
 

app/controllers/subjects_controller.rb

@@ -81,6 +81,9 @@ class SubjectsController < ApplicationController
     @tags = ChallengeTag.where(challenge_id: challenge_ids).pluck(:name).uniq
     # 用户获取的实训标签
     @user_tags = @subject.shixuns.map(&:user_tags_name).flatten.uniq
+
+    # 访问数变更
+    @subject.increment!(:visits)
   end
 
   def create

app/jobs/homework_end_update_score_job.rb

@@ -0,0 +1,32 @@
+class HomeworkEndUpdateScoreJob < ApplicationJob
+  # 不允许补交的作业截止后，或者补交截止后需要重新计算一次作业成绩
+  queue_as :score
+
+  def perform(*args)
+    homework = HomeworkCommon.find_by(id: homework_id)
+    return if homework.blank?
+    course = homework.course
+    return if course.blank?
+
+    if homework.unified_setting
+      student_works = homework.student_works
+      user_ids = course.students.pluck(:user_id)
+    else
+      user_ids = course.students.where(course_group_id: homework.published_settings.pluck(:course_group_id)).pluck(:user_id)
+      student_works = homework.student_works.where(user_id: user_ids)
+    end
+
+    myshixuns = Myshixun.where(shixun_id: params[:shixun_id], user_id: user_ids).
+        includes(:games).where(games: {challenge_id: homework.homework_challenge_settings.pluck(:challenge_id)})
+    challenge_settings = homework.homework_challenge_settings
+    myshixuns.find_each(batch_size: 100) do |myshixun|
+      work = student_works.select{|work| work.user_id == myshixun.user_id}.first
+      if work && myshixun && (work.update_time.nil? || work.update_time < myshixun.updated_at)
+        games = myshixun.games.where(challenge_id: challenge_settings.pluck(:challenge_id))
+        HomeworksService.new.update_myshixun_work_score work, myshixun, games, homework, challenge_settings
+      end
+    end
+    HomeworksService.new.update_student_eff_score homework
+    homework.update_attribute('calculation_time', Time.now)
+  end
+end

app/services/users/subject_service.rb

@@ -14,7 +14,7 @@ class Users::SubjectService
     subjects = category_scope_subjects
     subjects = user_policy_filter(subjects)
 
-    custom_sort(subjects, :updated_at, params[:sort_direction])
+    custom_sort(subjects.distinct, :updated_at, params[:sort_direction])
   end
 
   private

config/routes.rb

@@ -1,5 +1,8 @@
 Rails.application.routes.draw do
 
+  require 'sidekiq/web'
+  mount Sidekiq::Web => '/sidekiq'
+
   resources :edu_settings
   scope '/api' do
     get 'home/index'

db/migrate/20190703072611_add_old_exercise_tiankong_choice_id.rb

@@ -0,0 +1,23 @@
+class AddOldExerciseTiankongChoiceId < ActiveRecord::Migration[5.2]
+
+  def up
+    #类型为3 的问题答案及标准答案更新exercise_choice_id 为1，即表示第一空
+    exercise_question_ids = ExerciseQuestion.where("question_type = 3").pluck(:id)
+    ExerciseAnswer.where(exercise_question_id: exercise_question_ids,exercise_choice_id: nil).update_all(exercise_choice_id:1)
+    ExerciseStandardAnswer.where(exercise_question_id: exercise_question_ids,exercise_choice_id: nil).update_all(exercise_choice_id:1)
+
+    exercise_bank_question_ids = ExerciseBankQuestion.where("question_type =3").pluck(:id)
+    ExerciseBankStandardAnswer.where(exercise_bank_question_id: exercise_bank_question_ids).update_all(exercise_bank_choice_id:1)
+  end
+
+  def down
+    #类型为3 的问题答案及标准答案更新exercise_choice_id 为1，即表示第一空
+    exercise_question_ids = ExerciseQuestion.where("question_type = 3").pluck(:id)
+    ExerciseAnswer.where(exercise_question_id: exercise_question_ids,exercise_choice_id: 1).update_all(exercise_choice_id:nil)
+    ExerciseStandardAnswer.where(exercise_question_id: exercise_question_ids,exercise_choice_id: 1).update_all(exercise_choice_id:nil)
+
+    exercise_bank_question_ids = ExerciseBankQuestion.where("question_type =3").pluck(:id)
+    ExerciseBankStandardAnswer.where(exercise_bank_question_id: exercise_bank_question_ids).update_all(exercise_bank_choice_id:nil)
+  end
+
+end

lib/tasks/homework_publishtime.rake

@@ -84,7 +84,8 @@ namespace :homework_publishtime do
         student_works.joins(:myshixun).where("myshixuns.status != 1").update_all(late_penalty: homework.late_penalty) if student_works.present?
 
       else
-        HomeworksService.new.update_student_eff_score homework
+        HomeworkEndUpdateScoreJob.perform_later(homework.id)
+        # HomeworksService.new.update_student_eff_score homework
       end
 
 =begin
@@ -206,7 +207,8 @@ namespace :homework_publishtime do
     homework_commons = HomeworkCommon.joins(:homework_detail_manual).where("homework_type = 4 and allow_late = 1 and
                           late_time <= ? and late_time > ? and homework_detail_manuals.comment_status != 6", Time.now, Time.now - 900)
     homework_commons.each do |homework|
-      HomeworksService.new.update_student_eff_score homework
+      # HomeworksService.new.update_student_eff_score homework
+      HomeworkEndUpdateScoreJob.perform_later(homework.id)
 
 =begin
       homework_detail_manual = homework.homework_detail_manual

spec/jobs/homework_end_update_score_job_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe HomeworkEndUpdateScoreJob, type: :job do
+  pending "add some examples to (or delete) #{__FILE__}"
+end