diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 58ae02add..99d63dfe3 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -60,8 +60,10 @@ class QualityAnalysisController < ApplicationController
else
@name_flag = false
resource_id = params[:resource_id]
- complexity_date = open("http://123.59.135.93:8891/api/resources/index?resource=139&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
+ complexity_date = open("http://123.59.135.93:8891/api/resources/index?resource=#{resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
@complexity =JSON.parse(complexity_date).first
+ issue_date = open("http://123.59.135.93:8891/api/resources/index?resource=#{resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
+ @sonar_issues = JSON.parse(issue_date).first
end
end
diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index 62993ea1b..98b5cadd7 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -4,12 +4,13 @@ module QualityAnalysisHelper
if val.to_i > 0 && val.to_i < 5
"henhao"
elsif val.to_i > 5 && val.to_i < 10
-
+ "jiaohao"
elsif val.to_i > 10 && val.to_i < 20
+ "zhongdeng"
elsif val.to_i > 20 && val.to_i < 50
- "yiban"
+ "jiaocha"
elsif val.to_i > 20
- "cha"
+ "hencha"
end
end
@@ -42,4 +43,29 @@ module QualityAnalysisHelper
"hao"
end
end
+
+ def score_sqale_rating val
+ if val.to_i > 0 && val.to_i < 5
+ "5"
+ elsif val.to_i > 5 && val.to_i < 10
+ "4"
+ elsif val.to_i > 10 && val.to_i < 20
+ "3"
+ elsif val.to_i > 20 && val.to_i < 50
+ "2"
+ elsif val.to_i > 20
+ "1"
+ end
+ end
+
+ def lines_scale val
+ if val.to_i < 5000
+ "zhongdeng"
+ elsif val.to_i >5000 && val.to_i < 50000
+ "zhongdneg"
+ else
+ "da"
+ end
+ end
+
end
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 4265a6e6c..522b004a8 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -8,6 +8,8 @@
duplicated_lines_density: <%= @complexity["msr"][7]["frmt_val"] %>
sqale_index: <%= @complexity["msr"][8]["frmt_val"] %>
sqale_rating: <%= @complexity["msr"][9]["frmt_val"] %>
+
+ issues: <%= @sonar_issues["msr"][0]["frmt_val"] %>
<%# DD %>
@@ -48,19 +50,19 @@
- 质量等级2/5分可定性评价为：质量中等
+ 质量等级<%= score_sqale_rating(@complexity["msr"][9]["val"]) %>/5分可定性评价为：质量<%= sqale_rating_status(@complexity["msr"][9]["val"]) %>
-
技术债务14天查看详情
-
质量问题130问题分类如下：
+
技术债务<%= @complexity["msr"][8]["frmt_val"] %>查看详情
+
质量问题<%= @sonar_issues["msr"][0]["frmt_val"] %>问题分类如下：
-
阻断4
-
严重75
-
主要428
-
次要225
-
信息114
+
阻断<%= @sonar_issues["msr"][1]["frmt_val"] %>
+
严重<%= @sonar_issues["msr"][2]["frmt_val"] %>
+
主要<%= @sonar_issues["msr"][3]["frmt_val"] %>
+
次要<%= @sonar_issues["msr"][4]["frmt_val"] %>
+
信息<%= @sonar_issues["msr"][5]["frmt_val"] %>
代码规模可定性评价为：规模中等
+ 代码规模可定性评价为：<%= lines_scale(@complexity["msr"][0]["frmt_val"]) %>