V0 测试良率合并

This commit is contained in:
Simmons 2024-09-30 18:22:23 +08:00
parent b4585e530b
commit 8e93cc94f5
2 changed files with 160 additions and 15 deletions

View File

@ -1528,3 +1528,58 @@
2024-09-29 17:20:05 INFO | 192.168.0.219 | 200 | 31.6519ms | POST | 未登录 | /testData/report/ft
2024-09-29 17:29:03 INFO | 192.168.0.219 | 200 | 28.9785ms | POST | 未登录 | /testData/report/ft
2024-09-29 17:30:05 INFO | 192.168.0.219 | 200 | 34.3785ms | POST | 未登录 | /testData/report/ft
2024-09-30 09:57:01 INFO | 192.168.0.219 | 200 | 15.3778ms | GET | 未登录 | /testData/finalReport/excel?page=1&pageSize=20&key_word=
2024-09-30 10:00:17 INFO | 192.168.0.219 | 200 | 3.76ms | GET | 未登录 | /testData/finalReport/excel?page=1&pageSize=20&key_word=
2024-09-30 10:07:45 INFO | 192.168.0.219 | 200 | 6.0647ms | POST | 未登录 | /testData/report/fTPassProbabilityByFactory
2024-09-30 10:48:09 INFO | 192.168.0.219 | 200 | 3.5297ms | POST | 未登录 | /testData/report/fTPassProbabilityByProduct
2024-09-30 10:48:19 INFO | 192.168.0.219 | 200 | 2.0923ms | POST | 未登录 | /testData/report/fTPassProbabilityByProduct
2024-09-30 11:31:16 INFO | 192.168.0.219 | 200 | 2.4098ms | POST | 未登录 | /testData/report/fTPassProbabilityByProduct
2024-09-30 14:36:03 INFO | 192.168.0.219 | 200 | 2.7767ms | POST | 未登录 | /testData/report/fTPassProbabilityByProduct
2024-09-30 14:37:00 INFO | 192.168.0.219 | 200 | 41.0809677s | POST | 未登录 | /testData/report/fTPassProbabilityByFactory
2024-09-30 14:37:31 INFO | 192.168.0.219 | 200 | 19.8383358s | POST | 未登录 | /testData/report/fTPassProbabilityByFactory
2024-09-30 14:40:50 INFO | 192.168.0.219 | 200 | 1m9.7623863s | POST | 未登录 | /testData/report/fTPassProbabilityByFactory
2024-09-30 15:07:09 INFO | 192.168.0.219 | 200 | 3.1301ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:07:13 INFO | 192.168.0.219 | 200 | 2.2668ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:08:22 INFO | 192.168.0.219 | 200 | 44.0404416s | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:08:32 INFO | 192.168.0.219 | 200 | 6.2767642s | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:09:54 INFO | 192.168.0.219 | 200 | 8.0557118s | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:10:26 INFO | 192.168.0.219 | 200 | 3.6342072s | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:12:46 INFO | 192.168.0.219 | 200 | 3.5567551s | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:13:39 INFO | 192.168.0.219 | 200 | 2.4357895s | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:17:19 INFO | 192.168.0.219 | 200 | 2.28404s | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:17:32 INFO | 192.168.0.219 | 200 | 1.8122ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:17:32 INFO | 192.168.0.219 | 200 | 1.7202ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:17:32 INFO | 192.168.0.219 | 200 | 2.4019ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:17:33 INFO | 192.168.0.219 | 200 | 1.9593ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:17:33 INFO | 192.168.0.219 | 200 | 2.0753ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:17:33 INFO | 192.168.0.219 | 200 | 1.8319ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:17:33 INFO | 192.168.0.219 | 200 | 1.531ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:17:36 INFO | 192.168.0.219 | 200 | 2.433ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:17:39 INFO | 192.168.0.219 | 200 | 2.2056ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:17:53 INFO | 192.168.0.219 | 200 | 3.8757ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:20:08 INFO | 192.168.0.219 | 200 | 2.1957ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:20:24 INFO | 192.168.0.219 | 200 | 2.5756ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:20:53 INFO | 192.168.0.219 | 200 | 1.7448ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:21:22 INFO | 192.168.0.219 | 200 | 2.3044ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:23:57 INFO | 192.168.0.219 | 200 | 2m1.9331055s | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:26:33 INFO | 192.168.0.219 | 200 | 27.2927254s | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:27:24 INFO | 192.168.0.219 | 200 | 1.628064s | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:27:46 INFO | 192.168.0.219 | 200 | 1.9542418s | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:30:12 INFO | 192.168.0.219 | 200 | 2.5614ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:44:09 INFO | 192.168.0.219 | 200 | 2.4245ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:52:39 INFO | 192.168.0.219 | 200 | 7m32.3851505s | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:52:53 INFO | 192.168.0.219 | 200 | 2.1614046s | POST | 未登录 | /testData/report/passProbability
2024-09-30 15:54:35 INFO | 192.168.0.219 | 200 | 1m32.8147897s | POST | 未登录 | /testData/report/passProbability
2024-09-30 16:03:21 INFO | 192.168.0.219 | 200 | 3m35.2687233s | POST | 未登录 | /testData/report/passProbability
2024-09-30 16:03:21 INFO | 192.168.0.219 | 200 | 4.2871ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 16:03:23 INFO | 192.168.0.219 | 200 | 7.5522ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 16:07:05 INFO | 192.168.0.219 | 200 | 1.8196ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 16:12:07 INFO | 192.168.0.219 | 200 | 4m50.172295s | POST | 未登录 | /testData/report/passProbability
2024-09-30 16:25:43 INFO | 192.168.0.219 | 200 | 3.84ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 16:25:51 INFO | 192.168.0.219 | 200 | 1.8048ms | POST | 未登录 | /testData/report/passProbability
2024-09-30 16:26:22 INFO | 192.168.0.219 | 200 | 14.7131767s | POST | 未登录 | /testData/report/passProbability
2024-09-30 16:26:45 INFO | 192.168.0.219 | 200 | 2.8050651s | POST | 未登录 | /testData/report/passProbability
2024-09-30 16:55:36 INFO | 192.168.0.219 | 200 | 28m47.6117557s | POST | 未登录 | /testData/report/passProbability
2024-09-30 17:06:56 INFO | 192.168.0.219 | 200 | 3.9757463s | POST | 未登录 | /testData/report/passProbability
2024-09-30 17:36:28 INFO | 192.168.0.219 | 200 | 3.475934s | POST | 未登录 | /testData/report/passProbability
2024-09-30 17:37:26 INFO | 192.168.0.219 | 200 | 1.6444186s | POST | 未登录 | /testData/report/passProbability

