diff --git a/app/controllers/admins/phenglei_users_controller.rb b/app/controllers/admins/phenglei_users_controller.rb new file mode 100644 index 00000000..e1fbff7c --- /dev/null +++ b/app/controllers/admins/phenglei_users_controller.rb @@ -0,0 +1,36 @@ +class Admins::PhengleiUsersController < Admins::BaseController + before_action :phenglei_project, only: [:index] + + def index + if params[:keyword].present? + @phenglei_users = PhengleiUser.ransack(phone_cont: params[:keyword]).result + else + @phenglei_users = PhengleiUser + end + @phenglei_users = @phenglei_users.page(page).per(per_page) + end + + def new + @phenglei_user = PhengleiUser.new + end + + def create + @phenglei_user = PhengleiUser.new(phenglei_user_params) + if @phenglei_user.save + redirect_to admins_phenglei_users_path + flash[:success] = "创建成功" + else + redirect_to admins_phenglei_users_path + flash[:error] = "创建失败" + end + end + + private + def phenglei_project + @phenglei_project = Project.find_by_id(EduSetting.get("sync_phenglei_user_project")) + end + + def phenglei_user_params + params.require(:phenglei_user).permit(:phone) + end +end diff --git a/app/controllers/admins/projects_controller.rb b/app/controllers/admins/projects_controller.rb index 2335db6d..9e33b6ce 100644 --- a/app/controllers/admins/projects_controller.rb +++ b/app/controllers/admins/projects_controller.rb @@ -1,4 +1,5 @@ class Admins::ProjectsController < Admins::BaseController + before_action :load_project, only: [:sync_phenglei_user] def index sort_by = params[:sort_by] ||= 'created_on' @@ -6,7 +7,7 @@ class Admins::ProjectsController < Admins::BaseController search = params[:search].to_s.strip projects = Project.where("name like ?", "%#{search}%").order("#{sort_by} #{sort_direction}") - @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score) + @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score, :license) end def destroy @@ -22,4 +23,20 @@ class Admins::ProjectsController < Admins::BaseController redirect_to admins_projects_path flash[:danger] = "删除失败" end + + def sync_phenglei_user + if @project.is_secret + SyncPhengleiUserJob.perform_later(@project.id) + redirect_to admins_phenglei_users_path + flash[:success] = "已开启后台同步任务" + else + redirect_to admins_phenglei_users_path + flash[:danger] = "非风雷协议项目" + end + end + + private + def load_project + @project = Project.find_by!(id: params[:id]) + end end \ No newline at end of file diff --git a/app/controllers/apply_signatures_controller.rb b/app/controllers/apply_signatures_controller.rb index 885249cf..e867c44d 100644 --- a/app/controllers/apply_signatures_controller.rb +++ b/app/controllers/apply_signatures_controller.rb @@ -5,8 +5,9 @@ class ApplySignaturesController < ApplicationController before_action :find_apply_signature, only: [:update] def index + search = params[:search].to_s.downcase @apply_signatures = @project.apply_signatures.with_status(status).includes(user: :user_extension) - @apply_signatures = @apply_signatures.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") + @apply_signatures = @apply_signatures.joins(:user).where("LOWER(CONCAT_WS(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present? @apply_signatures = kaminari_paginate(@apply_signatures) end @@ -64,10 +65,6 @@ class ApplySignaturesController < ApplicationController params.permit(:status) end - def search - params.fetch(:search, "").to_s.downcase - end - def status params.fetch(:status, "all") end diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index b8c0ea54..302dc624 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -18,7 +18,7 @@ class MembersController < ApplicationController scope = @project.members.includes(:roles, user: :user_extension) search = params[:search].to_s.downcase role = params[:role].to_s - scope = scope.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present? + scope = scope.joins(:user).where("LOWER(CONCAT_WS(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present? scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role}%") if role.present? @total_count = scope.size diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index a9fb3f88..155d220d 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -52,7 +52,7 @@ module ProjectsHelper type: project.numerical_for_project_type, author: render_owner(project), is_secret: project.is_secret, - is_member: !project.members.where(user_id: user.id).blank?, + is_member: project.member?(user.id), user_apply_signatures: project.apply_signatures.with_user_id(user.id).collect{|s| {id: s.id, status: s.status}} }).compact diff --git a/app/jobs/sync_phenglei_user_job.rb b/app/jobs/sync_phenglei_user_job.rb new file mode 100644 index 00000000..6376618b --- /dev/null +++ b/app/jobs/sync_phenglei_user_job.rb @@ -0,0 +1,36 @@ +class SyncPhengleiUserJob < ApplicationJob + queue_as :default + + def perform(project_id=nil) + project_id ||= EduSetting.get("sync_phenglei_user_project") + project = Project.find_by_id(project_id) + return if project.nil? + member_count, success_count, error_count, not_exsit_count = 0, 0, 0, 0 + Rails.logger.info("======begin to sync phenglei user to project#{project.owner.login + "/" + project.identifier}") + PhengleiUser.find_each do |i| + puts "======开始处理#{i.phone}" + user = User.find_by(phone: i.phone) + if user.present? + if project.member?(user.id) + puts "======#{i.phone}用户已经是外围贡献者了" + member_count += 1 + else + interactor = Projects::AddMemberInteractor.call(project.owner, project, user, "read", true) + if interactor.error.nil? + puts "========用户#{i.phone}成功添加为项目的外围贡献者=======" + success_count += 1 + else + puts "========用户#{i.phone}添加失败" + error_count += 1 + end + end + else + puts "=====#{i.phone}用户不存在" + not_exsit_count += 1 + next + end + end + Rails.logger.info("======已存在外围贡献者数量#{member_count}, 成功添加用户数量#{success_count}, 添加失败用户数量#{error_count}, 找不到用户数量#{not_exsit_count}") + Rails.logger.info("======end to sync phenglei user to project#{project.owner.login + "/" + project.identifier}") + end +end \ No newline at end of file diff --git a/app/models/phenglei_user.rb b/app/models/phenglei_user.rb new file mode 100644 index 00000000..5adcfac7 --- /dev/null +++ b/app/models/phenglei_user.rb @@ -0,0 +1,18 @@ +# == Schema Information +# +# Table name: phenglei_users +# +# id :integer not null, primary key +# phone :string(255) +# created_at :datetime not null +# updated_at :datetime not null +# + +class PhengleiUser < ApplicationRecord + + validates :phone, uniqueness: true + + def register + User.find_by(phone: self.phone) + end +end diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index 7e175cc4..eee99a71 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -15,7 +15,7 @@ class Projects::ListQuery < ApplicationQuery scope = q .with_project_type(params[:project_type]) .with_project_category(params[:category_id]) - .with_project_language(params[:language_id]) + .with_project_language(params[:language_id]).order(order_index: :desc) sort = params[:sort_by] || "updated_on" sort_direction = params[:sort_direction] || "desc" diff --git a/app/views/admins/apply_signatures/index.js.erb b/app/views/admins/apply_signatures/index.js.erb new file mode 100644 index 00000000..17ff03d8 --- /dev/null +++ b/app/views/admins/apply_signatures/index.js.erb @@ -0,0 +1 @@ +$('.apply_signatures-list-container').html("<%= j( render partial: 'admins/apply_signatures/shared/list', locals: { apply_signatures: @apply_signatures } ) %>"); \ No newline at end of file diff --git a/app/views/admins/phenglei_users/index.html.erb b/app/views/admins/phenglei_users/index.html.erb new file mode 100644 index 00000000..7c964e08 --- /dev/null +++ b/app/views/admins/phenglei_users/index.html.erb @@ -0,0 +1,19 @@ +<% define_admin_breadcrumbs do %> + <% add_admin_breadcrumb('风雷意向用户管理', admins_phenglei_users_path) %> +<% end %> + +
+ <%= form_tag(admins_phenglei_users_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %> + <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '手机号检索') %> + + <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> + <%= link_to "同步", sync_phenglei_user_admins_project_path(@phenglei_project.id), method: :get, data: {confirm: "确认同步吗？"}, class: "btn btn-primary pull-right ml-3", "data-disabled-with":"...同步" %> + <% end %> + <%= link_to "新增", new_admins_phenglei_user_path, remote: true, class: "btn btn-primary ml-3", "data-disabled-with":"...新增" %> +
+ +
+ <%= render partial: 'admins/phenglei_users/shared/list', locals: { phenglei_users: @phenglei_users } %> +
+
+
\ No newline at end of file diff --git a/app/views/admins/phenglei_users/index.js.erb b/app/views/admins/phenglei_users/index.js.erb new file mode 100644 index 00000000..57c52106 --- /dev/null +++ b/app/views/admins/phenglei_users/index.js.erb @@ -0,0 +1 @@ +$('.phenglei-users-list-container').html("<%= j( render partial: 'admins/phenglei_users/shared/list', locals: { phenglei_users: @phenglei_users } ) %>"); \ No newline at end of file diff --git a/app/views/admins/phenglei_users/new.js.erb b/app/views/admins/phenglei_users/new.js.erb new file mode 100644 index 00000000..2829f93b --- /dev/null +++ b/app/views/admins/phenglei_users/new.js.erb @@ -0,0 +1,2 @@ +$("#phenglei-users-modals").html("<%= j render(partial: 'admins/phenglei_users/shared/create_form_modal') %>") +$(".phenglei-user-create-modal").modal('show'); \ No newline at end of file diff --git a/app/views/admins/phenglei_users/shared/_create_form_modal.html.erb b/app/views/admins/phenglei_users/shared/_create_form_modal.html.erb new file mode 100644 index 00000000..76198260 --- /dev/null +++ b/app/views/admins/phenglei_users/shared/_create_form_modal.html.erb @@ -0,0 +1,21 @@ + \ No newline at end of file diff --git a/app/views/admins/phenglei_users/shared/_list.html.erb b/app/views/admins/phenglei_users/shared/_list.html.erb new file mode 100644 index 00000000..1f64f044 --- /dev/null +++ b/app/views/admins/phenglei_users/shared/_list.html.erb @@ -0,0 +1,30 @@ + + + + + + + + + + <% if phenglei_users.present? %> + <% phenglei_users.each_with_index do |user, index| %> + + + + + + <% end %> + <% else %> + <%= render 'admins/shared/no_data_for_table' %> + <% end %> + +
序号手机号码状态
<%= list_index_no((params[:page] || 1).to_i, index) %><%= overflow_hidden_span display_text(user.phone), width: 100 %> + <% if user.register.present? %> + <%= @phenglei_project.member?(user.register.id) ? "已同步" : "未同步" %> + <% else %> + 未注册 + <% end %> +
+ +<%= render partial: 'admins/shared/paginate', locals: { objects: phenglei_users } %> diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb index c72ce593..2524451c 100644 --- a/app/views/admins/shared/_sidebar.html.erb +++ b/app/views/admins/shared/_sidebar.html.erb @@ -17,6 +17,7 @@
  • <%= sidebar_item_group('#user-submenu', '用户', icon: 'user') do %>
  • <%= sidebar_item(admins_users_path, '用户列表', icon: 'user', controller: 'admins-users') %>
    • +
  • <%= sidebar_item(admins_phenglei_users_path, '风雷意向用户列表', icon: 'user', controller: 'admins-phenglei_users') %>
    • <% end %>
  • diff --git a/app/views/projects/index.json.jbuilder b/app/views/projects/index.json.jbuilder index 2c02616d..d66c44a3 100644 --- a/app/views/projects/index.json.jbuilder +++ b/app/views/projects/index.json.jbuilder @@ -48,7 +48,7 @@ json.projects @projects do |project| json.name project.project_language.name end end - json.is_member !project.members.where(user_id: current_user.id).blank? + json.is_member project.member?(current_user.id) user_apply_signatures = project.apply_signatures.with_user_id(current_user.id) json.user_apply_signatures user_apply_signatures do |signature| json.id signature.id diff --git a/config/routes.rb b/config/routes.rb index 4866716a..b955d791 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -650,6 +650,7 @@ Rails.application.routes.draw do post :reset_login_times end end + resources :phenglei_users, only: [:index, :new, :create] resource :import_disciplines, only: [:create] resource :import_users, only: [:create] resource :import_course_members, only: [:create] @@ -827,7 +828,11 @@ Rails.application.routes.draw do resources :courses, only: [:index, :destroy, :update] - resources :projects, only: [:index, :destroy] + resources :projects, only: [:index, :destroy] do + member do + get :sync_phenglei_user + end + end resources :disciplines, only: [:index, :create, :edit, :update, :destroy] do post :adjust_position, on: :member diff --git a/config/sidekiq_cron.yml b/config/sidekiq_cron.yml index 3e807fa1..880843ce 100644 --- a/config/sidekiq_cron.yml +++ b/config/sidekiq_cron.yml @@ -2,3 +2,7 @@ sync_gitea_repo_update_time: cron: "0 0 * * *" class: "SyncRepoUpdateTimeJob" queue: default +sync_phenglei_user: + cron: "0 23 * * *" + class: "SyncPhengleiUserJob" + queue: default \ No newline at end of file diff --git a/db/migrate/20210310012914_create_phenglei_users.rb b/db/migrate/20210310012914_create_phenglei_users.rb new file mode 100644 index 00000000..fee06520 --- /dev/null +++ b/db/migrate/20210310012914_create_phenglei_users.rb @@ -0,0 +1,15 @@ +class CreatePhengleiUsers < ActiveRecord::Migration[5.2] + def change + create_table :phenglei_users do |t| + t.string :phone + + t.timestamps + end + doc = SimpleXlsxReader.open("#{Rails.root}/public/phenglei_user.xlsx") + data = doc.sheets.first.rows + data.each_with_index do |i, index| + next if index == 0 || i[1].nil? + PhengleiUser.find_or_create_by(phone: i[1]) + end + end +end diff --git a/db/migrate/20210317062206_add_order_index_to_project.rb b/db/migrate/20210317062206_add_order_index_to_project.rb new file mode 100644 index 00000000..f48a0ec1 --- /dev/null +++ b/db/migrate/20210317062206_add_order_index_to_project.rb @@ -0,0 +1,5 @@ +class AddOrderIndexToProject < ActiveRecord::Migration[5.2] + def change + add_column :projects, :order_index, :integer, default: 0 + end +end diff --git a/public/phenglei_user.xlsx b/public/phenglei_user.xlsx new file mode 100644 index 00000000..df47986f Binary files /dev/null and b/public/phenglei_user.xlsx differ diff --git a/public/police.png b/public/police.png new file mode 100644 index 00000000..b361af63 Binary files /dev/null and b/public/police.png differ diff --git a/spec/models/phenglei_user_spec.rb b/spec/models/phenglei_user_spec.rb new file mode 100644 index 00000000..9fa273fe --- /dev/null +++ b/spec/models/phenglei_user_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe PhengleiUser, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end