From 2d6875c93b25d0b7336c7fa11e066d213259fe2e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 25 四月 2024 10:02:01 +0800
Subject: [PATCH] 更改定时任务时区设置
---
docs/docs.go | 707 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 686 insertions(+), 21 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 6e7c7ed..b9d034b 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -152,13 +152,74 @@
}
}
},
- "/v1/device/list": {
+ "/v1/dashboard/dashboard": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "椹鹃┒鑸�"
+ ],
+ "summary": "椹鹃┒鑸�",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/model.Dashboard"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/device/config": {
"post": {
"produces": [
"application/json"
],
"tags": [
- "Device"
+ "璁惧"
+ ],
+ "summary": "璁剧疆璁惧涓�浜涢厤缃�",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.DeviceConfig"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/v1/device/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "璁惧"
],
"summary": "鑾峰彇褰撳墠闈㈡澘缁戝畾鐨勮澶囧垪琛�",
"responses": {
@@ -183,7 +244,7 @@
}
}
},
- "/v1/device/set": {
+ "/v1/device/setCurrentDeviceId": {
"post": {
"produces": [
"application/json"
@@ -229,7 +290,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.SendProcessParams"
+ "$ref": "#/definitions/request.GetProductProgress"
}
}
],
@@ -407,13 +468,6 @@
"summary": "鑾峰彇宸ヨ壓妯″瀷鍒楄〃",
"parameters": [
{
- "type": "string",
- "description": "褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�",
- "name": "number",
- "in": "query",
- "required": true
- },
- {
"type": "integer",
"description": "椤电爜",
"name": "page",
@@ -448,6 +502,125 @@
"type": "array",
"items": {
"$ref": "#/definitions/model.ProcessModel"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/reportWork/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ュ伐"
+ ],
+ "summary": "鎶ュ伐鍒楄〃",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "宸ュ簭id",
+ "name": "procedureId",
+ "in": "query",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.ReportWork"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/reportWork/report": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ュ伐"
+ ],
+ "summary": "涓婃姤",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.ReportWork"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/v1/system/problemList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺"
+ ],
+ "summary": "闂璇婃柇/闂鍒楄〃",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/problem.CheckResult"
}
}
}
@@ -528,11 +701,6 @@
"summary": "鑾峰彇浠诲姟",
"parameters": [
{
- "type": "string",
- "name": "deviceID",
- "in": "query"
- },
- {
"type": "integer",
"description": "椤电爜",
"name": "page",
@@ -587,7 +755,7 @@
}
}
},
- "/v1/task/listByChannel": {
+ "/v1/task/list": {
"get": {
"produces": [
"application/json"
@@ -850,6 +1018,9 @@
"procedureName": {
"type": "string"
},
+ "productProcedureID": {
+ "type": "string"
+ },
"startTime": {
"type": "integer"
},
@@ -926,11 +1097,55 @@
"type": "string",
"enum": [
"string",
- "int"
+ "int16",
+ "int32"
],
"x-enum-varnames": [
"PlcStartAddressValueTypeString",
- "PlcStartAddressValueTypeInt"
+ "PlcStartAddressValueTypeInt16",
+ "PlcStartAddressValueTypeInt32"
+ ]
+ },
+ "constvar.ProblemCode": {
+ "type": "string",
+ "enum": [
+ "service",
+ "network",
+ "db",
+ "serf",
+ "cloud",
+ "device",
+ "process_model",
+ "plc_config",
+ "plc_address_list",
+ "plc_process_model_address_list",
+ "plc_connect"
+ ],
+ "x-enum-comments": {
+ "ProblemCodeCloud": "鏈繛鎺ヤ簯绔�",
+ "ProblemCodeDB": "鏁版嵁搴撹繛鎺ラ敊璇�",
+ "ProblemCodeDevice": "鏈粦瀹氳澶�",
+ "ProblemCodeNetwork": "缃戠粶閿欒",
+ "ProblemCodePlcAddressList": "plc鍦板潃琛ㄧ己澶�",
+ "ProblemCodePlcConfig": "plc閰嶇疆缂哄け",
+ "ProblemCodePlcConnect": "plc杩炴帴澶辫触",
+ "ProblemCodePlcProcessModelAddressList": "plc鍦板潃琛ㄧ己澶�",
+ "ProblemCodeProcessModel": "宸ヨ壓鍙傛暟缂哄け",
+ "ProblemCodeSerf": "鏈姞鍏erf闆嗙兢",
+ "ProblemCodeService": "鏈嶅姟涓嶅彲鐢�"
+ },
+ "x-enum-varnames": [
+ "ProblemCodeService",
+ "ProblemCodeNetwork",
+ "ProblemCodeDB",
+ "ProblemCodeSerf",
+ "ProblemCodeCloud",
+ "ProblemCodeDevice",
+ "ProblemCodeProcessModel",
+ "ProblemCodePlcConfig",
+ "ProblemCodePlcAddressList",
+ "ProblemCodePlcProcessModelAddressList",
+ "ProblemCodePlcConnect"
]
},
"constvar.TaskMode": {
@@ -959,6 +1174,204 @@
},
"data": {},
"msg": {
+ "type": "string"
+ }
+ }
+ },
+ "contextx.ResponseList": {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "integer"
+ },
+ "data": {},
+ "msg": {
+ "type": "string"
+ },
+ "total": {
+ "type": "integer"
+ }
+ }
+ },
+ "model.CommonStats": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "type": "string"
+ },
+ "value": {
+ "type": "string"
+ }
+ }
+ },
+ "model.Dashboard": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "delayWorkOrderAmount": {
+ "description": "寤舵湡浜や粯宸ュ崟鏁�",
+ "type": "integer"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
+ "deviceLoad": {
+ "description": "璁惧璐熻嵎瀵规瘮鍒嗘瀽",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.CommonStats"
+ }
+ },
+ "deviceLoadData": {
+ "description": "璁惧璐熻嵎瀵规瘮鍒嗘瀽",
+ "type": "string"
+ },
+ "deviceRunningAmount": {
+ "description": "寮�鏈哄彴鏁�",
+ "type": "integer"
+ },
+ "externalDeviceRunningAmount": {
+ "description": "澶栧姞宸ュ彴鏁�",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "inMaintenanceDeviceAmount": {
+ "description": "缁翠慨涓澶囨暟",
+ "type": "integer"
+ },
+ "internalDeviceRunningAmount": {
+ "description": "鑷湁寮�鏈哄彴鏁�",
+ "type": "integer"
+ },
+ "materialMissWorkOrderAmount": {
+ "description": "鐗╂枡涓嶈冻宸ュ崟鏁�",
+ "type": "integer"
+ },
+ "materialRequirement": {
+ "description": "鐗╂枡闇�姹傜粺璁�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.CommonStats"
+ }
+ },
+ "materialRequirementData": {
+ "description": "鐗╂枡闇�姹傜粺璁�",
+ "type": "string"
+ },
+ "orderFinishRate": {
+ "description": "璁㈠崟瀹屾垚姣旂巼",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.CommonStats"
+ }
+ },
+ "orderFinishRateData": {
+ "description": "璁㈠崟瀹屾垚姣旂巼",
+ "type": "string"
+ },
+ "outPlanProductionAmount": {
+ "description": "璁″垝澶栧姞宸ユ暟",
+ "type": "integer"
+ },
+ "personnelProductivity": {
+ "description": "浜哄憳鐢熶骇鏁堢巼",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.CommonStats"
+ }
+ },
+ "personnelProductivityData": {
+ "description": "浜哄憳鐢熶骇鏁堢巼",
+ "type": "string"
+ },
+ "personnelSkillPercent": {
+ "description": "浜哄憳鎶�鑳藉崰姣�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.CommonStats"
+ }
+ },
+ "personnelSkillPercentData": {
+ "description": "浜哄憳鎶�鑳藉崰姣�",
+ "type": "string"
+ },
+ "planOrderFinishRate": {
+ "description": "璁″垝杈炬垚鐜�",
+ "type": "integer"
+ },
+ "planProductionAmount": {
+ "description": "璁″垝鍔犲伐鏁�",
+ "type": "integer"
+ },
+ "realExternalProductionAmount": {
+ "description": "瀹為檯澶栧姞宸ユ暟",
+ "type": "integer"
+ },
+ "realProductionAmount": {
+ "description": "瀹為檯鐢熶骇鏁�",
+ "type": "integer"
+ },
+ "todayFinishAmount": {
+ "description": "杞﹂棿褰撴棩鍚堣鐢熶骇",
+ "type": "integer"
+ },
+ "todayQualifiedRate": {
+ "description": "杞﹂棿褰撴棩姝ｅ搧鐜�",
+ "type": "string"
+ },
+ "totalDeviceAmount": {
+ "description": "鎬昏澶囨暟",
+ "type": "integer"
+ },
+ "totalProductionAmount": {
+ "description": "鎬讳骇閲�",
+ "type": "integer"
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "version": {
+ "type": "string"
+ },
+ "workOrderAmount": {
+ "description": "鐢熶骇宸ュ崟鏁�",
+ "type": "integer"
+ },
+ "workOrderStats": {
+ "description": "宸ュ崟杩涘害缁熻",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.WorkOrderStats"
+ }
+ },
+ "workOrderStatsData": {
+ "description": "宸ュ崟杩涘害缁熻",
+ "type": "string"
+ },
+ "workerTypeStats": {
+ "description": "浜哄憳宸ョ鍒嗘瀽",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.CommonStats"
+ }
+ },
+ "workerTypeStatsData": {
+ "description": "浜哄憳宸ョ鍒嗘瀽",
+ "type": "string"
+ },
+ "workshopStats": {
+ "description": "杞﹂棿缁熻",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.WorkshopStats"
+ }
+ },
+ "workshopStatsData": {
+ "description": "杞﹂棿缁熻",
"type": "string"
}
}
@@ -1252,6 +1665,9 @@
"endTime": {
"type": "integer"
},
+ "finishedQuantity": {
+ "type": "integer"
+ },
"id": {
"type": "integer"
},
@@ -1268,6 +1684,10 @@
},
"processModelNumber": {
"description": "宸ヨ壓妯″瀷缂栧彿",
+ "type": "string"
+ },
+ "productProcedureID": {
+ "description": "浜у搧宸ュ簭id",
"type": "string"
},
"realEndTime": {
@@ -1338,6 +1758,153 @@
}
}
},
+ "model.ReportWork": {
+ "type": "object",
+ "properties": {
+ "barCode": {
+ "description": "鏉″舰鐮�",
+ "type": "string"
+ },
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
+ "deviceId": {
+ "type": "string"
+ },
+ "deviceName": {
+ "type": "string"
+ },
+ "endTime": {
+ "type": "integer"
+ },
+ "finishAmount": {
+ "description": "鏈鎶ュ伐 - 涓婃鎶ュ伐",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "procedureId": {
+ "type": "string"
+ },
+ "proceduresId": {
+ "description": "procedures琛ㄧ殑id",
+ "type": "integer"
+ },
+ "productProcedureID": {
+ "description": "浜у搧宸ュ簭id",
+ "type": "string"
+ },
+ "reportAmount": {
+ "description": "鎶ュ伐鏁伴噺",
+ "type": "integer"
+ },
+ "startTime": {
+ "type": "integer"
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "workOrderId": {
+ "type": "string"
+ },
+ "workerID": {
+ "description": "鎶ュ伐浜篿d",
+ "type": "string"
+ },
+ "workerName": {
+ "description": "鎶ュ伐浜哄鍚�",
+ "type": "string"
+ },
+ "workerTime": {
+ "description": "宸ユ椂锛屽崟浣嶇",
+ "type": "integer"
+ }
+ }
+ },
+ "model.WorkOrderStats": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鐢熶骇鏁伴噺",
+ "type": "integer"
+ },
+ "delayDays": {
+ "description": "寤舵湡澶╂暟",
+ "type": "integer"
+ },
+ "finishProcedureNum": {
+ "description": "宸插畬鎴愬伐搴忔暟閲�",
+ "type": "integer"
+ },
+ "number": {
+ "description": "缂栧彿",
+ "type": "string"
+ },
+ "planTime": {
+ "description": "璁″垝鏃堕棿",
+ "type": "string"
+ },
+ "procedureNum": {
+ "description": "宸ュ簭鏁伴噺",
+ "type": "integer"
+ },
+ "processingProcedureNum": {
+ "description": "杩涜涓伐搴忔暟閲�",
+ "type": "integer"
+ },
+ "product": {
+ "description": "浜у搧",
+ "type": "string"
+ },
+ "scale": {
+ "description": "瑙勬牸",
+ "type": "string"
+ }
+ }
+ },
+ "model.WorkshopStats": {
+ "type": "object",
+ "properties": {
+ "defective": {
+ "description": "娆″搧鏁伴噺",
+ "type": "integer"
+ },
+ "name": {
+ "description": "杞﹂棿鍚嶇О",
+ "type": "string"
+ },
+ "percent": {
+ "description": "姝ｅ搧鐜�",
+ "type": "integer"
+ },
+ "qualified": {
+ "description": "姝ｅ搧鏁伴噺",
+ "type": "integer"
+ },
+ "total": {
+ "description": "鐢熶骇鎬绘暟",
+ "type": "integer"
+ }
+ }
+ },
+ "problem.CheckResult": {
+ "type": "object",
+ "properties": {
+ "checkResult": {
+ "type": "boolean"
+ },
+ "itemCode": {
+ "$ref": "#/definitions/constvar.ProblemCode"
+ },
+ "itemName": {
+ "type": "string"
+ }
+ }
+ },
"request.AddPlcBrand": {
"type": "object",
"properties": {
@@ -1358,6 +1925,26 @@
}
}
},
+ "request.DeviceConfig": {
+ "type": "object",
+ "properties": {
+ "needSetProcessParams": {
+ "description": "鏄惁闇�瑕佽缃伐鑹哄弬鏁�",
+ "type": "boolean"
+ }
+ }
+ },
+ "request.GetProductProgress": {
+ "type": "object",
+ "properties": {
+ "channel": {
+ "type": "integer"
+ },
+ "procedureId": {
+ "type": "integer"
+ }
+ }
+ },
"request.QueryType": {
"type": "integer",
"enum": [
@@ -1370,6 +1957,28 @@
"QueryTypeToday",
"QueryTypeFinished"
]
+ },
+ "request.ReportWork": {
+ "type": "object",
+ "required": [
+ "procedureId",
+ "reportAmount",
+ "workerID"
+ ],
+ "properties": {
+ "procedureId": {
+ "description": "宸ュ簭id",
+ "type": "integer"
+ },
+ "reportAmount": {
+ "description": "鎶ュ伐鏁伴噺",
+ "type": "integer"
+ },
+ "workerID": {
+ "description": "鎶ュ憡鑰卛d",
+ "type": "string"
+ }
+ }
},
"request.SendProcessParams": {
"type": "object",
@@ -1479,23 +2088,58 @@
}
}
},
+ "response.Device": {
+ "type": "object",
+ "properties": {
+ "deviceID": {
+ "type": "string"
+ },
+ "deviceName": {
+ "type": "string"
+ },
+ "needSetProcessParams": {
+ "description": "鏄惁闇�瑕佽缃伐鑹哄弬鏁�",
+ "type": "boolean"
+ }
+ }
+ },
"response.DeviceListResponse": {
"type": "object",
"properties": {
+ "clusterNodeQuantity": {
+ "description": "闆嗙兢鑺傜偣鏁伴噺",
+ "type": "integer"
+ },
+ "clusterStatus": {
+ "description": "闆嗙兢鐘舵��",
+ "type": "string"
+ },
"currentDeviceID": {
"description": "褰撳墠閫夊畾鐨勭敓浜ц澶�",
"type": "string"
},
- "deviceIDList": {
+ "deviceList": {
"description": "鐢熶骇璁惧id鍒楄〃",
"type": "array",
"items": {
- "type": "string"
+ "$ref": "#/definitions/response.Device"
}
},
"systemDeviceID": {
"description": "宸ユ帶鏈鸿澶嘔D",
"type": "string"
+ },
+ "systemDeviceRunSince": {
+ "description": "绯荤粺杩愯寮�濮嬫椂闂存埑",
+ "type": "integer"
+ },
+ "systemDeviceStatus": {
+ "description": "璁惧鐘舵��",
+ "allOf": [
+ {
+ "$ref": "#/definitions/response.SystemDeviceStatus"
+ }
+ ]
}
}
},
@@ -1540,6 +2184,12 @@
"response.ProductProgress": {
"type": "object",
"properties": {
+ "RealEndTime": {
+ "type": "integer"
+ },
+ "RealStartTime": {
+ "type": "integer"
+ },
"finishNumber": {
"type": "integer"
},
@@ -1551,6 +2201,21 @@
}
}
},
+ "response.SystemDeviceStatus": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "SystemDeviceStatusNormal": "姝ｅ父",
+ "SystemDeviceStatusUnNormal": "寮傚父"
+ },
+ "x-enum-varnames": [
+ "SystemDeviceStatusNormal",
+ "SystemDeviceStatusUnNormal"
+ ]
+ },
"response.TaskCountdown": {
"type": "object",
"properties": {
--
Gitblit v1.8.0