From b6b889b3fcd1ecba07aa90f7ec82c6b7d5d5da3f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 29 十二月 2023 11:49:02 +0800
Subject: [PATCH] 同步加工数过滤掉加工数为0的记录

---
 docs/swagger.yaml |  493 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 476 insertions(+), 17 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index c2bc840..ed8d041 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -57,6 +57,8 @@
         type: string
       procedureName:
         type: string
+      productProcedureID:
+        type: string
       startTime:
         type: integer
       workHours:
@@ -113,11 +115,51 @@
   constvar.PlcStartAddressValueType:
     enum:
     - string
-    - int
+    - int16
+    - int32
     type: string
     x-enum-varnames:
     - PlcStartAddressValueTypeString
-    - PlcStartAddressValueTypeInt
+    - PlcStartAddressValueTypeInt16
+    - PlcStartAddressValueTypeInt32
+  constvar.ProblemCode:
+    enum:
+    - service
+    - network
+    - db
+    - serf
+    - cloud
+    - device
+    - process_model
+    - plc_config
+    - plc_address_list
+    - plc_process_model_address_list
+    - plc_connect
+    type: string
+    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:
     enum:
     - 1
@@ -138,6 +180,148 @@
         type: integer
       data: {}
       msg:
+        type: string
+    type: object
+  contextx.ResponseList:
+    properties:
+      code:
+        type: integer
+      data: {}
+      msg:
+        type: string
+      total:
+        type: integer
+    type: object
+  model.CommonStats:
+    properties:
+      name:
+        type: string
+      value:
+        type: string
+    type: object
+  model.Dashboard:
+    properties:
+      createdAt:
+        type: string
+      delayWorkOrderAmount:
+        description: 寤舵湡浜や粯宸ュ崟鏁�
+        type: integer
+      deletedAt:
+        type: string
+      deviceLoad:
+        description: 璁惧璐熻嵎瀵规瘮鍒嗘瀽
+        items:
+          $ref: '#/definitions/model.CommonStats'
+        type: array
+      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: 鐗╂枡闇�姹傜粺璁�
+        items:
+          $ref: '#/definitions/model.CommonStats'
+        type: array
+      materialRequirementData:
+        description: 鐗╂枡闇�姹傜粺璁�
+        type: string
+      orderFinishRate:
+        description: 璁㈠崟瀹屾垚姣旂巼
+        items:
+          $ref: '#/definitions/model.CommonStats'
+        type: array
+      orderFinishRateData:
+        description: 璁㈠崟瀹屾垚姣旂巼
+        type: string
+      outPlanProductionAmount:
+        description: 璁″垝澶栧姞宸ユ暟
+        type: integer
+      personnelProductivity:
+        description: 浜哄憳鐢熶骇鏁堢巼
+        items:
+          $ref: '#/definitions/model.CommonStats'
+        type: array
+      personnelProductivityData:
+        description: 浜哄憳鐢熶骇鏁堢巼
+        type: string
+      personnelSkillPercent:
+        description: 浜哄憳鎶�鑳藉崰姣�
+        items:
+          $ref: '#/definitions/model.CommonStats'
+        type: array
+      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: 宸ュ崟杩涘害缁熻
+        items:
+          $ref: '#/definitions/model.WorkOrderStats'
+        type: array
+      workOrderStatsData:
+        description: 宸ュ崟杩涘害缁熻
+        type: string
+      workerTypeStats:
+        description: 浜哄憳宸ョ鍒嗘瀽
+        items:
+          $ref: '#/definitions/model.CommonStats'
+        type: array
+      workerTypeStatsData:
+        description: 浜哄憳宸ョ鍒嗘瀽
+        type: string
+      workshopStats:
+        description: 杞﹂棿缁熻
+        items:
+          $ref: '#/definitions/model.WorkshopStats'
+        type: array
+      workshopStatsData:
+        description: 杞﹂棿缁熻
         type: string
     type: object
   model.DevicePlc:
@@ -336,6 +520,8 @@
         type: string
       endTime:
         type: integer
+      finishedQuantity:
+        type: integer
       id:
         type: integer
       procedure:
@@ -346,6 +532,9 @@
         type: string
       processModelNumber:
         description: 宸ヨ壓妯″瀷缂栧彿
+        type: string
+      productProcedureID:
+        description: 浜у搧宸ュ簭id
         type: string
       realEndTime:
         type: integer
@@ -394,6 +583,110 @@
       updatedAt:
         type: string
     type: object
+  model.ReportWork:
+    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
+    type: object
+  model.WorkOrderStats:
+    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
+    type: object
+  model.WorkshopStats:
+    properties:
+      defective:
+        description: 娆″搧鏁伴噺
+        type: integer
+      name:
+        description: 杞﹂棿鍚嶇О
+        type: string
+      percent:
+        description: 姝ｅ搧鐜�
+        type: integer
+      qualified:
+        description: 姝ｅ搧鏁伴噺
+        type: integer
+      total:
+        description: 鐢熶骇鎬绘暟
+        type: integer
+    type: object
+  problem.CheckResult:
+    properties:
+      checkResult:
+        type: boolean
+      itemCode:
+        $ref: '#/definitions/constvar.ProblemCode'
+      itemName:
+        type: string
+    type: object
   request.AddPlcBrand:
     properties:
       createdAt:
@@ -407,6 +700,19 @@
       updatedAt:
         type: string
     type: object
+  request.DeviceConfig:
+    properties:
+      needSetProcessParams:
+        description: 鏄惁闇�瑕佽缃伐鑹哄弬鏁�
+        type: boolean
+    type: object
+  request.GetProductProgress:
+    properties:
+      channel:
+        type: integer
+      procedureId:
+        type: integer
+    type: object
   request.QueryType:
     enum:
     - 1
