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

app/services/git_service.rb

@@ -68,8 +68,8 @@ class GitService
 
       content = JSON.parse(body)
       if content["code"] != 0
-        raise("版本库异常")
         logger.error("repository error: #{content['msg']}")
+        raise("版本库异常")
       end
       #raise content["msg"] if content["code"] != 0
 

app/views/edu_datas/game.json.jbuilder

@@ -3,4 +3,5 @@ json.game @game
 
 json.shixun @shixun
 json.shixun_env @env
+json.shixun_image @shixun.main_mirror_name
 json.shixun_tags @shixun_tags

lib/tasks/statistic_subject_info.rake

@@ -9,8 +9,8 @@ namespace :subjects do
     buffer_size = 0
     column_value = "subject_id, study_count, course_study_count, initiative_study, passed_count, course_used_count, " +
         "school_used_count, created_at, updated_at"
-    subjects.find_in_batches(batch_size: 50) do |s|
-      Parallel.each(s, in_processes: 4) do |subject|
+    subjects.find_in_batches(batch_size: 50) do |s, index|
+      Parallel.each_with_index(s, in_processes: 4) do |subject|
         puts("---------------------data_statistic: #{subject.id}")
         Rails.logger.info("---------------------data_statistic: #{subject.id}")
         data = Subjects::DataStatisticService.new(subject)
@@ -23,7 +23,7 @@ namespace :subjects do
             "#{data.passed_count}, #{data.course_used_count}, #{data.school_used_count}, " +
             "'#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')")
         buffer_size += 1
-        if buffer_size == 1000
+        if buffer_size == 1000 || subjects.count == (index+1)
           sql = "REPLACE INTO subject_records(#{column_value}) VALUES #{str}"
           puts sql
           ActiveRecord::Base.connection.execute sql
@@ -55,14 +55,14 @@ namespace :subjects do
         puts("---------------------course_info_statistic: #{subject.id}")
         Rails.logger.info("---------------------course_info_statistic: #{subject.id}")
         data = Subjects::CourseUsedInfoService.call(subject)
-        Parallel.map(data) do |key|
+        Parallel.map_with_index(data) do |key, index|
           next if key[:school_id].nil?
           str += ", " unless str.empty?
           str += ("(#{subject.id}, #{key[:school_id]}, '#{key[:school_name]}', #{key[:course_count]}, " +
               "#{key[:student_count]}, #{key[:choice_shixun_num]}, #{key[:choice_shixun_frequency]}, " +
               "'#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')")
           buffer_size += 1
-          if buffer_size == 1000
+          if buffer_size == 1000 || (index + 1) == data.size
             sql = "REPLACE INTO subject_course_records(#{column_value}) VALUES #{str}"
             puts sql
             ActiveRecord::Base.connection.execute sql
@@ -90,11 +90,11 @@ namespace :subjects do
     column_value = "subject_id, shixun_id, stage, shixun_name, challenge_count, course_count, " +
         "school_count, used_count, passed_count, evaluate_count, passed_ave_time, created_at, updated_at"
     subjects.find_in_batches(batch_size: 50) do |s|
-      Parallel.each(s, in_processes: 4) do |subject|
+      Parallel.each_with_index(s, in_processes: 4) do |subject|
         puts("---------------------shixun_info_statistic: #{subject.id}")
         Rails.logger.info("---------------------shixun_info_statistic: #{subject.id}")
         data = Subjects::ShixunUsedInfoService.call(subject)
-        data.each do |key|
+        data.each_with_index do |key, index|
           next if key[:shixun_id].nil?
           str += ", " unless str.empty?
           str += ("(#{subject.id}, #{key[:shixun_id]}, '#{key[:stage]}', '#{key[:name]}', #{key[:challenge_count]}, " +
@@ -102,7 +102,7 @@ namespace :subjects do
               "#{key[:evaluate_count]}, #{key[:passed_ave_time]}, " +
               "'#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')")
           buffer_size += 1
-          if buffer_size == 1000
+          if buffer_size == 1000 || (index+1) == data.size
             sql = "REPLACE INTO subject_shixun_infos(#{column_value}) VALUES #{str}"
             puts sql
             ActiveRecord::Base.connection.execute sql
@@ -131,7 +131,7 @@ namespace :subjects do
         "code_line_count, evaluate_count, cost_time, created_at, updated_at"
 
     subjects.find_in_batches(batch_size: 50) do |s|
-      Parallel.each(s, in_processes: 4) do |subject|
+      Parallel.each_with_index(s, in_processes: 4) do |subject, index|
         puts("---------------------user_info_statistic: #{subject.id}")
         data = Subjects::UserUsedInfoService.call(subject)
         data.each do |key|
@@ -141,7 +141,7 @@ namespace :subjects do
               "#{key[:passed_games_count]}, #{key[:code_line_count]}, #{key[:evaluate_count]}, #{key[:cost_time]}, " +
               "'#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')")
           buffer_size += 1
-          if buffer_size == 1000
+          if buffer_size == 1000 || (index+1 == data.size)
             sql = "REPLACE INTO subject_user_infos(#{column_value}) VALUES #{str}"
             ActiveRecord::Base.connection.execute sql
             str = ""

lib/tasks/zip_pack.rake

@@ -38,9 +38,8 @@ namespace :zip_pack do
 
   def zip_homework_pdf homeworks, folder, parallel_size
     Dir.mkdir(folder) unless File.directory?(folder)
-    homeworks = homeworks.includes(:score_student_works)
 
-    Parallel.each(homeworks, in_processes: 2) do |homework|
+    homeworks.includes(:score_student_works).each do |homework|
       out_file_name = "#{Time.now.strftime("%Y%m%d%H%M%S").to_s}-#{homework.course_id}-#{homework.name}.zip"
       out_file_name.gsub!(" ", "-")
       out_file_name.gsub!("/", "_")
@@ -51,21 +50,26 @@ namespace :zip_pack do
 
       if student_works.size > 0
         pdfs = []
+        file_paths = []
+        student_works.find_in_batches(batch_size: 500) do |sw|
+          Parallel.each(sw, in_threads: parallel_size) do |student_work|
+            export = ExportShixunReportService.new(homework, student_work)
+            pdf = export.to_pdf
+            pdfs << pdf
+            file_paths << {filename: export.filename, path: pdf.path}
+            puts "out: #{export.filename}_#{pdf.path}"
+          end
+        end
+
         Zip::File.open(zipfile_name, Zip::File::CREATE) do |zip|
-          student_works.find_in_batches(batch_size: 500) do |sw|
-            Parallel.each(sw, in_processes: parallel_size) do |student_work|
-              export = ExportShixunReportService.new(homework, student_work)
-              pdf = export.to_pdf
-              pdfs << pdf
-              begin
-                zip.add(export.filename, pdf.path)
-                puts "out: #{export.filename}_#{pdf.path}"
-              rescue => ex
-                Rails.logger.error(ex.message)
+          file_paths.each do |pdf|
+            begin
+              zip.add(pdf[:filename], pdf[:path])
+            rescue => ex
+              Rails.logger.error(ex.message)
 
-                zip.get_output_stream('FILE_NOTICE.txt'){|os| os.write("文件重复:#{export.filename}") }
-                next
-              end
+              zip.get_output_stream('FILE_NOTICE.txt'){|os| os.write("文件重复:#{export.filename}") }
+              next
             end
           end
         end