From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
api/v1/plc.go | 239 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 133 insertions(+), 106 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index cc16206..c4638dc 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -3,16 +3,11 @@
import (
"apsClient/conf"
"apsClient/constvar"
- "apsClient/crontask"
+ "apsClient/model"
"apsClient/model/request"
"apsClient/model/response"
_ "apsClient/model/response"
- "apsClient/nsq"
"apsClient/pkg/contextx"
- "apsClient/pkg/ecode"
- "apsClient/pkg/logx"
- "apsClient/pkg/plc/apacheplc4x"
- "apsClient/serf"
"apsClient/service"
"github.com/gin-gonic/gin"
"github.com/spf13/cast"
@@ -25,7 +20,7 @@
// @Tags 鐢熶骇鏁伴噺
// @Summary 鑾峰彇鐢熶骇杩涘害
// @Produce application/json
-// @Param object body request.SendProcessParams true "鏌ヨ鍙傛暟"
+// @Param object body request.GetProductProgress true "鏌ヨ鍙傛暟"
// @Success 200 {object} contextx.Response{data=response.ProductProgress} "鎴愬姛"
// @Router /v1/plc/productProgress [post]
func (slf *PlcApi) GetProductProgress(c *gin.Context) {
@@ -34,16 +29,43 @@
if !ok {
return
}
- finishNumber, _ := service.PlcCacheGet(params.Channel, constvar.PlcCacheKeyFinishNumber)
- totalNumber, _ := service.PlcCacheGet(params.Channel, constvar.PlcCacheKeyTotalNumber)
+ isConnect := service.PlcIsConnect()
+ var (
+ finishNumber interface{}
+ totalNumber interface{}
+ )
+
resp := new(response.ProductProgress)
+
+ if isConnect {
+ finishNumber, _ = service.PlcCacheGet(conf.Conf.CurrentDeviceID, params.Channel, constvar.PlcCacheKeyFinishNumber)
+ totalNumber, _ = service.PlcCacheGet(conf.Conf.CurrentDeviceID, params.Channel, constvar.PlcCacheKeyTotalNumber)
+ } else if params.ProcedureId != 0 {
+ reportWork, err := service.GetLastReportWork(params.ProcedureId)
+ if err == nil {
+ finishNumber = reportWork.ReportAmount
+ workOrder, err := model.NewOrderSearch(nil).SetWorkOrderId(reportWork.WorkOrderID).First()
+ if err == nil {
+ totalNumber = workOrder.Amount.IntPart()
+ }
+ } else {
+ procedure, workOrder, _ := service.NewTaskService().GetProcedureAndWorkOrder(params.ProcedureId)
+ if workOrder != nil {
+ totalNumber = workOrder.Amount.IntPart()
+ }
+ if procedure != nil {
+ resp.RealStartTime = procedure.RealStartTime
+ resp.RealEndTime = procedure.RealEndTime
+ }
+ }
+ }
+
resp.FinishNumber = cast.ToInt(finishNumber)
resp.TotalNumber = cast.ToInt(totalNumber)
plcStatus := 1 //鏂紑杩炴帴
- isConnect := service.PlcIsConnect()
if isConnect {
- lastUpdateTime := service.FinishUpdateTimeGet(params.Channel)
+ lastUpdateTime := service.FinishUpdateTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
if time.Now().Unix()-cast.ToInt64(lastUpdateTime) < conf.Conf.PLC.StandbyTime { //鐢熶骇
plcStatus = 2
} else {
@@ -51,6 +73,11 @@
}
}
resp.PlcStatus = plcStatus
+
+ if params.ProcedureId == 0 {
+ resp.RealStartTime = service.TaskStartTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
+ resp.RealEndTime = service.TaskEndTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
+ }
ctx.OkWithDetailed(resp)
}
@@ -69,99 +96,99 @@
ctx.Ok()
}
-// SetSerfEvent
-// @Tags 鐢熶骇鏁伴噺
-// @Summary 璁剧疆鐢熶骇鎬婚噺
-// @Produce application/json
-// @Success 200 {object} contextx.Response{data=response.ProductProgress} "鎴愬姛"
-// @Router /v1/plc/setSerfEvent [post]
-func (slf *PlcApi) SetSerfEvent(c *gin.Context) {
- ctx, ok := contextx.NewContext(c, nil)
- if !ok {
- return
- }
- status := c.Query("status")
- stat := cast.ToInt(status)
- switch stat {
- case serf.EventCreateCluster, serf.EventSlave2Master, serf.EventLeaveCluster:
- if err := nsq.Init(); err != nil { //寮�鍚痭sq
- logx.Errorf("nsq Init err:%v", err)
- return
- }
- crontask.Once(true)
- if err := crontask.RestartTask(true); err != nil { //浠aster鏂瑰紡閲嶅惎task
- logx.Errorf("crontab task Init err:%v", err)
- return
- }
- case serf.EventJoinCluster, serf.EventMaster2Slave:
- nsq.Stop() //鍏抽棴nsq
- crontask.Once(false)
- if err := crontask.RestartTask(false); err != nil { //浠ラ潪master鏂瑰紡閲嶅惎task
- logx.Errorf("crontab task Init err:%v", err)
- return
- }
- }
+//// SetSerfEvent
+//// @Tags 鐢熶骇鏁伴噺
+//// @Summary 璁剧疆鐢熶骇鎬婚噺
+//// @Produce application/json
+//// @Success 200 {object} contextx.Response{data=response.ProductProgress} "鎴愬姛"
+//// @Router /v1/plc/setSerfEvent [post]
+//func (slf *PlcApi) SetSerfEvent(c *gin.Context) {
+// ctx, ok := contextx.NewContext(c, nil)
+// if !ok {
+// return
+// }
+// status := c.Query("status")
+// stat := cast.ToInt(status)
+// switch stat {
+// case serf.EventCreateCluster, serf.EventSlave2Master, serf.EventLeaveCluster:
+// if err := nsq.Init(); err != nil { //寮�鍚痭sq
+// logx.Errorf("nsq Init err:%v", err)
+// return
+// }
+// crontask.Once(true)
+// if err := crontask.RestartTask(true); err != nil { //浠aster鏂瑰紡閲嶅惎task
+// logx.Errorf("crontab task Init err:%v", err)
+// return
+// }
+// case serf.EventJoinCluster, serf.EventMaster2Slave:
+// nsq.Stop() //鍏抽棴nsq
+// crontask.Once(false)
+// if err := crontask.RestartTask(false); err != nil { //浠ラ潪master鏂瑰紡閲嶅惎task
+// logx.Errorf("crontab task Init err:%v", err)
+// return
+// }
+// }
+//
+// logx.Infof("serf cluster event: %v", stat)
+//
+// ctx.Ok()
+//}
- logx.Infof("serf cluster event: %v", stat)
-
- ctx.Ok()
-}
-
-// GetProductProgressRealTime
-// @Tags 鐢熶骇鏁伴噺
-// @Summary 瀹炴椂鑾峰彇鐢熶骇杩涘害
-// @Produce application/json
-// @Success 200 {object} contextx.Response{data=response.ProductProgress} "鎴愬姛"
-// @Router /v1/plc/productProgressRealTime [post]
-func (slf *PlcApi) GetProductProgressRealTime(c *gin.Context) {
- ctx, ok := contextx.NewContext(c, nil)
- if !ok {
- return
- }
- var finishNumber, totalNumber int64
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK {
- return
- }
- for _, addressItem := range plcConfig.Details {
- if addressItem.FieldName == constvar.PlcStartAddressTypeFinishNumber {
- value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
- if err != nil {
- logx.Infof("plc read finish number err: %v", err)
- continue
- }
- finishNumber = cast.ToInt64(value)
- logx.Infof("plc read finish number: %v", finishNumber)
- break
- }
- }
-
- for _, addressItem := range plcConfig.Details {
- if addressItem.FieldName == constvar.PlcStartAddressTypeTotalNumber {
- value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
- if err != nil {
- logx.Infof("plc read total number err: %v", err)
- continue
- }
- totalNumber = cast.ToInt64(value)
- logx.Infof("plc read total number: %v", totalNumber)
- break
- }
- }
- resp := new(response.ProductProgress)
- resp.FinishNumber = cast.ToInt(finishNumber)
- resp.TotalNumber = cast.ToInt(totalNumber)
-
- plcStatus := 1 //鏂紑杩炴帴
- isConnect := apacheplc4x.IsConnect()
- if isConnect {
- if resp.FinishNumber > 0 { //鐢熶骇
- plcStatus = 2
- } else { //寰呮満
- plcStatus = 3
- }
- }
- resp.PlcStatus = plcStatus
-
- ctx.OkWithDetailed(resp)
-}
+//// GetProductProgressRealTime
+//// @Tags 鐢熶骇鏁伴噺
+//// @Summary 瀹炴椂鑾峰彇鐢熶骇杩涘害
+//// @Produce application/json
+//// @Success 200 {object} contextx.Response{data=response.ProductProgress} "鎴愬姛"
+//// @Router /v1/plc/productProgressRealTime [post]
+//func (slf *PlcApi) GetProductProgressRealTime(c *gin.Context) {
+// ctx, ok := contextx.NewContext(c, nil)
+// if !ok {
+// return
+// }
+// var finishNumber, totalNumber int64
+// plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+// if code != ecode.OK {
+// return
+// }
+// for _, addressItem := range plcConfig.Details {
+// if addressItem.FieldName == constvar.PlcStartAddressTypeFinishNumber {
+// value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+// if err != nil {
+// logx.Infof("plc read finish number err: %v", err)
+// continue
+// }
+// finishNumber = cast.ToInt64(value)
+// logx.Infof("plc read finish number: %v", finishNumber)
+// break
+// }
+// }
+//
+// for _, addressItem := range plcConfig.Details {
+// if addressItem.FieldName == constvar.PlcStartAddressTypeTotalNumber {
+// value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+// if err != nil {
+// logx.Infof("plc read total number err: %v", err)
+// continue
+// }
+// totalNumber = cast.ToInt64(value)
+// logx.Infof("plc read total number: %v", totalNumber)
+// break
+// }
+// }
+// resp := new(response.ProductProgress)
+// resp.FinishNumber = cast.ToInt(finishNumber)
+// resp.TotalNumber = cast.ToInt(totalNumber)
+//
+// plcStatus := 1 //鏂紑杩炴帴
+// isConnect := apacheplc4x.IsConnect()
+// if isConnect {
+// if resp.FinishNumber > 0 { //鐢熶骇
+// plcStatus = 2
+// } else { //寰呮満
+// plcStatus = 3
+// }
+// }
+// resp.PlcStatus = plcStatus
+//
+// ctx.OkWithDetailed(resp)
+//}
--
Gitblit v1.8.0