From 369345210a59c15354000e5754165be8a1278415 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 08 四月 2024 14:53:59 +0800
Subject: [PATCH] 更新文档
---
controllers/fineness.go | 54 +++++-----
docs/swagger.yaml | 57 +++++++++++
docs/docs.go | 80 +++++++++++++++
docs/swagger.json | 80 +++++++++++++++
controllers/workshop_manage_controller.go | 13 +-
router/router.go | 2
6 files changed, 248 insertions(+), 38 deletions(-)
diff --git a/controllers/fineness.go b/controllers/fineness.go
index f7a9b20..be6f107 100644
--- a/controllers/fineness.go
+++ b/controllers/fineness.go
@@ -5,6 +5,7 @@
"github.com/gin-gonic/gin"
"gorm.io/gorm"
"silkserver/controllers/request"
+ "silkserver/controllers/response"
"silkserver/extend/code"
"silkserver/extend/util"
"silkserver/models"
@@ -170,7 +171,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
@@ -193,32 +194,35 @@
// @Summary 绾ゅ害妫�楠岃鎯�
// @Produce application/json
// @Param id path string true "瀛楀吀淇℃伅"
-// @Success 200 {object} util.ResponseList{data=models.FinenessRegister} "鎴愬姛"
+// @Success 200 {object} util.ResponseList{data=models.FinenessCheck} "鎴愬姛"
// @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, info)
}
// CheckDelete
diff --git a/controllers/workshop_manage_controller.go b/controllers/workshop_manage_controller.go
index 5b4b706..c217afc 100644
--- a/controllers/workshop_manage_controller.go
+++ b/controllers/workshop_manage_controller.go
@@ -44,12 +44,13 @@
// GetWorkshopManageList
//
-// @Tags 绯荤粺璁剧疆/杞﹂棿绠＄悊
-// @Summary 鑾峰彇杞﹂棿绠＄悊鍒楄〃
-// @Produce application/json
-// @Param object query request.GetPriceStandard true "鍙傛暟"
-// @Success 200 {object} util.ResponseList{data=[]models.WorkshopManage} "鎴愬姛"
-// @Router /api-jl/v1/system/getWorkshopManageList [get]
+// @Tags 绯荤粺璁剧疆/杞﹂棿绠＄悊
+// @Summary 鑾峰彇杞﹂棿绠＄悊鍒楄〃
+// @Produce application/json
+// @Param Authorization header string true "token"
+// @Param object query request.GetPriceStandard true "鍙傛暟"
+// @Success 200 {object} util.ResponseList{data=[]models.WorkshopManage} "鎴愬姛"
+// @Router /api-jl/v1/system/getWorkshopManageList [get]
func (slf WorkshopManageController) GetWorkshopManageList(c *gin.Context) {
var param request.GetWorkshopManage
err := c.ShouldBindQuery(¶m)
diff --git a/docs/docs.go b/docs/docs.go
index 9332540..8a98a74 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -58,7 +58,7 @@
"data": {
"type": "array",
"items": {
- "$ref": "#/definitions/models.FinenessRegister"
+ "$ref": "#/definitions/models.FinenessCheck"
}
}
}
@@ -127,7 +127,7 @@
"type": "object",
"properties": {
"data": {
- "$ref": "#/definitions/models.FinenessRegister"
+ "$ref": "#/definitions/models.FinenessCheck"
}
}
}
@@ -628,6 +628,13 @@
"parameters": [
{
"type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "type": "string",
"name": "keyWord",
"in": "query"
},
@@ -880,6 +887,75 @@
}
}
},
+ "models.FinenessCheck": {
+ "type": "object",
+ "properties": {
+ "averageFineness": {
+ "description": "骞冲潎绾ゅ害",
+ "type": "number"
+ },
+ "cleanliness": {
+ "description": "娓呮磥搴�",
+ "type": "number"
+ },
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "deviation": {
+ "description": "鍋忓樊",
+ "type": "number"
+ },
+ "finenessGrade": {
+ "description": "绾ゅ害绛夌骇",
+ "type": "string"
+ },
+ "finenessRegister": {
+ "description": "绾ゅ害鐧昏",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.FinenessRegister"
+ }
+ ]
+ },
+ "finenessRegisterID": {
+ "description": "绾ゅ害鐧昏琛↖D",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "inspector": {
+ "description": "妫�楠屽憳",
+ "type": "string"
+ },
+ "marketProcessOrderNumber": {
+ "description": "搴勫彛宸ヨ壓鍗曠紪鍙�",
+ "type": "string"
+ },
+ "measureFineness": {
+ "description": "鍏噺绾ゅ害",
+ "type": "number"
+ },
+ "purity": {
+ "description": "娲佸噣搴�",
+ "type": "number"
+ },
+ "totalDeviation": {
+ "description": "鎬诲樊",
+ "type": "number"
+ },
+ "twiceChange": {
+ "description": "浜屽害鍙樺寲",
+ "type": "number"
+ },
+ "updatedAt": {
+ "type": "string"
+ }
+ }
+ },
"models.FinenessItem": {
"type": "object",
"properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index 5e4759f..768a2d3 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -46,7 +46,7 @@
"data": {
"type": "array",
"items": {
- "$ref": "#/definitions/models.FinenessRegister"
+ "$ref": "#/definitions/models.FinenessCheck"
}
}
}
@@ -115,7 +115,7 @@
"type": "object",
"properties": {
"data": {
- "$ref": "#/definitions/models.FinenessRegister"
+ "$ref": "#/definitions/models.FinenessCheck"
}
}
}
@@ -616,6 +616,13 @@
"parameters": [
{
"type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "type": "string",
"name": "keyWord",
"in": "query"
},
@@ -868,6 +875,75 @@
}
}
},
+ "models.FinenessCheck": {
+ "type": "object",
+ "properties": {
+ "averageFineness": {
+ "description": "骞冲潎绾ゅ害",
+ "type": "number"
+ },
+ "cleanliness": {
+ "description": "娓呮磥搴�",
+ "type": "number"
+ },
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "deviation": {
+ "description": "鍋忓樊",
+ "type": "number"
+ },
+ "finenessGrade": {
+ "description": "绾ゅ害绛夌骇",
+ "type": "string"
+ },
+ "finenessRegister": {
+ "description": "绾ゅ害鐧昏",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.FinenessRegister"
+ }
+ ]
+ },
+ "finenessRegisterID": {
+ "description": "绾ゅ害鐧昏琛↖D",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "inspector": {
+ "description": "妫�楠屽憳",
+ "type": "string"
+ },
+ "marketProcessOrderNumber": {
+ "description": "搴勫彛宸ヨ壓鍗曠紪鍙�",
+ "type": "string"
+ },
+ "measureFineness": {
+ "description": "鍏噺绾ゅ害",
+ "type": "number"
+ },
+ "purity": {
+ "description": "娲佸噣搴�",
+ "type": "number"
+ },
+ "totalDeviation": {
+ "description": "鎬诲樊",
+ "type": "number"
+ },
+ "twiceChange": {
+ "description": "浜屽害鍙樺寲",
+ "type": "number"
+ },
+ "updatedAt": {
+ "type": "string"
+ }
+ }
+ },
"models.FinenessItem": {
"type": "object",
"properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index bf95cdd..e1f5ffd 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -82,6 +82,54 @@
updatedAt:
type: string
type: object
+ models.FinenessCheck:
+ properties:
+ averageFineness:
+ description: 骞冲潎绾ゅ害
+ type: number
+ cleanliness:
+ description: 娓呮磥搴�
+ type: number
+ createdAt:
+ type: string
+ deletedAt:
+ $ref: '#/definitions/gorm.DeletedAt'
+ deviation:
+ description: 鍋忓樊
+ type: number
+ finenessGrade:
+ description: 绾ゅ害绛夌骇
+ type: string
+ finenessRegister:
+ allOf:
+ - $ref: '#/definitions/models.FinenessRegister'
+ description: 绾ゅ害鐧昏
+ finenessRegisterID:
+ description: 绾ゅ害鐧昏琛↖D
+ type: integer
+ id:
+ type: integer
+ inspector:
+ description: 妫�楠屽憳
+ type: string
+ marketProcessOrderNumber:
+ description: 搴勫彛宸ヨ壓鍗曠紪鍙�
+ type: string
+ measureFineness:
+ description: 鍏噺绾ゅ害
+ type: number
+ purity:
+ description: 娲佸噣搴�
+ type: number
+ totalDeviation:
+ description: 鎬诲樊
+ type: number
+ twiceChange:
+ description: 浜屽害鍙樺寲
+ type: number
+ updatedAt:
+ type: string
+ type: object
models.FinenessItem:
properties:
createdAt:
@@ -422,7 +470,7 @@
- properties:
data:
items:
- $ref: '#/definitions/models.FinenessRegister'
+ $ref: '#/definitions/models.FinenessCheck'
type: array
type: object
summary: 绾ゅ害妫�楠屽垪琛�
@@ -481,7 +529,7 @@
- $ref: '#/definitions/util.ResponseList'
- properties:
data:
- $ref: '#/definitions/models.FinenessRegister'
+ $ref: '#/definitions/models.FinenessCheck'
type: object
summary: 绾ゅ害妫�楠岃鎯�
tags:
@@ -770,6 +818,11 @@
/api-jl/v1/system/getWorkshopManageList:
get:
parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
- in: query
name: keyWord
type: string
diff --git a/router/router.go b/router/router.go
index c4d26c1..a16a304 100644
--- a/router/router.go
+++ b/router/router.go
@@ -18,7 +18,7 @@
r.StaticFS(conf.LocalConf.StorePath, http.Dir(conf.LocalConf.StorePath)) // 涓虹敤鎴峰ご鍍忓拰鏂囦欢鎻愪緵闈欐�佸湴鍧�
r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
- r.Use(middleware.JWTAuth())
+ //r.Use(middleware.JWTAuth())
//r.Use(middleware.VerifyResetPwd())
urlPrefix := "/api-jl/v1"
--
Gitblit v1.8.0