消息的调整

app/controllers/student_works_controller.rb

@@ -360,7 +360,7 @@ class StudentWorksController < ApplicationController
           Tiding.create(user_id: @work.user_id, trigger_user_id: User.current.id, container_id: new_score.id,
                         container_type: "StudentWorksScore", parent_container_id: @work.id,
                         parent_container_type: "HomeworkCommon", belong_container_id: @homework.course_id,
-                        belong_container_type: "Course", viewed: 0, tiding_type: "HomeworkCommon", extra: new_score.reviewer_role)
+                        belong_container_type: "Course", viewed: 0, tiding_type: new_score.reviewer_role == 3 ? "System" : "HomeworkCommon", extra: new_score.reviewer_role)
 
           case new_score.reviewer_role
           when 1 #教师评分：最后一个教师评分为最终评分

app/jobs/student_work_score_appeal_notify_job.rb

@@ -19,11 +19,20 @@ class StudentWorkScoreAppealNotifyJob < ApplicationJob
       belong_container_id: course.id, belong_container_type: 'Course',
       tiding_type: 'HomeworkCommon', viewed: 0, status: 0
     }
+
+    student_same_attrs = {
+      trigger_user_id: 0,
+      container_id: appeal.id, container_type: 'StudentWorksScoresAppeal',
+      parent_container_id: score.student_work_id, parent_container_type: 'StudentWork',
+      belong_container_id: course.id, belong_container_type: 'Course',
+      tiding_type: 'System', viewed: 0, status: 0
+    }
+
     Tiding.bulk_insert(*attrs) do |worker|
       course.course_member(user).member_teachers.each do |teacher|
         worker.add same_attrs.merge(user_id: teacher.user_id)
       end
-      worker.add same_attrs.merge(user_id: score.user_id)
+      worker.add student_same_attrs.merge(user_id: score.user_id)
     end
   end
 end

app/views/tidings/_tiding.json.jbuilder

@@ -18,7 +18,14 @@ json.time tiding.how_long_time
 json.new_tiding tiding.unread?(@onclick_time)
 
 json.trigger_user do
-  json.partial! 'users/user_simple', user: tiding.trigger_user_id.zero? ? User.find(1) : tiding.trigger_user
+  if tiding.trigger_user_id.zero?
+    json.id 0
+    json.name "系统"
+    json.login ""
+    json.image_url "educoder/systemLogo.png"
+  else
+    json.partial! 'users/user_simple', user: tiding.trigger_user
+  end
 end
 
 json.attachments tiding.attachments, partial: 'attachments/attachment_small', as: :attachment

db/migrate/20190805014624_migrate_anonymous_tiding_type.rb

@@ -0,0 +1,6 @@
+class MigrateAnonymousTidingType < ActiveRecord::Migration[5.2]
+  def change
+    Tiding.where(container_type: "StudentWorksScore", extra: "3").update_all(tiding_type: "System", trigger_user_id: 0)
+    Tiding.where(container_type: "StudentWorksScoresAppeal", parent_container_type: "StudentWork", tiding_type: "HomeworkCommon").update_all(tiding_type: "System", trigger_user_id: 0)
+  end
+end