@@ -417,6 +723,22 @@
     - QueryTypeUnFinish
     - QueryTypeToday
     - QueryTypeFinished
+  request.ReportWork:
+    properties:
+      procedureId:
+        description: 宸ュ簭id
+        type: integer
+      reportAmount:
+        description: 鎶ュ伐鏁伴噺
+        type: integer
+      workerID:
+        description: 鎶ュ憡鑰卛d
+        type: string
+    required:
+    - procedureId
+    - reportAmount
+    - workerID
+    type: object
   request.SendProcessParams:
     properties:
       procedureId:
@@ -489,19 +811,42 @@
       updatedAt:
         type: string
     type: object
+  response.Device:
+    properties:
+      deviceID:
+        type: string
+      deviceName:
+        type: string
+      needSetProcessParams:
+        description: 鏄惁闇�瑕佽缃伐鑹哄弬鏁�
+        type: boolean
+    type: object
   response.DeviceListResponse:
     properties:
+      clusterNodeQuantity:
+        description: 闆嗙兢鑺傜偣鏁伴噺
+        type: integer
+      clusterStatus:
+        description: 闆嗙兢鐘舵��
+        type: string
       currentDeviceID:
         description: 褰撳墠閫夊畾鐨勭敓浜ц澶�
         type: string
-      deviceIDList:
+      deviceList:
         description: 鐢熶骇璁惧id鍒楄〃
         items:
-          type: string
+          $ref: '#/definitions/response.Device'
         type: array
       systemDeviceID:
         description: 宸ユ帶鏈鸿澶嘔D
         type: string
+      systemDeviceRunSince:
+        description: 绯荤粺杩愯寮�濮嬫椂闂存埑
+        type: integer
+      systemDeviceStatus:
+        allOf:
+        - $ref: '#/definitions/response.SystemDeviceStatus'
+        description: 璁惧鐘舵��
     type: object
   response.ListResponse:
     properties:
@@ -530,6 +875,10 @@
     type: object
   response.ProductProgress:
     properties:
+      RealEndTime:
+        type: integer
+      RealStartTime:
+        type: integer
       finishNumber:
         type: integer
       plcStatus:
@@ -537,6 +886,17 @@
       totalNumber:
         type: integer
     type: object
+  response.SystemDeviceStatus:
+    enum:
+    - 1
+    - 2
+    type: integer
+    x-enum-comments:
+      SystemDeviceStatusNormal: 姝ｅ父
+      SystemDeviceStatusUnNormal: 寮傚父
+    x-enum-varnames:
+    - SystemDeviceStatusNormal
+    - SystemDeviceStatusUnNormal
   response.TaskCountdown:
     properties:
       countDownHour:
@@ -673,8 +1033,44 @@
       summary: 鏇存柊plc閰嶇疆
       tags:
       - Config
-  /v1/device/list:
+  /v1/dashboard/dashboard:
+    get:
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/contextx.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/model.Dashboard'
+              type: object
+      summary: 椹鹃┒鑸�
+      tags:
+      - 椹鹃┒鑸�
+  /v1/device/config:
     post:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.DeviceConfig'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 璁剧疆璁惧涓�浜涢厤缃�
+      tags:
+      - 璁惧
+  /v1/device/list:
+    get:
       produces:
       - application/json
       responses:
@@ -689,8 +1085,8 @@
               type: object
       summary: 鑾峰彇褰撳墠闈㈡澘缁戝畾鐨勮澶囧垪琛�
       tags:
-      - Device
-  /v1/device/set:
+      - 璁惧
+  /v1/device/setCurrentDeviceId:
     post:
       parameters:
       - description: 鏌ヨ鍙傛暟
@@ -717,7 +1113,7 @@
         name: object
         required: true
         schema:
-          $ref: '#/definitions/request.SendProcessParams'
+          $ref: '#/definitions/request.GetProductProgress'
       produces:
       - application/json
       responses:
@@ -823,11 +1219,6 @@
   /v1/processModel/list:
     get:
       parameters:
-      - description: 褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�
-        in: query
-        name: number
-        required: true
-        type: string
       - description: 椤电爜
         in: query
         name: page
@@ -858,6 +1249,77 @@
       summary: 鑾峰彇宸ヨ壓妯″瀷鍒楄〃
       tags:
       - 宸ヨ壓妯″瀷
+  /v1/reportWork/list:
+    get:
+      parameters:
+      - description: 椤电爜
+        in: query
+        name: page
+        type: integer
+      - description: 姣忛〉澶у皬
+        in: query
+        name: pageSize
+        type: integer
+      - description: 宸ュ簭id
+        in: query
+        name: procedureId
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/contextx.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/model.ReportWork'
+                  type: array
+              type: object
+      summary: 鎶ュ伐鍒楄〃
+      tags:
+      - 鎶ュ伐
+  /v1/reportWork/report:
+    post:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.ReportWork'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 涓婃姤
+      tags:
+      - 鎶ュ伐
+  /v1/system/problemList:
+    get:
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/contextx.Response'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/problem.CheckResult'
+                  type: array
+              type: object
+      summary: 闂璇婃柇/闂鍒楄〃
+      tags:
+      - 绯荤粺
   /v1/task/countdown:
     get:
       produces:
@@ -896,9 +1358,6 @@
   /v1/task/get:
     get:
       parameters:
-      - in: query
-        name: deviceID
-        type: string
       - description: 椤电爜
         in: query
         name: page
@@ -937,7 +1396,7 @@
       summary: 鑾峰彇浠诲姟
       tags:
       - Task
-  /v1/task/listByChannel:
+  /v1/task/list:
     get:
       parameters:
       - description: 閫氶亾鍙枫�備笉浼犲彇鍏ㄩ儴鐨�

--
Gitblit v1.8.0