From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
service/problem/check.go | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/service/problem/check.go b/service/problem/check.go
index 3a602c7..17a8e89 100644
--- a/service/problem/check.go
+++ b/service/problem/check.go
@@ -6,7 +6,6 @@
"apsClient/model"
"apsClient/pkg/sqlitex"
"apsClient/service"
- "apsClient/service/plc_address"
"fmt"
"net"
"sync"
@@ -19,7 +18,6 @@
constvar.ProblemCodeSerf,
constvar.ProblemCodeCloud,
constvar.ProblemCodeDevice,
- constvar.ProblemCodeProcessModel,
constvar.ProblemCodePlcConfig,
constvar.ProblemCodePlcAddressList,
constvar.ProblemCodePlcProcessModelAddressList,
@@ -32,7 +30,6 @@
constvar.ProblemCodeSerf: "serf闆嗙兢",
constvar.ProblemCodeCloud: "娑堟伅闃熷垪",
constvar.ProblemCodeDevice: "鐢熶骇璁惧缁戝畾",
- constvar.ProblemCodeProcessModel: "宸ヨ壓鍙傛暟",
constvar.ProblemCodePlcConfig: "plc閰嶇疆",
constvar.ProblemCodePlcAddressList: "plc鍦板潃琛�",
constvar.ProblemCodePlcProcessModelAddressList: "plc宸ヨ壓鍙傛暟鍦板潃琛�",
@@ -73,6 +70,8 @@
checkObj = &PlcProcessModelAddressList{}
case constvar.ProblemCodePlcConnect:
checkObj = &PlcConnect{}
+ default:
+ continue
}
checkResultListTemp = append(checkResultListTemp, &CheckResult{
ItemCode: item,
@@ -191,13 +190,20 @@
func (slf *PlcAddressList) Check() bool {
plcConfig, _ := service.NewDevicePlcService().GetDevicePlc()
- return len(plcConfig.Details) > 0
+ return plcConfig != nil && len(plcConfig.Details) > 0
}
type PlcProcessModelAddressList struct{}
func (slf *PlcProcessModelAddressList) Check() bool {
- return plc_address.IsLoad()
+ record, err := model.NewProcessModelPlcAddressSearch().SetDeviceID(conf.Conf.CurrentDeviceID).First()
+ if err != nil {
+ return false
+ }
+ if len(record.AddressList) == 0 {
+ return false
+ }
+ return true
}
type PlcConnect struct{}
--
Gitblit v1.8.0