View File

@ -7,6 +7,7 @@ import (
"math"
"sort"
"strconv"
"strings"
"testData/global"
"testData/model"
"testData/request"
@ -476,8 +477,30 @@ func PassProbability(r *request.PassProbability) (interface{}, string) {
passProbabilityMap := make(map[string][]float64)
passProbabilityGroupMap := make(map[string]map[string][]float64)
startDate := carbon.Parse(r.StartDate)
endDate := carbon.Parse(r.EndDate)
//if len(r.X) == 1 && strings.Contains(r.X[0], "time") {
// if strings.Contains(r.X[0], "day") {
// for startDate.Lte(endDate) {
// passProbabilityMap[startDate.Format("Y-m-d")] = []float64{}
// startDate = startDate.AddDay()
// }
// } else if strings.Contains(r.X[0], "week") {
// for startDate.Lte(endDate) {
// passProbabilityMap[startDate.Format("Y-m-d")] = []float64{}
// startDate = startDate.AddWeek()
// }
// } else if strings.Contains(r.X[0], "month") {
// for startDate.Lte(endDate) {
// passProbabilityMap[startDate.Format("Y-m")] = []float64{}
// startDate = startDate.AddMonth()
// }
// }
//}
for _, report := range reports {
var s string
for _, x := range r.X {
if s != "" {
s += "-"
@ -496,6 +519,16 @@ func PassProbability(r *request.PassProbability) (interface{}, string) {
s += report.TestMachine
} else if x == "test_program" {
s += report.TestProgram
} else if strings.Contains(x, "time") {
if strings.Contains(x, "day") {
s += carbon.Parse(report.OrderDate).Format("Y-m-d")
} else if strings.Contains(x, "week") {
weekDate := carbon.Parse(report.OrderDate)
weekDate = startDate.AddWeeks(int(weekDate.DiffAbsInWeeks(startDate)))
s += weekDate.Format("Y-m-d")
} else if strings.Contains(x, "month") {
s += carbon.Parse(report.OrderDate).Format("Y-m")
}
}
}
if _, ok := passProbabilityMap[s]; !ok {
@ -534,16 +567,80 @@ func PassProbability(r *request.PassProbability) (interface{}, string) {
if r.ChartType == "line" {
var lines []*model.Line
var x, y []string
for k, v := range passProbabilityMap {
average := 0.0
for _, passProbability := range v {
average += passProbability
if len(r.X) == 1 && strings.Contains(r.X[0], "time") {
if strings.Contains(r.X[0], "day") {
for startDate.Lte(endDate) {
average := 0.0
k := startDate.Format("Y-m-d")
if _, ok := passProbabilityMap[k]; ok {
for _, passProbability := range passProbabilityMap[k] {
average += passProbability
}
}
if len(passProbabilityMap[k]) != 0 {
average /= float64(len(passProbabilityMap[k]))
}
x = append(x, k)
if average != 0.0 {
y = append(y, decimal.NewFromFloat(average).Round(2).String())
} else {
y = append(y, "")
}
startDate = startDate.AddDay()
}
} else if strings.Contains(r.X[0], "week") {
for startDate.Lte(endDate) {
average := 0.0
k := startDate.Format("Y-m-d")
if _, ok := passProbabilityMap[k]; ok {
for _, passProbability := range passProbabilityMap[k] {
average += passProbability
}
}
if len(passProbabilityMap[k]) != 0 {
average /= float64(len(passProbabilityMap[k]))
}
x = append(x, k)
if average != 0.0 {
y = append(y, decimal.NewFromFloat(average).Round(2).String())
} else {
y = append(y, "")
}
startDate = startDate.AddWeek()
}
} else if strings.Contains(r.X[0], "month") {
for startDate.Lte(endDate) {
average := 0.0
k := startDate.Format("Y-m")
if _, ok := passProbabilityMap[k]; ok {
for _, passProbability := range passProbabilityMap[k] {
average += passProbability
}
}
if len(passProbabilityMap[k]) != 0 {
average /= float64(len(passProbabilityMap[k]))
}
x = append(x, k)
if average != 0.0 {
y = append(y, decimal.NewFromFloat(average).Round(2).String())
} else {
y = append(y, "")
}
startDate = startDate.AddMonth()
}
}
if len(v) != 0 {
average /= float64(len(v))
} else {
for k, v := range passProbabilityMap {
average := 0.0
for _, passProbability := range v {
average += passProbability
}
if len(v) != 0 {
average /= float64(len(v))
}
x = append(x, k)
y = append(y, decimal.NewFromFloat(average).Round(2).String())
}
x = append(x, k)
y = append(y, decimal.NewFromFloat(average).Round(2).String())
}
if len(r.Group) == 0 {
line := &model.Line{
@ -614,13 +711,6 @@ func PassProbability(r *request.PassProbability) (interface{}, string) {
return nil, ""
}
// BinProbability
/*
@Description:
@param r
@return interface{}
@return string
*/
func BinProbability(r *request.BinProbability) (interface{}, string) {
var reports []*model.Report
if len(r.Product) == 0 && len(r.Lot) == 0 {