Update 代码优化

SERVER/Meter_Service/service/downStreamService/collect.go

@@ -16,8 +16,8 @@ func collectData(sn string, config *dataStruct.DtuConfig) []*dataStruct.CollectD
 	array := make([]*dataStruct.CollectData, 0)
 
 	meterRef := &dataStruct.MeterRef{}
-	logger.Info("【%s】开始采集数据 ", sn)
-	logger.Debug("【%s】开始采集数据 %v", sn, config)
+	logger.Info("开始采集数据 【%s】", sn)
+	logger.Debug("开始采集数据【%s】 %v", sn, config)
 
 	if !config.Enable || config.Secs < 1 {
 		return array

SERVER/Meter_Service/service/downStreamService/service.go

@@ -115,7 +115,7 @@ func runTran(msg <-chan *dataStruct.DtuRegisterChanMsg) {
 			logger.Info("【更新设备配置】 SN：%s", msg.Sn)
 			updateOnlineConf(msg)
 		case nowTime := <-ticker.C:
-			collectAndReport(nowTime, lastMinute)
+			lastMinute = collectAndReport(nowTime, lastMinute)
 		}
 	}
 }
@@ -137,7 +137,7 @@ func updateOnlineConf(msg *dataStruct.DtuRegisterChanMsg) {
 }
 
 // 采集并上报数据
-func collectAndReport(nowTime time.Time, lastMinute int) {
+func collectAndReport(nowTime time.Time, lastMinute int) int {
 	minute := nowTime.Minute() //当前分钟
 	if minute != lastMinute {
 		count := 0
@@ -168,7 +168,7 @@ func collectAndReport(nowTime time.Time, lastMinute int) {
 		if count == 0 && errCount < 10 {
 			errCount++
 			logger.Info("没有在线设备。")
-			return
+			return minute
 		}
 		for dtuSn, client := range onlineDtu {
 			if minute%client.Config.Secs == 0 {
@@ -181,5 +181,6 @@ func collectAndReport(nowTime time.Time, lastMinute int) {
 		}
 		errCount = 0
 	}
-	lastMinute = minute
+	return minute
+
 }

SERVER/Meter_Service/service/webService/service.go

@@ -10,7 +10,7 @@ import (
 )
 
 func NewWebServer() {
-
+	logger.Info("Web服务启动,端口：%d", config.C.Vber.WebPort)
 	gin.SetMode(config.C.Vber.Mode)
 
 	g := gin.New()