From 24d792c5f1d83e0375ae7f91132a75f1dbb8494e Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 29 二月 2024 17:48:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/silk/silkServer
---
extend/util/response.go | 6
.gitignore | 3
controllers/fineness.go | 99 ++++
models/fineness.go | 249 ++++++++++
go.mod | 1
controllers/request/fineness.go | 27 +
docs/swagger.yaml | 168 +++++++
docs/docs.go | 254 +++++++++++
docs/swagger.json | 254 +++++++++++
README.md | 12
router/router.go | 9
controllers/dict.go | 4
models/db.go | 2
main.go | 21
models/fineness_item.go | 238 ++++++++++
15 files changed, 1,331 insertions(+), 16 deletions(-)
diff --git a/.gitignore b/.gitignore
index 422019f..3de17a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
.idea
*.db
vendor
-logs
\ No newline at end of file
+logs
+silkserver
\ No newline at end of file
diff --git a/README.md b/README.md
index 47bcecc..403b13b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## WMS
+## SilkServer 缂笣绯荤粺
> 鍩轰簬 GIN + JWT + Gorm 寮�鍙戙��
@@ -12,13 +12,19 @@
### 蹇�熷紑濮�
+
```bash
-$ cd wms
+$ cd silkServer
# 閰嶇疆鍥藉唴浠ｇ悊(鍙��)
$ export GOPROXY=https://goproxy.cn
$ go build -v
-$ ./wms
+$ ./silkServer
```
+
+### 鏇存柊鎺ュ彛鏂囨。
+```bash
+swag init -pd
+```
\ No newline at end of file
diff --git a/controllers/dict.go b/controllers/dict.go
index f5b2799..b2af281 100644
--- a/controllers/dict.go
+++ b/controllers/dict.go
@@ -140,6 +140,10 @@
}
id := convertx.StringToUInt(idStr)
+ if id == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "绌虹殑璁板綍id")
+ return
+ }
err := models.NewDictSearch().SetID(id).Delete()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍒犻櫎澶辫触")
diff --git a/controllers/fineness.go b/controllers/fineness.go
new file mode 100644
index 0000000..a9068e3
--- /dev/null
+++ b/controllers/fineness.go
@@ -0,0 +1,99 @@
+package controllers
+
+import (
+ "github.com/gin-gonic/gin"
+ "silkserver/controllers/request"
+ "silkserver/extend/code"
+ "silkserver/extend/util"
+ "silkserver/models"
+ "silkserver/pkg/convertx"
+ "silkserver/pkg/structx"
+)
+
+type FinenessController struct{}
+
+// Add
+// @Tags 绾ゅ害鐧昏
+// @Summary 绾ゅ害鐧昏娣诲姞
+// @Produce application/json
+// @Param object body request.AddFinenessRegister true "瀛楀吀淇℃伅"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-jl/v1/fineness/register [post]
+func (slf FinenessController) Add(c *gin.Context) {
+ var reqParams request.AddFinenessRegister
+ var params models.FinenessRegister
+ if err := c.BindJSON(&reqParams); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ if err := structx.AssignTo(reqParams, ¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏁版嵁杞崲閿欒")
+ return
+ }
+
+ if err := slf.ParamsCheck(params); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ if err := models.NewFinenessRegisterSearch().Create(¶ms); err != nil {
+ util.ResponseFormat(c, code.SaveFail, "鎻掑叆澶辫触")
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
+}
+
+func (slf FinenessController) ParamsCheck(params models.FinenessRegister) (err error) {
+ return nil
+}
+
+// List
+// @Tags 绾ゅ害鐧昏
+// @Summary 绾ゅ害鐧昏鍒楄〃
+// @Produce application/json
+// @Param object query request.GetFinenessRegisterList true "鏌ヨ鍙傛暟"
+// @Success 200 {object} util.ResponseList{data=[]models.FinenessRegister} "鎴愬姛"
+// @Router /api-jl/v1/fineness/register [get]
+func (slf FinenessController) List(c *gin.Context) {
+ var params request.GetFinenessRegisterList
+ if err := c.ShouldBindQuery(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ list, total, err := models.NewFinenessRegisterSearch().Find()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
+ return
+ }
+
+ util.ResponseFormatList(c, code.Success, list, int(total))
+}
+
+// Delete
+// @Tags 绾ゅ害鐧昏
+// @Summary 绾ゅ害鐧昏鍒犻櫎
+// @Produce application/json
+// @Param id path string true "瀛楀吀淇℃伅"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-jl/v1/fineness/register/{id} [delete]
+func (slf FinenessController) Delete(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
+ }
+
+ err := models.NewFinenessRegisterSearch().SetID(id).Delete()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍒犻櫎澶辫触")
+ return
+ }
+ util.ResponseFormat(c, code.UpdateSuccess, "鍒犻櫎鎴愬姛")
+}
diff --git a/controllers/request/fineness.go b/controllers/request/fineness.go
new file mode 100644
index 0000000..6005044
--- /dev/null
+++ b/controllers/request/fineness.go
@@ -0,0 +1,27 @@
+package request
+
+import "github.com/shopspring/decimal"
+
+type AddFinenessRegister struct {
+ Number string `gorm:"type:varchar(255);not null;comment:缂栧彿" json:"number"` //缂栧彿
+ FinishDate string `gorm:"type:varchar(255);not null;comment:钀戒笣鏃堕棿" json:"finishDate"` //钀戒笣鏃堕棿
+ Workshop string `gorm:"type:varchar(255);not null;comment:杞﹂棿" json:"name"` //杞﹂棿
+ WorkshopGroup string `gorm:"type:varchar(255);not null;comment:杞︾粍" json:"workshopGroup"` //杞︾粍
+ Market string `gorm:"type:varchar(255);not null;comment:搴勫彛" json:"market"` //搴勫彛
+ Spec string `gorm:"type:varchar(255);not null;comment:瑙勬牸" json:"spec"` //瑙勬牸
+ StartCircle uint8 `gorm:"type:varchar(255);not null;comment:寮�濮嬪洖鏁�" json:"startCircle"` //寮�濮嬪洖鏁�
+ EndCircle uint8 `gorm:"type:varchar(255);not null;comment:缁撴潫鍥炴暟" json:"endCircle"` //缁撴潫鍥炴暟
+ FinenessList []FinenessItem `json:"finenessList"`
+ Sum FinenessItem `json:"sum"`
+}
+
+type FinenessItem struct {
+ Position int8 `json:"position"`
+ Fineness decimal.Decimal `json:"fineness"`
+ Quantity decimal.Decimal `json:"quantity"`
+ Sum decimal.Decimal `json:"sum"`
+}
+
+type GetFinenessRegisterList struct {
+ PageInfo
+}
diff --git a/docs/docs.go b/docs/docs.go
index 540b80a..33d264f 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -16,6 +16,110 @@
"host": "{{.Host}}",
"basePath": "{{.BasePath}}",
"paths": {
+ "/api-jl/v1/fineness/register": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绾ゅ害鐧昏"
+ ],
+ "summary": "绾ゅ害鐧昏鍒楄〃",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.FinenessRegister"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ },
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绾ゅ害鐧昏"
+ ],
+ "summary": "绾ゅ害鐧昏娣诲姞",
+ "parameters": [
+ {
+ "description": "瀛楀吀淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddFinenessRegister"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/fineness/register/{id}": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绾ゅ害鐧昏"
+ ],
+ "summary": "绾ゅ害鐧昏鍒犻櫎",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "瀛楀吀淇℃伅",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-jl/v1/system/dict": {
"get": {
"produces": [
@@ -244,6 +348,93 @@
}
}
},
+ "models.FinenessItem": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "fineness": {
+ "type": "number"
+ },
+ "finenessRegisterID": {
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "position": {
+ "type": "integer"
+ },
+ "quantity": {
+ "type": "number"
+ },
+ "sum": {
+ "type": "number"
+ },
+ "updatedAt": {
+ "type": "string"
+ }
+ }
+ },
+ "models.FinenessRegister": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "endCircle": {
+ "description": "缁撴潫鍥炴暟",
+ "type": "integer"
+ },
+ "finenessList": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.FinenessItem"
+ }
+ },
+ "finishDate": {
+ "description": "钀戒笣鏃堕棿",
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "market": {
+ "description": "搴勫彛",
+ "type": "string"
+ },
+ "name": {
+ "description": "杞﹂棿",
+ "type": "string"
+ },
+ "number": {
+ "description": "缂栧彿",
+ "type": "string"
+ },
+ "spec": {
+ "description": "瑙勬牸",
+ "type": "string"
+ },
+ "startCircle": {
+ "description": "寮�濮嬪洖鏁�",
+ "type": "integer"
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
+ "type": "string"
+ }
+ }
+ },
"request.AddDict": {
"type": "object",
"properties": {
@@ -269,6 +460,69 @@
}
}
},
+ "request.AddFinenessRegister": {
+ "type": "object",
+ "properties": {
+ "endCircle": {
+ "description": "缁撴潫鍥炴暟",
+ "type": "integer"
+ },
+ "finenessList": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/request.FinenessItem"
+ }
+ },
+ "finishDate": {
+ "description": "钀戒笣鏃堕棿",
+ "type": "string"
+ },
+ "market": {
+ "description": "搴勫彛",
+ "type": "string"
+ },
+ "name": {
+ "description": "杞﹂棿",
+ "type": "string"
+ },
+ "number": {
+ "description": "缂栧彿",
+ "type": "string"
+ },
+ "spec": {
+ "description": "瑙勬牸",
+ "type": "string"
+ },
+ "startCircle": {
+ "description": "寮�濮嬪洖鏁�",
+ "type": "integer"
+ },
+ "sum": {
+ "$ref": "#/definitions/request.FinenessItem"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
+ "type": "string"
+ }
+ }
+ },
+ "request.FinenessItem": {
+ "type": "object",
+ "properties": {
+ "fineness": {
+ "type": "number"
+ },
+ "position": {
+ "type": "integer"
+ },
+ "quantity": {
+ "type": "number"
+ },
+ "sum": {
+ "type": "number"
+ }
+ }
+ },
"request.UpdateDict": {
"type": "object",
"properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index e1a032f..a6d7a47 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -4,6 +4,110 @@
"contact": {}
},
"paths": {
+ "/api-jl/v1/fineness/register": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绾ゅ害鐧昏"
+ ],
+ "summary": "绾ゅ害鐧昏鍒楄〃",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.FinenessRegister"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ },
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绾ゅ害鐧昏"
+ ],
+ "summary": "绾ゅ害鐧昏娣诲姞",
+ "parameters": [
+ {
+ "description": "瀛楀吀淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddFinenessRegister"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/fineness/register/{id}": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绾ゅ害鐧昏"
+ ],
+ "summary": "绾ゅ害鐧昏鍒犻櫎",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "瀛楀吀淇℃伅",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-jl/v1/system/dict": {
"get": {
"produces": [
@@ -232,6 +336,93 @@
}
}
},
+ "models.FinenessItem": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "fineness": {
+ "type": "number"
+ },
+ "finenessRegisterID": {
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "position": {
+ "type": "integer"
+ },
+ "quantity": {
+ "type": "number"
+ },
+ "sum": {
+ "type": "number"
+ },
+ "updatedAt": {
+ "type": "string"
+ }
+ }
+ },
+ "models.FinenessRegister": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "endCircle": {
+ "description": "缁撴潫鍥炴暟",
+ "type": "integer"
+ },
+ "finenessList": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.FinenessItem"
+ }
+ },
+ "finishDate": {
+ "description": "钀戒笣鏃堕棿",
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "market": {
+ "description": "搴勫彛",
+ "type": "string"
+ },
+ "name": {
+ "description": "杞﹂棿",
+ "type": "string"
+ },
+ "number": {
+ "description": "缂栧彿",
+ "type": "string"
+ },
+ "spec": {
+ "description": "瑙勬牸",
+ "type": "string"
+ },
+ "startCircle": {
+ "description": "寮�濮嬪洖鏁�",
+ "type": "integer"
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
+ "type": "string"
+ }
+ }
+ },
"request.AddDict": {
"type": "object",
"properties": {
@@ -257,6 +448,69 @@
}
}
},
+ "request.AddFinenessRegister": {
+ "type": "object",
+ "properties": {
+ "endCircle": {
+ "description": "缁撴潫鍥炴暟",
+ "type": "integer"
+ },
+ "finenessList": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/request.FinenessItem"
+ }
+ },
+ "finishDate": {
+ "description": "钀戒笣鏃堕棿",
+ "type": "string"
+ },
+ "market": {
+ "description": "搴勫彛",
+ "type": "string"
+ },
+ "name": {
+ "description": "杞﹂棿",
+ "type": "string"
+ },
+ "number": {
+ "description": "缂栧彿",
+ "type": "string"
+ },
+ "spec": {
+ "description": "瑙勬牸",
+ "type": "string"
+ },
+ "startCircle": {
+ "description": "寮�濮嬪洖鏁�",
+ "type": "integer"
+ },
+ "sum": {
+ "$ref": "#/definitions/request.FinenessItem"
+ },
+ "workshopGroup": {
+ "description": "杞︾粍",
+ "type": "string"
+ }
+ }
+ },
+ "request.FinenessItem": {
+ "type": "object",
+ "properties": {
+ "fineness": {
+ "type": "number"
+ },
+ "position": {
+ "type": "integer"
+ },
+ "quantity": {
+ "type": "number"
+ },
+ "sum": {
+ "type": "number"
+ }
+ }
+ },
"request.UpdateDict": {
"type": "object",
"properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index c28c61e..24d7128 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -48,6 +48,66 @@
updatedAt:
type: string
type: object
+ models.FinenessItem:
+ properties:
+ createdAt:
+ type: string
+ deletedAt:
+ $ref: '#/definitions/gorm.DeletedAt'
+ fineness:
+ type: number
+ finenessRegisterID:
+ type: integer
+ id:
+ type: integer
+ position:
+ type: integer
+ quantity:
+ type: number
+ sum:
+ type: number
+ updatedAt:
+ type: string
+ type: object
+ models.FinenessRegister:
+ properties:
+ createdAt:
+ type: string
+ deletedAt:
+ $ref: '#/definitions/gorm.DeletedAt'
+ endCircle:
+ description: 缁撴潫鍥炴暟
+ type: integer
+ finenessList:
+ items:
+ $ref: '#/definitions/models.FinenessItem'
+ type: array
+ finishDate:
+ description: 钀戒笣鏃堕棿
+ type: string
+ id:
+ type: integer
+ market:
+ description: 搴勫彛
+ type: string
+ name:
+ description: 杞﹂棿
+ type: string
+ number:
+ description: 缂栧彿
+ type: string
+ spec:
+ description: 瑙勬牸
+ type: string
+ startCircle:
+ description: 寮�濮嬪洖鏁�
+ type: integer
+ updatedAt:
+ type: string
+ workshopGroup:
+ description: 杞︾粍
+ type: string
+ type: object
request.AddDict:
properties:
dictType:
@@ -63,6 +123,50 @@
remark:
description: 澶囨敞
type: string
+ type: object
+ request.AddFinenessRegister:
+ properties:
+ endCircle:
+ description: 缁撴潫鍥炴暟
+ type: integer
+ finenessList:
+ items:
+ $ref: '#/definitions/request.FinenessItem'
+ type: array
+ finishDate:
+ description: 钀戒笣鏃堕棿
+ type: string
+ market:
+ description: 搴勫彛
+ type: string
+ name:
+ description: 杞﹂棿
+ type: string
+ number:
+ description: 缂栧彿
+ type: string
+ spec:
+ description: 瑙勬牸
+ type: string
+ startCircle:
+ description: 寮�濮嬪洖鏁�
+ type: integer
+ sum:
+ $ref: '#/definitions/request.FinenessItem'
+ workshopGroup:
+ description: 杞︾粍
+ type: string
+ type: object
+ request.FinenessItem:
+ properties:
+ fineness:
+ type: number
+ position:
+ type: integer
+ quantity:
+ type: number
+ sum:
+ type: number
type: object
request.UpdateDict:
properties:
@@ -107,6 +211,70 @@
info:
contact: {}
paths:
+ /api-jl/v1/fineness/register:
+ get:
+ parameters:
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/models.FinenessRegister'
+ type: array
+ type: object
+ summary: 绾ゅ害鐧昏鍒楄〃
+ tags:
+ - 绾ゅ害鐧昏
+ post:
+ parameters:
+ - description: 瀛楀吀淇℃伅
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.AddFinenessRegister'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 绾ゅ害鐧昏娣诲姞
+ tags:
+ - 绾ゅ害鐧昏
+ /api-jl/v1/fineness/register/{id}:
+ delete:
+ parameters:
+ - description: 瀛楀吀淇℃伅
+ in: path
+ name: id
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 绾ゅ害鐧昏鍒犻櫎
+ tags:
+ - 绾ゅ害鐧昏
/api-jl/v1/system/dict:
get:
parameters:
diff --git a/extend/util/response.go b/extend/util/response.go
index cef9966..3aad2a8 100644
--- a/extend/util/response.go
+++ b/extend/util/response.go
@@ -17,7 +17,7 @@
Code int `json:"code"`
Msg string `json:"msg"`
Data interface{} `json:"data"`
- Total int `json:"total"`
+ Total interface{} `json:"total"`
Page int `json:"page"`
PageSize int `json:"pageSize"`
}
@@ -43,7 +43,7 @@
}
// ResponseFormatList 杩斿洖鍖呭惈鎬绘暟鐨勫垪琛�
-func ResponseFormatList(c *gin.Context, respStatus *code.Code, data interface{}, count int) {
+func ResponseFormatList(c *gin.Context, respStatus *code.Code, data interface{}, count interface{}) {
if respStatus == nil {
respStatus = code.RequestParamError
}
@@ -55,7 +55,7 @@
})
}
-func ResponseFormatListWithPage(c *gin.Context, respStatus *code.Code, data interface{}, count int, page, pageSize int) {
+func ResponseFormatListWithPage(c *gin.Context, respStatus *code.Code, data interface{}, count interface{}, page, pageSize int) {
if respStatus == nil {
respStatus = code.RequestParamError
}
diff --git a/go.mod b/go.mod
index f0da53f..5ff1b87 100644
--- a/go.mod
+++ b/go.mod
@@ -58,6 +58,7 @@
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+ github.com/shopspring/decimal v1.3.1 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
diff --git a/main.go b/main.go
index 12cb94a..b195719 100644
--- a/main.go
+++ b/main.go
@@ -1,11 +1,11 @@
package main
import (
+ "context"
"net/http"
"os"
"os/signal"
"silkserver/conf"
- "silkserver/constvar"
"silkserver/models"
"silkserver/pkg/logx"
"silkserver/router"
@@ -29,8 +29,6 @@
logx.Errorf("db init error! ", err.Error())
return
}
-
- go shutdown()
logx.Infof("server start serve...")
server := &http.Server{
Addr: ":" + conf.WebConf.Port,
@@ -38,16 +36,21 @@
ReadTimeout: 5 * time.Second,
WriteTimeout: 5 * time.Second,
}
-
+ go shutdown(server)
logx.Error(server.ListenAndServe().Error())
}
-func shutdown() {
+func shutdown(server *http.Server) {
quit := make(chan os.Signal, 1)
signal.Notify(quit, syscall.SIGKILL, syscall.SIGQUIT, syscall.SIGINT, syscall.SIGTERM)
<-quit
-
- _ = constvar.GrpcClient.Close()
- logx.Infof("server exited...")
- os.Exit(0)
+ // 鍒涘缓涓�涓笂涓嬫枃锛岃缃秴鏃舵椂闂�
+ ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+ defer cancel()
+ logx.Infof("server exiting...")
+ if err := server.Shutdown(ctx); err != nil {
+ logx.Warnf("鏈嶅姟浼橀泤閫�鍑哄け璐�: %v", err)
+ return
+ }
+ logx.Infof("server exited success")
}
diff --git a/models/db.go b/models/db.go
index caeed78..acec2fd 100644
--- a/models/db.go
+++ b/models/db.go
@@ -74,6 +74,8 @@
db := mysqlx.GetDB()
err := db.AutoMigrate(
Dict{},
+ FinenessRegister{},
+ FinenessItem{},
)
return err
}
diff --git a/models/fineness.go b/models/fineness.go
new file mode 100644
index 0000000..9486840
--- /dev/null
+++ b/models/fineness.go
@@ -0,0 +1,249 @@
+package models
+
+import (
+ "fmt"
+ "gorm.io/gorm"
+ "silkserver/pkg/mysqlx"
+)
+
+type (
+ // FinenessRegister 绾ゅ害鐧昏
+ FinenessRegister struct {
+ gorm.Model
+ Number string `gorm:"type:varchar(255);not null;comment:缂栧彿" json:"number"` //缂栧彿
+ FinishDate string `gorm:"type:varchar(255);not null;comment:钀戒笣鏃堕棿" json:"finishDate"` //钀戒笣鏃堕棿
+ Workshop string `gorm:"type:varchar(255);not null;comment:杞﹂棿" json:"name"` //杞﹂棿
+ WorkshopGroup string `gorm:"type:varchar(255);not null;comment:杞︾粍" json:"workshopGroup"` //杞︾粍
+ Market string `gorm:"type:varchar(255);not null;comment:搴勫彛" json:"market"` //搴勫彛
+ Spec string `gorm:"type:varchar(255);not null;comment:瑙勬牸" json:"spec"` //瑙勬牸
+ StartCircle uint8 `gorm:"type:varchar(255);not null;comment:寮�濮嬪洖鏁�" json:"startCircle"` //寮�濮嬪洖鏁�
+ EndCircle uint8 `gorm:"type:varchar(255);not null;comment:缁撴潫鍥炴暟" json:"endCircle"` //缁撴潫鍥炴暟
+ FinenessList []FinenessItem `gorm:"foreignkey:FinenessRegisterID" json:"finenessList"`
+ }
+ FinenessRegisterSearch struct {
+ FinenessRegister
+ Order string
+ PageNum int
+ PageSize int
+ Orm *gorm.DB
+ }
+)
+
+func (slf *FinenessRegister) TableName() string {
+ return "fineness_register"
+}
+
+func NewFinenessRegisterSearch() *FinenessRegisterSearch {
+ return &FinenessRegisterSearch{Orm: mysqlx.GetDB()}
+}
+
+func (slf *FinenessRegisterSearch) SetOrm(tx *gorm.DB) *FinenessRegisterSearch {
+ slf.Orm = tx
+ return slf
+}
+
+func (slf *FinenessRegisterSearch) SetPage(page, size int) *FinenessRegisterSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *FinenessRegisterSearch) SetOrder(order string) *FinenessRegisterSearch {
+ slf.Order = order
+ return slf
+}
+
+func (slf *FinenessRegisterSearch) SetID(id uint) *FinenessRegisterSearch {
+ slf.ID = id
+ return slf
+}
+
+func (slf *FinenessRegisterSearch) SetNumber(number string) *FinenessRegisterSearch {
+ slf.Number = number
+ return slf
+}
+
+func (slf *FinenessRegisterSearch) build() *gorm.DB {
+ var db = slf.Orm.Table(slf.TableName())
+
+ if slf.ID != 0 {
+ db = db.Where("id = ?", slf.ID)
+ }
+
+ if slf.Order != "" {
+ db = db.Order(slf.Order)
+ }
+
+ if slf.Number != "" {
+ db = db.Where("number = ?", slf.Number)
+ }
+
+ return db
+}
+
+// Create 鍗曟潯鎻掑叆
+func (slf *FinenessRegisterSearch) Create(record *FinenessRegister) error {
+ var db = slf.build()
+
+ if err := db.Create(record).Error; err != nil {
+ return fmt.Errorf("create err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
+// CreateBatch 鎵归噺鎻掑叆
+func (slf *FinenessRegisterSearch) CreateBatch(records []*FinenessRegister) error {
+ var db = slf.build()
+
+ if err := db.Create(&records).Error; err != nil {
+ return fmt.Errorf("create batch err: %v, records: %+v", err, records)
+ }
+
+ return nil
+}
+
+func (slf *FinenessRegisterSearch) Save(record *FinenessRegister) error {
+ var db = slf.build()
+
+ if err := db.Omit("CreatedAt").Save(record).Error; err != nil {
+ return fmt.Errorf("save err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
+func (slf *FinenessRegisterSearch) Update(record *FinenessRegister) error {
+ var db = slf.build()
+
+ if err := db.Updates(record).Error; err != nil {
+ return fmt.Errorf("save err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
+func (slf *FinenessRegisterSearch) UpdateByMap(upMap map[string]interface{}) error {
+ var (
+ db = slf.build()
+ )
+
+ if err := db.Updates(upMap).Error; err != nil {
+ return fmt.Errorf("update by map err: %v, upMap: %+v", err, upMap)
+ }
+
+ return nil
+}
+
+func (slf *FinenessRegisterSearch) UpdateByQuery(query string, args []interface{}, upMap map[string]interface{}) error {
+ var (
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if err := db.Updates(upMap).Error; err != nil {
+ return fmt.Errorf("update by query err: %v, query: %s, args: %+v, upMap: %+v", err, query, args, upMap)
+ }
+
+ return nil
+}
+
+func (slf *FinenessRegisterSearch) Delete() error {
+ var db = slf.build()
+
+ if err := db.Unscoped().Delete(&FinenessRegister{}).Error; err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (slf *FinenessRegisterSearch) First() (*FinenessRegister, error) {
+ var (
+ record = new(FinenessRegister)
+ db = slf.build()
+ )
+
+ if err := db.First(record).Error; err != nil {
+ return record, err
+ }
+
+ return record, nil
+}
+
+func (slf *FinenessRegisterSearch) Find() ([]*FinenessRegister, int64, error) {
+ var (
+ records = make([]*FinenessRegister, 0)
+ total int64
+ db = slf.build()
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, fmt.Errorf("find count err: %v", err)
+ }
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, total, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, total, nil
+}
+
+func (slf *FinenessRegisterSearch) FindAll() ([]*FinenessRegister, error) {
+ var (
+ records = make([]*FinenessRegister, 0)
+ db = slf.build()
+ )
+
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, nil
+}
+
+// FindByQuery 鎸囧畾鏉′欢鏌ヨ.
+func (slf *FinenessRegisterSearch) FindByQuery(query string, args []interface{}) ([]*FinenessRegister, int64, error) {
+ var (
+ records = make([]*FinenessRegister, 0)
+ total int64
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, fmt.Errorf("find by query count err: %v", err)
+ }
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, total, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+ }
+
+ return records, total, nil
+}
+
+// FindByQueryNotTotal 鎸囧畾鏉′欢鏌ヨ&涓嶆煡璇㈡�绘潯鏁�.
+func (slf *FinenessRegisterSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*FinenessRegister, error) {
+ var (
+ records = make([]*FinenessRegister, 0)
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+ }
+
+ return records, nil
+}
+
+// InitDefaultData 鍒濆鍖栨暟鎹�
+func (slf *FinenessRegisterSearch) InitDefaultData() error {
+ return nil
+}
diff --git a/models/fineness_item.go b/models/fineness_item.go
new file mode 100644
index 0000000..13995ee
--- /dev/null
+++ b/models/fineness_item.go
@@ -0,0 +1,238 @@
+package models
+
+import (
+ "fmt"
+ "github.com/shopspring/decimal"
+ "gorm.io/gorm"
+ "silkserver/pkg/mysqlx"
+)
+
+type (
+ // FinenessItem 绾ゅ害鐧昏
+ FinenessItem struct {
+ gorm.Model
+ FinenessRegisterID uint `json:"finenessRegisterID"`
+ Position int8 `json:"position"`
+ Fineness decimal.Decimal `json:"fineness"`
+ Quantity decimal.Decimal `json:"quantity"`
+ Sum decimal.Decimal `json:"sum"`
+ }
+
+ FinenessItemSearch struct {
+ FinenessItem
+ Order string
+ PageNum int
+ PageSize int
+ Orm *gorm.DB
+ }
+)
+
+func (slf *FinenessItem) TableName() string {
+ return "fineness_register_item"
+}
+
+func NewFinenessItemSearch() *FinenessItemSearch {
+ return &FinenessItemSearch{Orm: mysqlx.GetDB()}
+}
+
+func (slf *FinenessItemSearch) SetOrm(tx *gorm.DB) *FinenessItemSearch {
+ slf.Orm = tx
+ return slf
+}
+
+func (slf *FinenessItemSearch) SetPage(page, size int) *FinenessItemSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *FinenessItemSearch) SetOrder(order string) *FinenessItemSearch {
+ slf.Order = order
+ return slf
+}
+
+func (slf *FinenessItemSearch) SetID(id uint) *FinenessItemSearch {
+ slf.ID = id
+ return slf
+}
+
+func (slf *FinenessItemSearch) build() *gorm.DB {
+ var db = slf.Orm.Table(slf.TableName())
+
+ if slf.ID != 0 {
+ db = db.Where("id = ?", slf.ID)
+ }
+
+ if slf.Order != "" {
+ db = db.Order(slf.Order)
+ }
+
+ return db
+}
+
+// Create 鍗曟潯鎻掑叆
+func (slf *FinenessItemSearch) Create(record *FinenessItem) error {
+ var db = slf.build()
+
+ if err := db.Create(record).Error; err != nil {
+ return fmt.Errorf("create err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
+// CreateBatch 鎵归噺鎻掑叆
+func (slf *FinenessItemSearch) CreateBatch(records []*FinenessItem) error {
+ var db = slf.build()
+
+ if err := db.Create(&records).Error; err != nil {
+ return fmt.Errorf("create batch err: %v, records: %+v", err, records)
+ }
+
+ return nil
+}
+
+func (slf *FinenessItemSearch) Save(record *FinenessItem) error {
+ var db = slf.build()
+
+ if err := db.Omit("CreatedAt").Save(record).Error; err != nil {
+ return fmt.Errorf("save err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
+func (slf *FinenessItemSearch) Update(record *FinenessItem) error {
+ var db = slf.build()
+
+ if err := db.Updates(record).Error; err != nil {
+ return fmt.Errorf("save err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
+func (slf *FinenessItemSearch) UpdateByMap(upMap map[string]interface{}) error {
+ var (
+ db = slf.build()
+ )
+
+ if err := db.Updates(upMap).Error; err != nil {
+ return fmt.Errorf("update by map err: %v, upMap: %+v", err, upMap)
+ }
+
+ return nil
+}
+
+func (slf *FinenessItemSearch) UpdateByQuery(query string, args []interface{}, upMap map[string]interface{}) error {
+ var (
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if err := db.Updates(upMap).Error; err != nil {
+ return fmt.Errorf("update by query err: %v, query: %s, args: %+v, upMap: %+v", err, query, args, upMap)
+ }
+
+ return nil
+}
+
+func (slf *FinenessItemSearch) Delete() error {
+ var db = slf.build()
+
+ if err := db.Unscoped().Delete(&FinenessItem{}).Error; err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (slf *FinenessItemSearch) First() (*FinenessItem, error) {
+ var (
+ record = new(FinenessItem)
+ db = slf.build()
+ )
+
+ if err := db.First(record).Error; err != nil {
+ return record, err
+ }
+
+ return record, nil
+}
+
+func (slf *FinenessItemSearch) Find() ([]*FinenessItem, int64, error) {
+ var (
+ records = make([]*FinenessItem, 0)
+ total int64
+ db = slf.build()
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, fmt.Errorf("find count err: %v", err)
+ }
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, total, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, total, nil
+}
+
+func (slf *FinenessItemSearch) FindAll() ([]*FinenessItem, error) {
+ var (
+ records = make([]*FinenessItem, 0)
+ db = slf.build()
+ )
+
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, nil
+}
+
+// FindByQuery 鎸囧畾鏉′欢鏌ヨ.
+func (slf *FinenessItemSearch) FindByQuery(query string, args []interface{}) ([]*FinenessItem, int64, error) {
+ var (
+ records = make([]*FinenessItem, 0)
+ total int64
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, fmt.Errorf("find by query count err: %v", err)
+ }
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, total, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+ }
+
+ return records, total, nil
+}
+
+// FindByQueryNotTotal 鎸囧畾鏉′欢鏌ヨ&涓嶆煡璇㈡�绘潯鏁�.
+func (slf *FinenessItemSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*FinenessItem, error) {
+ var (
+ records = make([]*FinenessItem, 0)
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+ }
+
+ return records, nil
+}
+
+// InitDefaultData 鍒濆鍖栨暟鎹�
+func (slf *FinenessItemSearch) InitDefaultData() error {
+ return nil
+}
diff --git a/router/router.go b/router/router.go
index 65fec3c..46a4d2c 100644
--- a/router/router.go
+++ b/router/router.go
@@ -33,5 +33,14 @@
systemApi.DELETE("dict/:id", DictController.Delete) // 鍒犻櫎璇嶅吀
}
+ // 鐢熶骇绠＄悊
+ FinenessController := new(controllers.FinenessController)
+ finenessApi := r.Group(urlPrefix + "/fineness")
+ {
+ finenessApi.GET("register", FinenessController.List) // 鑾峰彇绾ゅ害鐧昏鍒楄〃
+ finenessApi.DELETE("register/:id", FinenessController.Delete) // 鍒犻櫎绾ゅ害鐧昏
+ finenessApi.POST("register", FinenessController.Add) // 鏂板绾ゅ害鐧昏
+ }
+
return r
}
--
Gitblit v1.8.0