From 7e85f7f90911d4bf25821357690d94085a42b36d Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期二, 26 九月 2023 17:39:11 +0800 Subject: [PATCH] 更改一些错误文案,增加plc断开错误文案,重发请求下发任务时直接返回成功 --- conf/config.go | 3 ++- service/device_plc.go | 4 ++-- conf/apsClient.json | 3 ++- api/v1/config.go | 4 ++-- api/v1/task.go | 8 ++++---- pkg/ecode/msg.go | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/api/v1/config.go b/api/v1/config.go index 4765bcf..2e94285 100644 --- a/api/v1/config.go +++ b/api/v1/config.go @@ -32,7 +32,7 @@ ConfigData, err := service.NewConfigService().GetNetConfigList() if err != nil { logx.Errorf("get net config error: %v", err.Error()) - ctx.FailWithMsg(ecode.UnknownErr, "鑾峰彇缃戠粶閰嶇疆澶辫触") + ctx.FailWithMsg(ecode.DBErr, "鑾峰彇缃戠粶閰嶇疆澶辫触") return } @@ -57,7 +57,7 @@ if err != nil { logx.Errorf("get net config error: %v", err.Error()) - ctx.FailWithMsg(ecode.UnknownErr, "鑾峰彇缃戠粶閰嶇疆澶辫触") + ctx.FailWithMsg(ecode.DBErr, "鑾峰彇缃戠粶閰嶇疆澶辫触") return } err = service.NewConfigService().SetNetConfig(params.Id, ¶ms) diff --git a/api/v1/task.go b/api/v1/task.go index 480a58f..8de652b 100644 --- a/api/v1/task.go +++ b/api/v1/task.go @@ -167,13 +167,13 @@ order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID) if err != nil { - ctx.Fail(ecode.UnknownErr) + ctx.Fail(ecode.DBErr) return } processModel, err := service.NewTaskService().GetProcessParams(procedure, order) if err != nil || processModel == nil || processModel.ParamsMap == nil { - ctx.FailWithMsg(ecode.ParamsErr, "璇峰厛閰嶇疆宸ヨ壓鍙傛暟") + ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒") return } @@ -274,7 +274,7 @@ } if procedure.Status == model.ProcedureStatusProcessing { - ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡寮�濮嬬敓浜�") + ctx.Ok() return } @@ -322,7 +322,7 @@ } return nil }) - ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��") + ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�") return } if code != ecode.OK { diff --git a/conf/apsClient.json b/conf/apsClient.json index 28c3c8b..18ccd69 100644 --- a/conf/apsClient.json +++ b/conf/apsClient.json @@ -37,7 +37,8 @@ "standbyTime": 300 }, "prompt": { - "safeProduce": "璇风‘璁ゅ畨鍏ㄧ敓浜э紒" + "safeProduce": "璇风‘璁ゅ畨鍏ㄧ敓浜э紒", + "plcNotConnected": "鏃犳硶鍔犺浇鐢熶骇鏁版嵁锛岃纭缁堢璁惧鏄惁姝e父杩愯锛�" } } diff --git a/conf/config.go b/conf/config.go index 1f9122b..53f53ea 100644 --- a/conf/config.go +++ b/conf/config.go @@ -77,7 +77,8 @@ } Prompt struct { - SafeProduce string `json:"safeProduce,omitempty"` + SafeProduce string `json:"safeProduce,omitempty"` + PlcNotConnected string `json:"plcNotConnected,omitempty"` } config struct { diff --git a/pkg/ecode/msg.go b/pkg/ecode/msg.go index a56f586..92759ba 100644 --- a/pkg/ecode/msg.go +++ b/pkg/ecode/msg.go @@ -2,7 +2,7 @@ var MsgFlags = map[int]string{ UnknownErr: "鏈煡閿欒", - DBErr: "db閿欒", + DBErr: "鏁版嵁搴撹繛鎺ュけ璐ワ紝璇锋鏌ユ暟鎹簱閰嶇疆锛�", RedisErr: "redis閿欒", ParamsErr: "璇锋眰鍙傛暟閿欒", } diff --git a/service/device_plc.go b/service/device_plc.go index 2cac8b6..b0281dd 100644 --- a/service/device_plc.go +++ b/service/device_plc.go @@ -43,10 +43,10 @@ func (slf DevicePlcService) GetDeviceChannelAmount() (int, error) { plcConfig, code := slf.GetDevicePlc() if code != ecode.OK || plcConfig.Id == 0 { - return 0, errors.New("璇峰厛閰嶇疆PLC") + return 0, errors.New("鏈幏鍙栧埌PLC鍦板潃锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒") } if len(plcConfig.Details) == 0 { - return 0, errors.New("璇峰厛閰嶇疆PLC") + return 0, errors.New("鏈幏鍙栧埌PLC鍦板潃锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒") } return len(plcConfig.Details) / 2, nil } -- Gitblit v1.8.0