From 52d6ec2b86005444441a7c7033d7d2ffd35631d2 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 30 四月 2024 09:58:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/silk/silkServer
---
constvar/const.go | 6
models/raw_silk_rank_standard.go | 9 +
service/fineness.go | 115 +++++++++---------
service/silk_rank.go | 36 ++---
controllers/fineness.go | 108 ++++++++++++++---
docs/swagger.yaml | 11 +
docs/docs.go | 13 +
docs/swagger.json | 13 +
8 files changed, 203 insertions(+), 108 deletions(-)
diff --git a/constvar/const.go b/constvar/const.go
index b89e679..16118ac 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -38,9 +38,9 @@
type BadFinenessGrade string
const (
- BadFinenessGradeA = "badA"
- BadFinenessGradeB = "badB"
- BadFinenessGradeC = "badC"
+ BadFinenessGradeA = "閲庣氦"
+ BadFinenessGradeB = "澶ч噹"
+ BadFinenessGradeC = "鐗归噹"
)
const (
diff --git a/controllers/fineness.go b/controllers/fineness.go
index 61370ed..9cc41d3 100644
--- a/controllers/fineness.go
+++ b/controllers/fineness.go
@@ -3,6 +3,7 @@
import (
"errors"
"github.com/gin-gonic/gin"
+ "github.com/shopspring/decimal"
"gorm.io/gorm"
"silkserver/controllers/request"
"silkserver/controllers/response"
@@ -13,6 +14,7 @@
"silkserver/pkg/logx"
"silkserver/pkg/structx"
"silkserver/service"
+ "strings"
)
type FinenessController struct{}
@@ -39,7 +41,15 @@
return
}
- silkStandard, err := service.GetSilkRankStandard()
+ if err := slf.ParamsCheck(params); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ specArr := strings.Split(params.Spec, "/")
+ start, _ := decimal.NewFromString(specArr[0])
+ end, _ := decimal.NewFromString(specArr[1])
+ silkStandard, err := service.GetSilkRankStandard(start, end)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
@@ -47,12 +57,7 @@
endCarMap, err := service.GetWorkshopEndCarMap(params.WorkshopNumber, params.WorkshopGroup)
if len(endCarMap) == 0 {
- util.ResponseFormat(c, code.RequestParamError, "璇峰璇ヨ溅闂村拰杞︾粍杩涜杞﹀彿璁剧疆")
- return
- }
-
- if err := slf.ParamsCheck(params); err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
+ util.ResponseFormat(c, code.RequestParamError, "璇ヨ溅闂存湭閰嶇疆杞﹀彿锛岃鍦ㄨ溅闂寸鐞嗕腑閰嶇疆!")
return
}
@@ -72,6 +77,7 @@
})
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "淇濆瓨澶辫触")
+ return
}
err = service.FinenessCheck(¶ms, silkStandard, endCarMap, isNew)
@@ -85,6 +91,29 @@
}
func (slf FinenessController) ParamsCheck(params models.FinenessRegister) (err error) {
+ if params.Spec == "" || !strings.Contains(params.Spec, "/") {
+ return errors.New("瑙勬牸鏍煎紡涓嶆纭�")
+ }
+
+ specArr := strings.Split(params.Spec, "/")
+
+ _, err = decimal.NewFromString(specArr[0])
+ if err != nil {
+ return errors.New("瑙勬牸鏍煎紡涓嶆纭�")
+ }
+ _, err = decimal.NewFromString(specArr[1])
+ if err != nil {
+ return errors.New("瑙勬牸鏍煎紡涓嶆纭�")
+ }
+
+ if params.WorkshopNumber == "" || params.WorkshopGroup == 0 {
+ return errors.New("杞﹂棿杞︾粍鍙傛暟缂哄け")
+ }
+
+ if len(params.FinenessList) == 0 {
+ return errors.New("绾ゅ害鍒楄〃缂哄け")
+ }
+
if params.ID == 0 {
_, err = models.NewFinenessRegisterSearch().SetNumber(params.Number).First()
if err != gorm.ErrRecordNotFound {
@@ -285,33 +314,72 @@
// @Tags 绾ゅ害妫�楠�
// @Summary 绾ゅ害妫�楠屼慨鏀�
// @Produce application/json
-// @Param object body models.FinenessCheck true "瀛楀吀淇℃伅"
+// @Param object body response.FinenessCheckInfo true "鍙傛暟"
+// @Param Authorization header string true "token"
// @Success 200 {object} util.Response "鎴愬姛"
-// @Router /api-jl/v1/fineness/check [post]
+// @Router /api-jl/v1/fineness/check [PUT]
func (slf FinenessController) CheckEdit(c *gin.Context) {
- var params models.FinenessCheck
+ var params response.FinenessCheckInfo
if err := c.BindJSON(¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
+ if params.Info == nil || params.Info.FinenessRegisterID == 0 || len(params.Items) == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟缂哄け")
+ return
+ }
- _, err := models.NewFinenessCheckSearch().SetID(params.ID).First()
+ _, err := models.NewFinenessCheckSearch().SetID(params.Info.ID).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "妫�楠岃褰曚笉瀛樺湪")
return
}
-
- err = service.FinenessReCheck(¶ms)
+ check := params.Info
+ finenessRegister, err := models.NewFinenessRegisterSearch().SetID(check.FinenessRegisterID).First()
if err != nil {
- logx.Errorf("service.FinenessReCheck err:%v, finenessCheck:%+v", err, params)
- util.ResponseFormat(c, code.RequestParamError, "妫�楠屽け璐�")
+ util.ResponseFormat(c, code.RequestParamError, "绾ゅ害鐧昏涓嶅瓨鍦�")
+ return
+ }
+ specArr := strings.Split(finenessRegister.Spec, "/")
+ start, _ := decimal.NewFromString(specArr[0])
+ end, _ := decimal.NewFromString(specArr[1])
+ standardMap, err := service.GetSilkRankStandard(start, end)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ check.FinenessGrade = service.CalcFinenessGrade(check.Deviation, check.TotalDeviation, check.Cleanliness, check.Purity, check.TwiceChange, standardMap)
+
+ items := params.Items
+
+ for _, item := range items {
+ if item.FinenessGrade != "" {
+ item.FinenessGrade = service.CalcFinenessGrade(item.Deviation, item.TotalDeviation, item.Cleanliness, item.Purity, item.TwiceChange, standardMap)
+ }
+ }
+
+ err = models.WithTransaction(func(db *gorm.DB) error {
+ err = models.NewFinenessCheckSearch().SetOrm(db).Save(params.Info)
+ if err != nil {
+ return err
+ }
+
+ for _, item := range items {
+ if item.FinenessGrade == "" {
+ continue
+ }
+ err = models.NewFinenessCheckItemSearch().SetOrm(db).SetID(item.ID).UpdateByMap(map[string]interface{}{"fineness_grade": item.FinenessGrade})
+ if err != nil {
+ return err
+ }
+ }
+ return nil
+ })
+
+ if err != nil {
+ util.ResponseFormat(c, code.SaveFail, "淇濆瓨澶辫触")
return
}
- err = models.NewFinenessCheckSearch().Save(¶ms)
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "淇濆瓨澶辫触")
- return
- }
util.ResponseFormat(c, code.Success, "淇濆瓨鎴愬姛")
}
diff --git a/docs/docs.go b/docs/docs.go
index f56fb3f..2a40518 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -399,7 +399,7 @@
}
}
},
- "post": {
+ "put": {
"produces": [
"application/json"
],
@@ -409,13 +409,20 @@
"summary": "绾ゅ害妫�楠屼慨鏀�",
"parameters": [
{
- "description": "瀛楀吀淇℃伅",
+ "description": "鍙傛暟",
"name": "object",
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/models.FinenessCheck"
+ "$ref": "#/definitions/response.FinenessCheckInfo"
}
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
}
],
"responses": {
diff --git a/docs/swagger.json b/docs/swagger.json
index 63085e3..60235c7 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -387,7 +387,7 @@
}
}
},
- "post": {
+ "put": {
"produces": [
"application/json"
],
@@ -397,13 +397,20 @@
"summary": "绾ゅ害妫�楠屼慨鏀�",
"parameters": [
{
- "description": "瀛楀吀淇℃伅",
+ "description": "鍙傛暟",
"name": "object",
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/models.FinenessCheck"
+ "$ref": "#/definitions/response.FinenessCheckInfo"
}
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
}
],
"responses": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index e685d01..7d4e568 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1706,14 +1706,19 @@
summary: 绾ゅ害妫�楠屽垪琛�
tags:
- 绾ゅ害妫�楠�
- post:
+ put:
parameters:
- - description: 瀛楀吀淇℃伅
+ - description: 鍙傛暟
in: body
name: object
required: true
schema:
- $ref: '#/definitions/models.FinenessCheck'
+ $ref: '#/definitions/response.FinenessCheckInfo'
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
produces:
- application/json
responses:
diff --git a/models/raw_silk_rank_standard.go b/models/raw_silk_rank_standard.go
index 5cb41e9..2b72ffc 100644
--- a/models/raw_silk_rank_standard.go
+++ b/models/raw_silk_rank_standard.go
@@ -49,6 +49,11 @@
return slf
}
+func (slf *RawSilkRankStandardSearch) SetFineness(start, end decimal.Decimal) *RawSilkRankStandardSearch {
+ slf.StartFineness, slf.EndFineness = start, end
+ return slf
+}
+
func (slf *RawSilkRankStandardSearch) build() *gorm.DB {
db := slf.Orm.Table(slf.TableName())
@@ -56,6 +61,10 @@
db = db.Where("id = ?", slf.ID)
}
+ if !slf.StartFineness.IsZero() || !slf.EndFineness.IsZero() {
+ db = db.Where("start_fineness = ? and end_fineness = ?", slf.StartFineness, slf.EndFineness)
+ }
+
return db
}
diff --git a/service/fineness.go b/service/fineness.go
index b153513..d5e3663 100644
--- a/service/fineness.go
+++ b/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 { //姣忎釜杞﹀彿瀛樹竴涓猰odels.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 { //姣忎釜杞﹀彿瀛樹竴涓猰odels.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 {
diff --git a/service/silk_rank.go b/service/silk_rank.go
index ea8c57e..6d76999 100644
--- a/service/silk_rank.go
+++ b/service/silk_rank.go
@@ -14,7 +14,7 @@
EndFineness decimal.Decimal
GradeMap map[string]struct{}
ValueList []*Pair
- SortType SortType
+ SortType ValueType
GradeRank map[string]int
}
@@ -23,23 +23,23 @@
RankValue decimal.Decimal
}
-type SortType int
+type ValueType int
const (
- SortTypeAsc SortType = 0
- SortTypeDesc SortType = 1
+ ValueTypeSmallerBetter ValueType = 0 //鍊兼寜鍗囧簭鎺掑悕锛堝�艰秺澶э紝绛夌骇瓒婇珮锛�
+ ValueTypeGreaterBetter ValueType = 1 //鍊兼寜闄嶅簭鎺掑悕锛堝�艰秺灏忥紝绛夌骇瓒婁綆锛�
)
-var sortTypeMap = map[constvar.CheckItem]SortType{
- constvar.CheckItemDeviation: SortTypeAsc,
- constvar.CheckItemTwiceChange: SortTypeAsc,
- constvar.CheckItemCleanliness: SortTypeDesc,
- constvar.CheckItemPurity: SortTypeDesc,
- constvar.CheckItemMaxDeviation: SortTypeAsc,
+var sortTypeMap = map[constvar.CheckItem]ValueType{
+ constvar.CheckItemDeviation: ValueTypeSmallerBetter,
+ constvar.CheckItemTwiceChange: ValueTypeSmallerBetter,
+ constvar.CheckItemCleanliness: ValueTypeGreaterBetter,
+ constvar.CheckItemPurity: ValueTypeGreaterBetter,
+ constvar.CheckItemMaxDeviation: ValueTypeSmallerBetter,
}
-func GetSilkRankStandard() (map[string]*Standard, error) {
- rankStandards, err := models.NewRawSilkRankStandardSearch().FindNotTotal()
+func GetSilkRankStandard(startFineness, endFineness decimal.Decimal) (map[string]*Standard, error) {
+ rankStandards, err := models.NewRawSilkRankStandardSearch().SetFineness(startFineness, endFineness).FindNotTotal()
if err != nil {
return nil, err
}
@@ -87,28 +87,24 @@
}
}
//value鎺掑簭
- for k := range standardMap {
+ for k := range standardMap { //绛夌骇闄嶅簭鎺掑垪
sort.Slice(standardMap[k].ValueList, func(i, j int) bool {
sortType := sortTypeMap[standardMap[k].CheckItem]
standardMap[k].SortType = sortType
- if sortType == SortTypeAsc {
+ if sortType == ValueTypeSmallerBetter {
return standardMap[k].ValueList[i].RankValue.LessThan(standardMap[k].ValueList[j].RankValue)
} else {
return standardMap[k].ValueList[i].RankValue.GreaterThan(standardMap[k].ValueList[j].RankValue)
}
})
}
- //绛夌骇鎺掑悕
+ //绛夌骇鎺掑悕 GradeRank瓒婂ぇ锛岀瓑绾ц秺楂�
for lineId, standard := range standardMap {
for k, pair := range standard.ValueList {
if standardMap[lineId].GradeRank == nil {
standardMap[lineId].GradeRank = make(map[string]int, 0)
}
- if standard.SortType == SortTypeAsc {
- standardMap[lineId].GradeRank[pair.RankName] = k + 1
- } else {
- standardMap[lineId].GradeRank[pair.RankName] = len(standard.ValueList) - k
- }
+ standardMap[lineId].GradeRank[pair.RankName] = len(standard.ValueList) - k
}
}
return standardMap, nil
--
Gitblit v1.8.0