From 7dd6097d42d6d6f254a84ab0111bac70f0358660 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 30 四月 2024 10:20:40 +0800
Subject: [PATCH] 加一些注释
---
controllers/fineness.go | 186 +++++++++++++++++++++++++++++++---------------
1 files changed, 126 insertions(+), 60 deletions(-)
diff --git a/controllers/fineness.go b/controllers/fineness.go
index f7a9b20..9cc41d3 100644
--- a/controllers/fineness.go
+++ b/controllers/fineness.go
@@ -3,8 +3,10 @@
import (
"errors"
"github.com/gin-gonic/gin"
+ "github.com/shopspring/decimal"
"gorm.io/gorm"
"silkserver/controllers/request"
+ "silkserver/controllers/response"
"silkserver/extend/code"
"silkserver/extend/util"
"silkserver/models"
@@ -12,6 +14,7 @@
"silkserver/pkg/logx"
"silkserver/pkg/structx"
"silkserver/service"
+ "strings"
)
type FinenessController struct{}
@@ -42,10 +45,28 @@
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
- err := models.WithTransaction(func(db *gorm.DB) error {
+
+ 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
+ }
+
+ endCarMap, err := service.GetWorkshopEndCarMap(params.WorkshopNumber, params.WorkshopGroup)
+ if len(endCarMap) == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "璇ヨ溅闂存湭閰嶇疆杞﹀彿锛岃鍦ㄨ溅闂寸鐞嗕腑閰嶇疆!")
+ return
+ }
+
+ isNew := params.ID == 0
+
+ err = models.WithTransaction(func(db *gorm.DB) error {
search := models.NewFinenessRegisterSearch().SetOrm(db)
- if params.ID != 0 {
+ if !isNew {
if err := models.NewFinenessItemSearch().SetOrm(db).SetFinenessRegisterID(params.ID).Delete(); err != nil {
return err
}
@@ -56,9 +77,10 @@
})
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "淇濆瓨澶辫触")
+ return
}
- err = service.FinenessCheck(¶ms)
+ err = service.FinenessCheck(¶ms, silkStandard, endCarMap, isNew)
if err != nil {
logx.Errorf("service.FinenessCheck err:%v, finenessRegister:%+v", err, params)
util.ResponseFormat(c, code.RequestParamError, "鐢熸垚妫�楠岃〃澶辫触")
@@ -69,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 {
@@ -100,7 +145,7 @@
return
}
- list, total, err := models.NewFinenessRegisterSearch().SetKeyword(params.Keyword).SetPage(params.Page, params.PageSize).Find()
+ list, total, err := models.NewFinenessRegisterSearch().SetKeyword(params.Keyword).SetPage(params.Page, params.PageSize).SetOrder("id desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
@@ -170,7 +215,7 @@
// @Summary 绾ゅ害妫�楠屽垪琛�
// @Produce application/json
// @Param object query request.GetFinenessRegisterList true "鏌ヨ鍙傛暟"
-// @Success 200 {object} util.ResponseList{data=[]models.FinenessRegister} "鎴愬姛"
+// @Success 200 {object} util.ResponseList{data=[]models.FinenessCheck} "鎴愬姛"
// @Router /api-jl/v1/fineness/check [get]
func (slf FinenessController) CheckList(c *gin.Context) {
var params request.GetFinenessRegisterList
@@ -179,7 +224,7 @@
return
}
- list, total, err := models.NewFinenessCheckSearch().SetPage(params.Page, params.PageSize).Find()
+ list, total, err := models.NewFinenessCheckSearch().SetPage(params.Page, params.PageSize).SetPreload().SetOrder("id desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
@@ -193,32 +238,35 @@
// @Summary 绾ゅ害妫�楠岃鎯�
// @Produce application/json
// @Param id path string true "瀛楀吀淇℃伅"
-// @Success 200 {object} util.ResponseList{data=models.FinenessRegister} "鎴愬姛"
+// @Success 200 {object} util.ResponseList{data=response.FinenessCheckInfo} "鎴愬姛"
// @Router /api-jl/v1/fineness/check/{id} [get]
func (slf FinenessController) CheckInfo(c *gin.Context) {
- //idStr := c.Param("id")
- //if idStr == "0" || idStr == "" {
- // util.ResponseFormat(c, code.RequestParamError, "绌虹殑璁板綍id")
- // return
- //}
- //
- //id := convertx.StringToUInt(idStr)
- //if id == 0 {
- // util.ResponseFormat(c, code.RequestParamError, "绌虹殑璁板綍id")
- // return
- //}
- //
- //info, err := models.NewFinenessCheckSearch().SetID(id).SetPreload().First()
- //if err != nil {
- // util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
- // return
- //}
- //resp := new(response.FinenessCheckInfo)
- //resp.Info = info
- //resp.Items, err := models.NewFinenessCheckItemSearch().SetPage()
- //
- //
- //util.ResponseFormat(c, code.Success, info)
+ idStr := c.Param("id")
+ if idStr == "0" || idStr == "" {
+ util.ResponseFormat(c, code.RequestParamError, "绌虹殑璁板綍id")
+ return
+ }
+
+ id := convertx.StringToUInt(idStr)
+ if id == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "绌虹殑璁板綍id")
+ return
+ }
+
+ info, err := models.NewFinenessCheckSearch().SetID(id).SetPreload().First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
+ return
+ }
+ resp := new(response.FinenessCheckInfo)
+ resp.Info = info
+ resp.Items, err = models.NewFinenessCheckItemSearch().SetFinenessRegisterID(info.FinenessRegisterID).FindAll()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, resp)
}
// CheckDelete
@@ -266,52 +314,70 @@
// @Tags 绾ゅ害妫�楠�
// @Summary 绾ゅ害妫�楠屼慨鏀�
// @Produce application/json
-// @Param object body request.AddFinenessRegister 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 reqParams request.AddFinenessRegister
- var params models.FinenessRegister
- if err := c.BindJSON(&reqParams); err != nil {
+ var params response.FinenessCheckInfo
+ if err := c.BindJSON(¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
- if err := structx.AssignTo(reqParams, ¶ms); err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鏁版嵁杞崲閿欒")
+ if params.Info == nil || params.Info.FinenessRegisterID == 0 || len(params.Items) == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟缂哄け")
return
}
- if err := slf.ParamsCheck(params); err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
- return
- }
-
- check, 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 = models.WithTransaction(func(db *gorm.DB) error {
- search := models.NewFinenessRegisterSearch().SetOrm(db)
-
- if params.ID != 0 {
- if err := models.NewFinenessCheckItemSearch().SetOrm(db).SetFinenessRegisterID(check.FinenessRegisterID).Delete(); err != nil {
- return err
- }
- return search.Save(¶ms)
- } else {
- return search.Create(¶ms)
- }
- })
+ check := params.Info
+ finenessRegister, err := models.NewFinenessRegisterSearch().SetID(check.FinenessRegisterID).First()
if err != nil {
- 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 = service.FinenessCheck(¶ms)
+ 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 {
- logx.Errorf("service.FinenessCheck err:%v, finenessRegister:%+v", err, params)
- util.ResponseFormat(c, code.RequestParamError, "鐢熸垚妫�楠岃〃澶辫触")
+ util.ResponseFormat(c, code.SaveFail, "淇濆瓨澶辫触")
return
}
--
Gitblit v1.8.0