From 578b74f9de4b96e88e2fddb726c7c6f78162b033 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 21 十月 2023 14:34:23 +0800
Subject: [PATCH] 启停生产者
---
api/v1/plc.go | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index 69edb19..cc16206 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -1,17 +1,22 @@
package v1
import (
+ "apsClient/conf"
"apsClient/constvar"
+ "apsClient/crontask"
"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"
+ "time"
)
type PlcApi struct{}
@@ -29,19 +34,20 @@
if !ok {
return
}
- finishNumber, _ := service.PlcCacheGet(params.Position, constvar.PlcCacheKeyFinishNumber)
- totalNumber, _ := service.PlcCacheGet(params.Position, constvar.PlcCacheKeyTotalNumber)
+ finishNumber, _ := service.PlcCacheGet(params.Channel, constvar.PlcCacheKeyFinishNumber)
+ totalNumber, _ := service.PlcCacheGet(params.Channel, constvar.PlcCacheKeyTotalNumber)
resp := new(response.ProductProgress)
resp.FinishNumber = cast.ToInt(finishNumber)
resp.TotalNumber = cast.ToInt(totalNumber)
plcStatus := 1 //鏂紑杩炴帴
- isConnect := apacheplc4x.IsConnect()
+ isConnect := service.PlcIsConnect()
if isConnect {
- if resp.FinishNumber > 0 { //鐢熶骇
+ lastUpdateTime := service.FinishUpdateTimeGet(params.Channel)
+ if time.Now().Unix()-cast.ToInt64(lastUpdateTime) < conf.Conf.PLC.StandbyTime { //鐢熶骇
plcStatus = 2
- } else { //寰呮満
- plcStatus = 3
+ } else {
+ plcStatus = 3 //寰呮満
}
}
resp.PlcStatus = plcStatus
@@ -63,14 +69,55 @@
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
-// @Param object body request.SendProcessParams true "鏌ヨ鍙傛暟"
// @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 {
--
Gitblit v1.8.0