Merge branch 'master' of http://192.168.5.5:10010/r/silk/silkServer

liujiandao

2024-04-30 52d6ec2b86005444441a7c7033d7d2ffd35631d2

 service/fineness.go

@@ -18,45 +18,20 @@
   var carCheckNumber = 0 //单个car已检查样本数

   var item *models.FinenessCheckItem
   var deviation decimal.Decimal
   var deviation, totalDeviation decimal.Decimal
   var finenessGrade string
   var roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0)
   lastCarNo = finenessRegister.FinenessList[0].Position
   for _, finenessItem := range finenessRegister.FinenessList {
      roundedHalfFineness := ToRoundedHalfFineness(finenessItem.Fineness)
      if lastCarNo != finenessItem.Position { //每个车号存一个models.FinenessCheckItem
         carCheckNumber = 0
         lastCarNo = finenessItem.Position
      }
      roundedHalfFineness := ToRoundedHalfFineness(finenessItem.Fineness) //类似四舍五入
      fineness := decimal.NewFromFloat32(roundedHalfFineness)
      for i := 0; i < finenessItem.Quantity; i++ {
         allFinenessList = append(allFinenessList, fineness)
      }
      personFinenessList = append(personFinenessList, fineness)
      carCheckNumber++
      if carCheckNumber == constvar.EveryPersonCarCheckNumber {
         carCheckNumber = 0
         if endCarMap[finenessItem.Position] { //走到了某个人最后的车号,每人算一次偏差和等级
            deviation = utils.Deviation(personFinenessList)
            finenessGrade = CalcFinenessGrade(item.Deviation, item.TotalDeviation, item.Cleanliness, item.Purity, item.TwiceChange, standardMap)
            personFinenessList = personFinenessList[:0]
         }
      }
      if lastCarNo != finenessItem.Position { //每个车号存一个models.FinenessCheckItem
         roundingItems := make([]*models.FinenessRoundingItem, 0, len(roundingItemMap))
         for _, v := range roundingItemMap {
            roundingItems = append(roundingItems, &models.FinenessRoundingItem{
               Fineness: v.Fineness,
               Quantity: v.Quantity,
            })
         }
         item = &models.FinenessCheckItem{
            FinenessRegisterID:    finenessRegister.ID,
            Position:              lastCarNo,
            FinenessRoundingItems: roundingItems,
            Deviation:             deviation,
            FinenessGrade:         finenessGrade,
            Remark:                "",
         }

         finenessCheckItems = append(finenessCheckItems, item)
         lastCarNo = finenessItem.Position
         roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0)
         personFinenessList = append(personFinenessList, fineness)
      }

      if roundingItemMap[roundedHalfFineness] == nil {
@@ -66,6 +41,24 @@
         }
      } else {
         roundingItemMap[roundedHalfFineness].Quantity += finenessItem.Quantity
      }

      carCheckNumber++
      if carCheckNumber == constvar.EveryPersonCarCheckNumber {
         carCheckNumber = 0
         if endCarMap[finenessItem.Position] { //走到了某个人最后的车号,每人算一次偏差和等级
            deviation = utils.Deviation(personFinenessList)
            totalDeviation = TotalDeviation(personFinenessList, utils.Average(personFinenessList))
            finenessGrade = CalcFinenessGrade(deviation, totalDeviation, decimal.Zero, decimal.Zero, decimal.Zero, standardMap)
            personFinenessList = personFinenessList[:0]
         } else {
            deviation = decimal.Zero
            totalDeviation = decimal.Zero
            finenessGrade = ""
         }
         item = MakeFinenessCheckItem(roundingItemMap, finenessRegister.ID, lastCarNo, deviation, totalDeviation, finenessGrade)
         finenessCheckItems = append(finenessCheckItems, item)
         roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0) //重置
      }
   }

@@ -113,6 +106,27 @@
   return err
}

