From 849b89cde3bf2ac26bdcf33e3940f9a1a00d1e85 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 29 二月 2024 16:30:21 +0800
Subject: [PATCH] 纤度登记列表和删除接口
---
.gitignore | 3
controllers/dict.go | 4
controllers/fineness.go | 63 +++++
models/fineness.go | 249 ++++++++++++++++++++
models/db.go | 1
controllers/request/fineness.go | 5
docs/swagger.yaml | 81 ++++++
docs/docs.go | 125 ++++++++++
docs/swagger.json | 125 ++++++++++
README.md | 12
router/router.go | 8
11 files changed, 672 insertions(+), 4 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..55428b6
--- /dev/null
+++ b/controllers/fineness.go
@@ -0,0 +1,63 @@
+package controllers
+
+import (
+ "github.com/gin-gonic/gin"
+ "silkserver/controllers/request"
+ "silkserver/extend/code"
+ "silkserver/extend/util"
+ "silkserver/models"
+ "silkserver/pkg/convertx"
+)
+
+type FinenessController struct{}
+
+// 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..c275204
--- /dev/null
+++ b/controllers/request/fineness.go
@@ -0,0 +1,5 @@
+package request
+
+type GetFinenessRegisterList struct {
+ PageInfo
+}
diff --git a/docs/docs.go b/docs/docs.go
index 540b80a..c309a2a 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -16,6 +16,82 @@
"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"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/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 +320,55 @@
}
}
},
+ "models.FinenessRegister": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "endCircle": {
+ "description": "缁撴潫鍥炴暟",
+ "type": "integer"
+ },
+ "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": {
diff --git a/docs/swagger.json b/docs/swagger.json
index e1a032f..7c58f0b 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -4,6 +4,82 @@
"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"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/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 +308,55 @@
}
}
},
+ "models.FinenessRegister": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "endCircle": {
+ "description": "缁撴潫鍥炴暟",
+ "type": "integer"
+ },
+ "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": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index c28c61e..0eed71b 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -48,6 +48,41 @@
updatedAt:
type: string
type: object
+ models.FinenessRegister:
+ properties:
+ createdAt:
+ type: string
+ deletedAt:
+ $ref: '#/definitions/gorm.DeletedAt'
+ endCircle:
+ description: 缁撴潫鍥炴暟
+ type: integer
+ 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:
@@ -107,6 +142,52 @@
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:
+ - 绾ゅ害鐧昏
+ /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/models/db.go b/models/db.go
index caeed78..2f49d18 100644
--- a/models/db.go
+++ b/models/db.go
@@ -74,6 +74,7 @@
db := mysqlx.GetDB()
err := db.AutoMigrate(
Dict{},
+ FinenessRegister{},
)
return err
}
diff --git a/models/fineness.go b/models/fineness.go
new file mode 100644
index 0000000..72dab54
--- /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"` //缁撴潫鍥炴暟
+ }
+
+ 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/router/router.go b/router/router.go
index ebf1ae3..4786f82 100644
--- a/router/router.go
+++ b/router/router.go
@@ -31,5 +31,13 @@
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) // 鍒犻櫎绾ゅ害鐧昏
+ }
+
return r
}
--
Gitblit v1.8.0