From 6625f0b928c3808abaf9a1571ca1ef16d2e68598 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 10 四月 2024 15:49:32 +0800
Subject: [PATCH] 车间查询
---
controllers/request/system_set.go | 5
models/workshop_manage.go | 1
docs/swagger.yaml | 72 ++++++++++
docs/docs.go | 119 +++++++++++++++++
docs/swagger.json | 119 +++++++++++++++++
controllers/workshop_manage_controller.go | 80 ++++++++++-
router/router.go | 8
7 files changed, 392 insertions(+), 12 deletions(-)
diff --git a/controllers/request/system_set.go b/controllers/request/system_set.go
index b365be8..048e5ee 100644
--- a/controllers/request/system_set.go
+++ b/controllers/request/system_set.go
@@ -55,3 +55,8 @@
PageInfo
KeyWord string `json:"keyWord"`
}
+
+type GetWorkshopManageCar struct {
+ WorkshopNumber string `json:"workshopNumber"`
+ GroupNumber int `json:"groupNumber"`
+}
diff --git a/controllers/workshop_manage_controller.go b/controllers/workshop_manage_controller.go
index dfd7e4e..029e52d 100644
--- a/controllers/workshop_manage_controller.go
+++ b/controllers/workshop_manage_controller.go
@@ -2,6 +2,7 @@
import (
"github.com/gin-gonic/gin"
+ "silkserver/constvar"
"silkserver/controllers/request"
"silkserver/extend/code"
"silkserver/extend/util"
@@ -14,15 +15,13 @@
// SaveWorkshopManage
//
-// @Tags 绯荤粺璁剧疆/杞﹂棿绠＄悊
-// @Summary 淇濆瓨杞﹂棿绠＄悊
-// @Produce application/json
-// @Param object body models.WorkshopManage true "鍙傛暟"
-//
-// @Param Authorization header string true "token"
-//
-// @Success 200 {object} util.Response "鎴愬姛"
-// @Router /api-jl/v1/system/saveWorkshopManage [post]
+// @Tags 绯荤粺璁剧疆/杞﹂棿绠＄悊
+// @Summary 淇濆瓨杞﹂棿绠＄悊
+// @Produce application/json
+// @Param object body models.WorkshopManage true "鍙傛暟"
+// @Param Authorization header string true "token"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-jl/v1/system/saveWorkshopManage [post]
func (slf WorkshopManageController) SaveWorkshopManage(c *gin.Context) {
var workshop models.WorkshopManage
err := c.BindJSON(&workshop)
@@ -92,3 +91,66 @@
}
util.ResponseFormat(c, code.Success, "鍒犻櫎鎴愬姛")
}
+
+// GetWorkshopManageGroup
+//
+// @Tags 绯荤粺璁剧疆/杞﹂棿绠＄悊
+// @Summary 鑾峰彇杞﹂棿缁勫埆
+// @Produce application/json
+// @Param Authorization header string true "token"
+// @Param number path string true "number"
+// @Success 200 {object} util.Response{data=map[int]int} "鎴愬姛"
+// @Router /api-jl/v1/system/getWorkshopManageGroup/{number} [get]
+func (slf WorkshopManageController) GetWorkshopManageGroup(c *gin.Context) {
+ number := c.Param("number")
+ if number == "" {
+ util.ResponseFormat(c, code.RequestParamError, "鏃犳晥鐨勭紪鐮�")
+ return
+ }
+ all, err := models.NewWorkshopManageSearch().SetWorkshopNumber(number).FindAll()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
+ return
+ }
+ groupMap := make(map[int]int)
+ for _, manage := range all {
+ groupMap[manage.GroupNumber] = manage.GroupNumber
+ }
+ util.ResponseFormat(c, code.Success, groupMap)
+}
+
+// GetWorkshopManageCar
+//
+// @Tags 绯荤粺璁剧疆/杞﹂棿绠＄悊
+// @Summary 鑾峰彇杞﹁締缂栧彿
+// @Produce application/json
+// @Param Authorization header string true "token"
+// @Param object body request.GetWorkshopManageCar true "鍙傛暟"
+// @Success 200 {object} util.ResponseList{data=[][]int} "鎴愬姛"
+// @Router /api-jl/v1/system/getWorkshopManageCar [post]
+func (slf WorkshopManageController) GetWorkshopManageCar(c *gin.Context) {
+ var params request.GetWorkshopManageCar
+ err := c.BindJSON(¶ms)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ all, err := models.NewWorkshopManageSearch().SetWorkshopNumber(params.WorkshopNumber).SetGroupNumber(params.GroupNumber).FindAll()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
+ return
+ }
+ carNum := make([][]int, 0)
+ for _, manage := range all {
+ car := make([]int, 0)
+ i := manage.StartCarNumber
+ if manage.CarFlag == constvar.RightHalfCar {
+ i++
+ }
+ for ; i <= manage.EndCarNumber; i++ {
+ car = append(car, i)
+ }
+ carNum = append(carNum, car)
+ }
+ util.ResponseFormat(c, code.Success, carNum)
+}
diff --git a/docs/docs.go b/docs/docs.go
index c602d82..5c27b08 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -801,6 +801,111 @@
}
}
},
+ "/api-jl/v1/system/getWorkshopManageCar": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺璁剧疆/杞﹂棿绠＄悊"
+ ],
+ "summary": "鑾峰彇杞﹁締缂栧彿",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetWorkshopManageCar"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/system/getWorkshopManageGroup/{number}": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺璁剧疆/杞﹂棿绠＄悊"
+ ],
+ "summary": "鑾峰彇杞﹂棿缁勫埆",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "type": "string",
+ "description": "number",
+ "name": "number",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "integer"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-jl/v1/system/getWorkshopManageList": {
"get": {
"produces": [
@@ -1388,6 +1493,9 @@
"updatedAt": {
"type": "string"
},
+ "workshopName": {
+ "type": "string"
+ },
"workshopNumber": {
"type": "string"
}
@@ -1704,6 +1812,17 @@
}
}
},
+ "request.GetWorkshopManageCar": {
+ "type": "object",
+ "properties": {
+ "groupNumber": {
+ "type": "integer"
+ },
+ "workshopNumber": {
+ "type": "string"
+ }
+ }
+ },
"request.GetYieldRegisterList": {
"type": "object",
"properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index be695b3..1f9ca75 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -789,6 +789,111 @@
}
}
},
+ "/api-jl/v1/system/getWorkshopManageCar": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺璁剧疆/杞﹂棿绠＄悊"
+ ],
+ "summary": "鑾峰彇杞﹁締缂栧彿",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetWorkshopManageCar"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-jl/v1/system/getWorkshopManageGroup/{number}": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺璁剧疆/杞﹂棿绠＄悊"
+ ],
+ "summary": "鑾峰彇杞﹂棿缁勫埆",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "type": "string",
+ "description": "number",
+ "name": "number",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "integer"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-jl/v1/system/getWorkshopManageList": {
"get": {
"produces": [
@@ -1376,6 +1481,9 @@
"updatedAt": {
"type": "string"
},
+ "workshopName": {
+ "type": "string"
+ },
"workshopNumber": {
"type": "string"
}
@@ -1692,6 +1800,17 @@
}
}
},
+ "request.GetWorkshopManageCar": {
+ "type": "object",
+ "properties": {
+ "groupNumber": {
+ "type": "integer"
+ },
+ "workshopNumber": {
+ "type": "string"
+ }
+ }
+ },
"request.GetYieldRegisterList": {
"type": "object",
"properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 108b197..e3eb19d 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -302,6 +302,8 @@
type: integer
updatedAt:
type: string
+ workshopName:
+ type: string
workshopNumber:
type: string
type: object
@@ -516,6 +518,13 @@
sum:
description: 鍚堣
type: number
+ type: object
+ request.GetWorkshopManageCar:
+ properties:
+ groupNumber:
+ type: integer
+ workshopNumber:
+ type: string
type: object
request.GetYieldRegisterList:
properties:
@@ -1275,6 +1284,69 @@
summary: 鑾峰彇鐢熶笣绛夌骇
tags:
- 绯荤粺璁剧疆/鐢熶笣瀹氱骇鏍囧噯
+ /api-jl/v1/system/getWorkshopManageCar:
+ post:
+ parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.GetWorkshopManageCar'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ items:
+ type: integer
+ type: array
+ type: array
+ type: object
+ summary: 鑾峰彇杞﹁締缂栧彿
+ tags:
+ - 绯荤粺璁剧疆/杞﹂棿绠＄悊
+ /api-jl/v1/system/getWorkshopManageGroup/{number}:
+ get:
+ parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ - description: number
+ in: path
+ name: number
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.Response'
+ - properties:
+ data:
+ additionalProperties:
+ type: integer
+ type: object
+ type: object
+ summary: 鑾峰彇杞﹂棿缁勫埆
+ tags:
+ - 绯荤粺璁剧疆/杞﹂棿绠＄悊
/api-jl/v1/system/getWorkshopManageList:
get:
parameters:
diff --git a/models/workshop_manage.go b/models/workshop_manage.go
index 623308b..9516937 100644
--- a/models/workshop_manage.go
+++ b/models/workshop_manage.go
@@ -12,6 +12,7 @@
WorkshopManage struct {
gorm.Model
WorkshopNumber string `json:"workshopNumber" gorm:"type:varchar(255);comment:杞﹂棿缂栧彿"`
+ WorkshopName string `json:"workshopName" gorm:"type:varchar(255);comment:杞﹂棿鍚嶇О"`
GroupNumber int `json:"groupNumber" gorm:"type:int(11);comment:缁勫埆"`
StartCarNumber int `json:"startCarNumber" gorm:"type:int(11);comment:寮�濮嬭溅鍙�"`
EndCarNumber int `json:"endCarNumber" gorm:"type:int(11);comment:缁撴潫杞﹀彿"`
diff --git a/router/router.go b/router/router.go
index 4eecb4c..887908a 100644
--- a/router/router.go
+++ b/router/router.go
@@ -43,9 +43,11 @@
systemApi.GET("getRankStandardGrade", rawSilkController.GetRankStandardGrade) //鑾峰彇鐢熶笣绛夌骇
systemApi.POST("saveRankStandard", rawSilkController.SaveRankStandard) //淇濆瓨鐢熶笣瀹氱骇鏍囧噯
//杞﹂棿绠＄悊
- systemApi.GET("getWorkshopManageList", workshopController.GetWorkshopManageList) //鑾峰彇杞﹂棿绠＄悊鍒楄〃
- systemApi.POST("saveWorkshopManage", workshopController.SaveWorkshopManage) //淇濆瓨杞﹂棿绠＄悊
- systemApi.DELETE("deleteWorkshopManage/:id", workshopController.DeleteWorkshopManage) //鍒犻櫎杞﹂棿绠＄悊
+ systemApi.GET("getWorkshopManageList", workshopController.GetWorkshopManageList) //鑾峰彇杞﹂棿绠＄悊鍒楄〃
+ systemApi.POST("saveWorkshopManage", workshopController.SaveWorkshopManage) //淇濆瓨杞﹂棿绠＄悊
+ systemApi.DELETE("deleteWorkshopManage/:id", workshopController.DeleteWorkshopManage) //鍒犻櫎杞﹂棿绠＄悊
+ systemApi.GET("getWorkshopManageGroup/:number", workshopController.GetWorkshopManageGroup) //鑾峰彇杞﹂棿缁勫埆
+ systemApi.POST("getWorkshopManageCar", workshopController.GetWorkshopManageCar) //鑾峰彇杞﹁締缂栧彿
}
// 鐢熶骇绠＄悊
--
Gitblit v1.8.0