From f3b2aa6f692fbc1a8f36d7e6c94925ddd514428b Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 24 Sep 2019 16:33:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=AE=9E=E8=B7=B5=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 160 +++++++++++++++++--------- app/models/shixun.rb | 8 +- app/models/shixun_info.rb | 3 + 3 files changed, 117 insertions(+), 54 deletions(-) create mode 100644 app/models/shixun_info.rb diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index bd850ac6..92e061f2 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -31,6 +31,9 @@ class WelcomeController < ApplicationController DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z) def local_init + LocalSubject.delete_all + LocalStage.delete_all + LocalStageShixun.delete_all LocalShixun.delete_all LocalMirrorRepository.delete_all LocalShixunTagRepertoire.delete_all @@ -63,65 +66,56 @@ class WelcomeController < ApplicationController end end - def shixun_to_local - identifiers = params[:identifiers].split(",") - shixuns = Shixun.where(identifier: identifiers) - # 不重复导入 + def subject_to_local + subject_ids = params[:subject_ids].split(",") + subjects = Subject.where(id: subject_ids) ActiveRecord::Base.transaction do - begin - shixuns.each do |shixun| - if LocalShixun.where(shixun_id: shixun.id).blank? - - local_shixun = LocalShixun.create!(name: shixun.name, description: shixun.description, user_id: User.current.id, status: 0, - trainee: shixun.trainee, webssh: shixun.webssh, multi_webssh: shixun.multi_webssh, - can_copy: shixun.can_copy, identifier: generate_identifier, shixun_id: shixun.id, - use_scope: shixun.use_scope, visits: 1, evaluate_script: shixun.evaluate_script, - local_giturl: shixun.git_url) - - # 同步镜像 - if shixun.mirror_repositories.present? - shixun.mirror_repositories.each do |mirror| - # 本地版的mirror id和线上的可能不一样，所以按名字取，然后再存 - # local_mirror = MirrorRepository.where(type_name: mirror.type_name).first.try(:id) - LocalMirrorRepository.create!(:local_shixun_id => local_shixun.id, :mirror_repository_id => mirror.id, type_name: mirror.type_name) - end - end - - # 同步技术标签 - shixun.shixun_tag_repertoires.each do |str| - LocalShixunTagRepertoire.create!(:tag_repertoire_id => str.tag_repertoire_id, :local_shixun_id => local_shixun.id) - end - - # 不需要同步版本库，版本库应该是从本地导入到线上的时候由线上版本创建的 - - # 同步复制关卡 - if shixun.challenges.present? - shixun.challenges.each do |challenge| - new_challenge = LocalChallenge.new - new_challenge.attributes = challenge.attributes.dup.except("id","shixun_id","user_id", "test_set_score") - new_challenge.local_shixun_id = local_shixun.id - new_challenge.save! - # 评测题，选择题暂时不考虑 - # 同步测试集 - if challenge.test_sets.present? - challenge.test_sets.each do |test_set| - new_test_set = LocalTestSet.new - new_test_set.attributes = test_set.attributes.dup.except("id","challenge_id") - new_test_set.local_challenge_id = new_challenge.id - new_test_set.save! - end - end - # 同步关卡标签 - challenge_tags = ChallengeTag.where("challenge_id =? and challenge_choose_id is null", challenge.id) - if challenge_tags.present? - challenge_tags.each do |challenge_tag| - LocalChallengeTag.create!(:local_challenge_id => new_challenge.id, :name => challenge_tag.try(:name)) - end + subjects.each do |subject| + if LocalSubject.where(subject_id: subject.id).blank? + + local_subject = LocalSubject.create!(name: subject.name, description: subject.description, status: 0, + learning_notes: subject.learning_notes, introduction: subject.introduction, + stages_count: subject.stages_count, stage_shixuns_count: subject.stage_shixuns_count, + subject_id: subject.id, shixuns_count: subject.shixuns_count) + + # 同步复制章节 + if subject.stages.present? + subject.stages.each do |stage| + new_stage = LocalStage.new + new_stage.attributes = stage.attributes.dup.except("id","user_id") + new_stage.local_subject_id = local_subject.id + new_stage.save! + + if stage.stage_shixuns.present? + stage.stage_shixuns.each do |stage_shixun| + new_stage_shixun = LocalStageShixun.new + new_stage_shixun.attributes = stage_shixun.attributes.dup.except("id") + new_stage_shixun.local_subject_id = local_subject.id + new_stage_shixun.local_subject_id = new_stage.id + new_stage_shixun.save! end end + + # 复制实训 + _shixun_to_local(stage.shixuns) end end end + end + end + end + + def local_to_subject + + end + + def shixun_to_local + identifiers = params[:identifiers].split(",") + shixuns = Shixun.where(identifier: identifiers) + # 不重复导入 + ActiveRecord::Base.transaction do + begin + _shixun_to_local(shixuns) render :json => {status: 0, message: "success"} rescue Exception => e logger.error("shixun_local_in ##{e.message}") @@ -519,6 +513,66 @@ class WelcomeController < ApplicationController end private + + def _shixun_to_local shixuns + shixuns.each do |shixun| + if LocalShixun.where(shixun_id: shixun.id).blank? + + local_shixun = LocalShixun.create!(name: shixun.name, description: shixun.description, user_id: User.current.id, status: 0, + trainee: shixun.trainee, webssh: shixun.webssh, multi_webssh: shixun.multi_webssh, + can_copy: shixun.can_copy, identifier: generate_identifier, shixun_id: shixun.id, + use_scope: shixun.use_scope, visits: 1, evaluate_script: shixun.evaluate_script, + local_giturl: shixun.git_url) + + # 同步更新实践课程中对应的shixun_id + LocalStageShixun.where(shixun_id: shixun.id).update_all(local_shixun_id: local_shixun.id) + + # 同步镜像 + if shixun.mirror_repositories.present? + shixun.mirror_repositories.each do |mirror| + # 本地版的mirror id和线上的可能不一样，所以按名字取，然后再存 + # local_mirror = MirrorRepository.where(type_name: mirror.type_name).first.try(:id) + LocalMirrorRepository.create!(:local_shixun_id => local_shixun.id, :mirror_repository_id => mirror.id, type_name: mirror.type_name) + end + end + + # 同步技术标签 + shixun.shixun_tag_repertoires.each do |str| + LocalShixunTagRepertoire.create!(:tag_repertoire_id => str.tag_repertoire_id, :local_shixun_id => local_shixun.id) + end + + # 不需要同步版本库，版本库应该是从本地导入到线上的时候由线上版本创建的 + + # 同步复制关卡 + if shixun.challenges.present? + shixun.challenges.each do |challenge| + new_challenge = LocalChallenge.new + new_challenge.attributes = challenge.attributes.dup.except("id","shixun_id","user_id", "test_set_score") + new_challenge.local_shixun_id = local_shixun.id + new_challenge.save! + # 评测题，选择题暂时不考虑 + # 同步测试集 + if challenge.test_sets.present? + challenge.test_sets.each do |test_set| + new_test_set = LocalTestSet.new + new_test_set.attributes = test_set.attributes.dup.except("id","challenge_id") + new_test_set.local_challenge_id = new_challenge.id + new_test_set.save! + end + end + # 同步关卡标签 + challenge_tags = ChallengeTag.where("challenge_id =? and challenge_choose_id is null", challenge.id) + if challenge_tags.present? + challenge_tags.each do |challenge_tag| + LocalChallengeTag.create!(:local_challenge_id => new_challenge.id, :name => challenge_tag.try(:name)) + end + end + end + end + end + end + end + # 判断网站的入口，是课程 course 则跳过index去渲染 course 方法 def entry_select # url = request.original_url.gsub('/','') diff --git a/app/models/shixun.rb b/app/models/shixun.rb index 35193f2d..c8d4bb6a 100644 --- a/app/models/shixun.rb +++ b/app/models/shixun.rb @@ -24,7 +24,7 @@ # 116：challenge创建关卡的时候返回结果错误 # class Shixun < ActiveRecord::Base - attr_accessible :description, :name, :changeset_num, :status, :user_id, :gpid, :language, :identifier, :authentication, :closer_id, :end_time, :publish_time, + attr_accessible :name, :changeset_num, :status, :user_id, :gpid, :language, :identifier, :authentication, :closer_id, :end_time, :publish_time, :propaedeutics, :trainee, :major_id, :homepage_show, :webssh, :hidden, :fork_from, :can_copy, :modify_time, :reset_time, :git_url, :use_scope, :vnc, :evaluate_script, :image_text, :exec_time, :test_set_permission, :hide_code, :excute_time, :forbid_copy @@ -54,6 +54,8 @@ class Shixun < ActiveRecord::Base has_many :shixun_tag_repertoires, :dependent => :destroy has_many :shixun_service_configs, :dependent => :destroy + has_one :shixun_info, dependent: :destroy + scope :visible, lambda{where(status: [2,3])} scope :min, lambda { select([:id, :name, :gpid, :modify_time, :reset_time, :language, :status, :identifier, :test_set_permission, :hide_code, :forbid_copy, :hidden, :webssh, :user_id, :code_hidden, @@ -66,6 +68,10 @@ class Shixun < ActiveRecord::Base #scope :visible, -> { where(status: -1) } after_create :send_tiding + def description + shixun_info.try(:description) + end + def should_compile? self.mirror_repositories.published_main_mirror.first.try(:should_compile) end diff --git a/app/models/shixun_info.rb b/app/models/shixun_info.rb new file mode 100644 index 00000000..45079557 --- /dev/null +++ b/app/models/shixun_info.rb @@ -0,0 +1,3 @@ +class ShixunInfo < ActiveRecord::Base + belongs_to :shixun +end