From efec800478214f3a412f879d2b51c2968515995d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 25 十一月 2023 17:04:25 +0800
Subject: [PATCH] plc断开连接时获取工序最后一次报工数量作为加工数
---
api/v1/plc.go | 212 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 158 insertions(+), 54 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index 1ae6174..c16aba1 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -1,77 +1,181 @@
package v1
import (
+ "apsClient/conf"
"apsClient/constvar"
+ "apsClient/model"
+ "apsClient/model/request"
"apsClient/model/response"
_ "apsClient/model/response"
"apsClient/pkg/contextx"
- "apsClient/pkg/ecode"
- "apsClient/pkg/logx"
- "apsClient/pkg/plc"
"apsClient/service"
- "encoding/binary"
"github.com/gin-gonic/gin"
+ "github.com/spf13/cast"
+ "time"
)
type PlcApi struct{}
// GetProductProgress
-// @Tags 鑾峰彇鍔ㄦ�佹暟鎹�
+// @Tags 鐢熶骇鏁伴噺
// @Summary 鑾峰彇鐢熶骇杩涘害
// @Produce application/json
+// @Param object body request.GetProductProgress true "鏌ヨ鍙傛暟"
// @Success 200 {object} contextx.Response{data=response.ProductProgress} "鎴愬姛"
-// @Router /v1/plc/productProgress [get]
+// @Router /v1/plc/productProgress [post]
func (slf *PlcApi) GetProductProgress(c *gin.Context) {
+ var params request.GetProductProgress
+ ctx, ok := contextx.NewContext(c, ¶ms)
+ if !ok {
+ return
+ }
+ isConnect := service.PlcIsConnect()
+ var (
+ finishNumber interface{}
+ totalNumber interface{}
+ )
+ 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()
+ }
+ }
+
+ resp := new(response.ProductProgress)
+ resp.FinishNumber = cast.ToInt(finishNumber)
+ resp.TotalNumber = cast.ToInt(totalNumber)
+
+ plcStatus := 1 //鏂紑杩炴帴
+ if isConnect {
+ lastUpdateTime := service.FinishUpdateTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
+ if time.Now().Unix()-cast.ToInt64(lastUpdateTime) < conf.Conf.PLC.StandbyTime { //鐢熶骇
+ plcStatus = 2
+ } else {
+ plcStatus = 3 //寰呮満
+ }
+ }
+ resp.PlcStatus = plcStatus
+
+ resp.RealStartTime = service.TaskStartTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
+ resp.RealEndTime = service.TaskEndTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
+
+ ctx.OkWithDetailed(resp)
+}
+
+// SetProductNumber
+// @Tags 鐢熶骇鏁伴噺
+// @Summary 璁剧疆鐢熶骇鎬婚噺
+// @Produce application/json
+// @Success 200 {object} contextx.Response{} "鎴愬姛"
+// @Router /v1/plc/setProductNumber [post]
+func (slf *PlcApi) SetProductNumber(c *gin.Context) {
ctx, ok := contextx.NewContext(c, nil)
if !ok {
return
}
-
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK {
- ctx.FailWithMsg(ecode.UnknownErr, "璇峰厛閰嶇疆PLC")
- return
- }
-
- var startAddress int
- var valueType string
- var dataLength int
- var ipAddr string
-
- for _, pc := range plcConfig.Details {
- if pc.FieldName == constvar.PlcStartAddressTypeFinishNumber {
- startAddress = pc.StartAddress
- valueType = pc.Type
- dataLength = pc.Length
- }
- ipAddr = plcConfig.Address
- }
-
- resp := new(response.ProductProgress)
- if startAddress == 0 || valueType == "" {
- ctx.OkWithDetailed(resp)
- logx.Warnf("璇峰厛閰嶇疆PLC")
- return
- }
- conn, err := plc.NewModbusConnection(ipAddr)
- if err != nil {
- ctx.OkWithDetailed(resp)
- logx.Errorf("GetProductProgress 杩炴帴plc澶辫触: %v", err.Error())
- return
- }
- defer conn.Close()
-
- rawData, err := plc.ReadHoldingRegister(conn, startAddress, dataLength)
- if err != nil {
- ctx.OkWithDetailed(resp)
- logx.Errorf("GetProductProgress 鑾峰彇plc鏁版嵁澶辫触: %v", err.Error())
- return
- }
- resp.FinishNumber = int(binary.BigEndian.Uint16(rawData))
- if err != nil {
- ctx.OkWithDetailed(resp)
- logx.Errorf("GetProductProgress 鑾峰彇鐢熶骇杩涘害鏁版嵁瑙ｆ瀽澶辫触: %v, data: %v, valueType:%v", err.Error(), rawData, valueType)
- return
- }
- ctx.OkWithDetailed(resp)
+ 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
+// }
+// }
+//
+// 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)
+//}
--
Gitblit v1.8.0