去掉冗余代码

mcu_ctrl_board/bridge.go

@@ -191,9 +191,6 @@ func getRTUStatus(r *jsonrpc2.Request) (*jsonrpc2.Response, error) {
 
 // 控制板发送传感器数据
 func sendSensorData(r *jsonrpc2.Request) (*jsonrpc2.Response, error) {
-	if Board == nil || Board.OneEnvDataCh == nil {
-		return jsonrpc2.BuildError(r, jsonrpc2.ErrInternal, ""), nil
-	}
 	GlobalWorkState.Add(SensorDataReceiving)
 	defer GlobalWorkState.Remove(SensorDataReceiving)
 
@@ -215,10 +212,6 @@ func sendSensorData(r *jsonrpc2.Request) (*jsonrpc2.Response, error) {
 
 // 控制板请求数据板拍照
 func takePhoto(r *jsonrpc2.Request) (*jsonrpc2.Response, error) {
-	if Board == nil || Board.ReqTakePhoCh == nil {
-		return jsonrpc2.BuildError(r, jsonrpc2.ErrInternal, ""), nil
-	}
-
 	select {
 	case Board.ReqTakePhoCh <- true:
 	default:

mcu_ctrl_board/mcu_ctrl_board.go

@@ -6,7 +6,6 @@ package mcu_ctrl_board
 
 import (
 	"fmt"
-	"sync"
 	"time"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
@@ -15,8 +14,11 @@ import (
 const MODULE_NAME = "MCUCtrlBoard"
 
 var (
-	Board *MCUCtrlBoard
-	once  sync.Once
+	Board = &MCUCtrlBoard{
+		OneEnvDataCh: make(chan *EnvSensorData, 1),
+		ReqTakePhoCh: make(chan bool, 1),
+		PwrWillOffCh: make(chan struct{}),
+	}
 )
 
 // 定义控制板的结构体
@@ -45,14 +47,6 @@ func (d EnvSensorData) String() string {
 
 // 初始化控制板的串口
 func ModuleInit() bool {
-	once.Do(func() { // 只允许创建单一实例
-		Board = &MCUCtrlBoard{
-			OneEnvDataCh: make(chan *EnvSensorData, 1),
-			ReqTakePhoCh: make(chan bool, 1),
-			PwrWillOffCh: make(chan struct{}),
-		}
-	})
-
 	err := loadCfgParams()
 	if err != nil {
 		baseapp.Logger.Errorf("[%s] 加载MCU运行参数配置项失败: %v!!", MODULE_NAME, err)
@@ -86,8 +80,5 @@ func ModuleExit() {
 
 // 通知数据板即将掉电
 func NotifyPwrWillOff() <-chan struct{} {
-	if Board == nil || Board.PwrWillOffCh == nil {
-		return nil
-	}
 	return Board.PwrWillOffCh
 }

reporter/envdata.go

@@ -17,9 +17,6 @@ func (r *MQTTReporter) loopRecvOneEnvData() {
 		select {
 		case envData := <-mcu.Board.OneEnvDataCh:
 			baseapp.Logger.Infof("[%s] 收到一条环境数据: %s", MODULE_NAME, envData.String())
-			if !r.IsLogin() {
-				baseapp.Logger.Warnf("[%s] 未登录, 无法上报环境数据!", MODULE_NAME)
-			}
 			r.reportSensorData(envData)
 		case <-r.ctx.Done():
 			return