func MakeFinenessCheckItem(roundingItemMap map[float32]*models.FinenessRoundingItem, finenessRegisterID uint, position int, deviation, totalDeviation decimal.Decimal, finenessGrade string) *models.FinenessCheckItem {
   roundingItems := make([]*models.FinenessRoundingItem, 0, len(roundingItemMap))
   for _, v := range roundingItemMap {
      roundingItems = append(roundingItems, &models.FinenessRoundingItem{
         Fineness: v.Fineness,
         Quantity: v.Quantity,
      })
   }
   item := &models.FinenessCheckItem{
      FinenessRegisterID:    finenessRegisterID,
      Position:              position,
      FinenessRoundingItems: roundingItems,
      Deviation:             deviation,
      TotalDeviation:        totalDeviation,
      FinenessGrade:         finenessGrade,
      Remark:                "",
   }

   return item
}

type gradeRank struct {
   gradeName string
   gradeRank int
@@ -122,14 +136,11 @@
   checkItemGradeMap := make(map[constvar.CheckItem]string, 5)
   gradeRanks := make([]gradeRank, 0)
   for _, st := range standardMap {
      if st.StartFineness.GreaterThan(deviation) || st.EndFineness.LessThan(deviation) {
         continue
      }
      grade := ""
      for _, pair := range st.ValueList {
         switch st.CheckItem {
         case constvar.CheckItemDeviation:
            if st.SortType == SortTypeAsc {
            if st.SortType == ValueTypeSmallerBetter {
               if deviation.LessThanOrEqual(pair.RankValue) {
                  grade = pair.RankName
               }
@@ -139,7 +150,7 @@
               }
            }
         case constvar.CheckItemMaxDeviation:
            if st.SortType == SortTypeAsc {
            if st.SortType == ValueTypeSmallerBetter {
               if totalDeviation.LessThanOrEqual(pair.RankValue) {
                  grade = pair.RankName
               }
@@ -149,7 +160,7 @@
               }
            }
         case constvar.CheckItemTwiceChange:
            if st.SortType == SortTypeAsc {
            if st.SortType == ValueTypeSmallerBetter {
               if twiceChange.LessThanOrEqual(pair.RankValue) {
                  grade = pair.RankName
               }
@@ -159,7 +170,7 @@
               }
            }
         case constvar.CheckItemCleanliness:
            if st.SortType == SortTypeAsc {
            if st.SortType == ValueTypeSmallerBetter {
               if cleanliness.LessThanOrEqual(pair.RankValue) {
                  grade = pair.RankName
               }
@@ -169,7 +180,7 @@
               }
            }
         case constvar.CheckItemPurity:
            if st.SortType == SortTypeAsc {
            if st.SortType == ValueTypeSmallerBetter {
               if purity.LessThanOrEqual(pair.RankValue) {
                  grade = pair.RankName
               }
@@ -183,13 +194,14 @@
            break
         }
      }
      if grade != "" {
         checkItemGradeMap[st.CheckItem] = grade
         gradeRanks = append(gradeRanks, gradeRank{
            gradeName: grade,
            gradeRank: st.GradeRank[grade],
         })
      if grade == "" {
         grade = constvar.BadFinenessGradeC
      }
      checkItemGradeMap[st.CheckItem] = grade
      gradeRanks = append(gradeRanks, gradeRank{
         gradeName: grade,
         gradeRank: st.GradeRank[grade],
      })
   }
   if len(gradeRanks) == 0 {
      return ""
@@ -217,15 +229,6 @@
   // 保留一位小数，并在整数情况下在小数点后加一个零
   result = float32(math.Round(float64(result)*10) / 10)
   return result
}

func FinenessReCheck(finenessCheck *models.FinenessCheck) (err error) {
   standardMap, err := GetSilkRankStandard()
   if err != nil {
      return err
   }
   finenessCheck.FinenessGrade = CalcFinenessGrade(finenessCheck.Deviation, finenessCheck.TotalDeviation, finenessCheck.Cleanliness, finenessCheck.Purity, finenessCheck.TwiceChange, standardMap)
   return
}

func TotalDeviation(numbers []decimal.Decimal, average decimal.Decimal) decimal.Decimal {