优化修改Go代码某些变量的命名, 使其更规范合理

mcu_ctrl_board/workstate.go

@@ -11,12 +11,13 @@ type WorkState uint32
 
 const (
 	Idle                WorkState = 0      // 空闲(默认)
-	AppUpgrading        WorkState = 1 << 0 // 应用程序固件-升级中
-	PhotoCapturing      WorkState = 1 << 1 // 当前相机图像-拍照中
-	PhotoUploading      WorkState = 1 << 2 // 相机图像文件-上传中
-	SensorDataReceiving WorkState = 1 << 3 // 当前环境数据-收集中
-	SensorDataUploading WorkState = 1 << 4 // 当前环境数据-上传中
-	SensorHistUploading WorkState = 1 << 5 // 历史环境数据-上传中
+	RtuAppUpgrading     WorkState = 1 << 0 // 数据板的固件-升级中
+	McuAppUpgrading     WorkState = 1 << 1 // 控制板的固件-升级中
+	PhotoCapturing      WorkState = 1 << 2 // 当前相机图像-拍照中
+	PhotoUploading      WorkState = 1 << 3 // 相机图像文件-上传中
+	SensorDataReceiving WorkState = 1 << 4 // 当前环境数据-收集中
+	SensorDataUploading WorkState = 1 << 5 // 当前环境数据-上传中
+	SensorHistUploading WorkState = 1 << 6 // 历史环境数据-上传中
 )
 
 // RTU数据板的工作状态管理器

reporter/common.go

@@ -33,7 +33,7 @@ func FileMD5(path string) (string, error) {
 }
 
 // 判断指定路径的文件是否存在
-func FileExists(filename string) bool {
-	_, err := os.Stat(filename)
+func FileExists(name string) bool {
+	_, err := os.Stat(name)
 	return !os.IsNotExist(err)
 }

reporter/envdata.go

@@ -63,11 +63,11 @@ func (r *MQTTReporter) reportSensorData(envData *mcu.EnvSensorData) {
 	baseapp.Logger.Infof("[%s] 环境数据上传成功, 用时: %d毫秒", MODULE_NAME, elapsed)
 }
 
-func (r *MQTTReporter) reportSensorHist(filename string) int {
+func (r *MQTTReporter) reportSensorHist(filePath string) int {
 	mcu.GlobalWorkState.Add(mcu.SensorHistUploading)
 	defer mcu.GlobalWorkState.Remove(mcu.SensorHistUploading)
 
-	uploadingData, err := r.loadSensorData(filename)
+	uploadingData, err := r.loadSensorData(filePath)
 	if err != nil {
 		baseapp.Logger.Errorf("[%s] 加载环境数据失败: %v!!", MODULE_NAME, err)
 		return -1
@@ -106,13 +106,13 @@ func (r *MQTTReporter) reportSensorHist(filename string) int {
 	return nums
 }
 
-func (r *MQTTReporter) loadSensorData(filename string) ([]*mcu.EnvSensorData, error) {
+func (r *MQTTReporter) loadSensorData(filePath string) ([]*mcu.EnvSensorData, error) {
 	r.sensorFileLock.Lock()
 	defer r.sensorFileLock.Unlock()
 
 	var existingData []*mcu.EnvSensorData
 
-	f, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, 0644)
+	f, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE, 0644)
 	if err != nil {
 		return nil, err
 	}
@@ -126,8 +126,8 @@ func (r *MQTTReporter) loadSensorData(filename string) ([]*mcu.EnvSensorData, er
 	return existingData, nil
 }
 
-func (r *MQTTReporter) saveSensorData(envData *mcu.EnvSensorData, filename string) error {
-	existingData, err := r.loadSensorData(filename)
+func (r *MQTTReporter) saveSensorData(envData *mcu.EnvSensorData, filePath string) error {
+	existingData, err := r.loadSensorData(filePath)
 	if err != nil {
 		return err
 	}
@@ -141,7 +141,7 @@ func (r *MQTTReporter) saveSensorData(envData *mcu.EnvSensorData, filename strin
 
 	existingData = append(existingData, envData)
 
-	f, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, 0644)
+	f, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE, 0644)
 	if err != nil {
 		return err
 	}

reporter/reporter.go

@@ -216,10 +216,10 @@ func (r *MQTTReporter) onLogin(client mqtt.Client, msg mqtt.Message) {
 func (r *MQTTReporter) reuploadLegacy() {
 	baseapp.Logger.Infof("[%s] ++数据补录开始++", MODULE_NAME)
 	nums1 := 0
-	filename := "sensor_data.json"
-	if FileExists(filename) {
-		if nums1 = r.reportSensorHist(filename); nums1 >= 0 {
-			os.Remove(filename) // 上传成功后删除历史数据文件
+	name := "sensor_data.json"
+	if FileExists(name) {
+		if nums1 = r.reportSensorHist(name); nums1 >= 0 {
+			os.Remove(name) // 上传成功后删除历史数据文件
 		} else {
 			nums1 = 0
 		}
@@ -409,7 +409,7 @@ func (r *MQTTReporter) execOneCmd(msg mqtt.Message) {
 	// 下发拍照指令
 	case "take_photo":
 		rf, err := r.takePhotoAndUpToFtp()
-		resp = buildResp(req, map[string]string{"filename": rf}, err)
+		resp = buildResp(req, map[string]string{"filePath": rf}, err)
 	// 下发升级指令
 	case "upgrade_app":
 		server, user, pass, rf, md5val1, err := parseUpgradeAppReq(req.Params)
@@ -418,8 +418,8 @@ func (r *MQTTReporter) execOneCmd(msg mqtt.Message) {
 			break
 		}
 
-		mcu.GlobalWorkState.Add(mcu.AppUpgrading)
-		defer mcu.GlobalWorkState.Remove(mcu.AppUpgrading)
+		mcu.GlobalWorkState.Add(mcu.RtuAppUpgrading)
+		defer mcu.GlobalWorkState.Remove(mcu.RtuAppUpgrading)
 
 		lf, err := ftpclient.DownloadFileFromFtp(r.ctx, server, user, pass, rf, ftpclient.DefaultDownloadTimeout)
 		if err != nil {