Update 优化代码逻辑

SERVER/Meter_Service/dataStruct/meterCalcParam.go

@@ -1,6 +1,8 @@
 package dataStruct
 
-import "MeterService/core/logger"
+import (
+	"MeterService/core/logger"
+)
 
 type MeterCalcParam struct {
 	Id             string         //电表编码

SERVER/Meter_Service/service/downStreamService/collect.go

@@ -68,6 +68,7 @@ func collectData(sn string, config *dataStruct.DtuConfig) []*dataStruct.CollectD
 		}
 
 	}
+	logger.Info("采集数据完成【%s】", sn)
 	logger.Debug("采集数据完成【%s】 %v", sn, array)
 	return array
 }
@@ -94,8 +95,8 @@ func processCollectData(colData *dataStruct.CollectData, cfg *dataStruct.DtuSlav
 
 	// 计算电表数据
 	logger.Debug("[%d]计算前: [%v]", today, *calc)
-	colData.CalcWithParam(calc)
 	calc.Time = tms
+	colData.CalcWithParam(calc)
 	logger.Debug("[%d]计算后: [%v]", today, *calc)
 	// 更新电表计算参数
 	data.CalcParam.Add(cfg.NO, calc)

SERVER/Meter_Service/service/downStreamService/proto/report/report.go

@@ -25,7 +25,7 @@ func YcHj212Report(dataArray []*dataStruct.CollectData, config *dataStruct.DtuCo
 				logger.Error("[%s:%s]上报数据失败: [ %s ] %s", bs.Host, bs.Port, str, err.Error())
 			} else {
 				logger.Debug("上报数据 SEND -> %s", str)
-				logger.Debug("上报数据 RECE <- %s", receive)
+				logger.Info("上报数据 RECE <- %s", receive)
 			}
 		}
 	}

SERVER/Meter_Service/service/downStreamService/service.go

@@ -140,7 +140,6 @@ func updateOnlineConf(msg *dataStruct.DtuRegisterChanMsg) {
 func collectAndReport(nowTime time.Time, lastMinute int) {
 	minute := nowTime.Minute() //当前分钟
 	if minute != lastMinute {
-		lastMinute = minute
 		count := 0
 		onlineDtu := make(map[string]*dataStruct.ClientState)
 
@@ -181,6 +180,6 @@ func collectAndReport(nowTime time.Time, lastMinute int) {
 			}
 		}
 		errCount = 0
-
 	}
+	lastMinute = minute
 }

SERVER/Meter_Service/service/webService/service.go

@@ -10,6 +10,7 @@ import (
 )
 
 func NewWebServer() {
+
 	gin.SetMode(config.C.Vber.Mode)
 
 	g := gin.New()
@@ -24,6 +25,6 @@ func NewWebServer() {
 		logger.Error("Web服务启动失败: [ %s ]", err.Error())
 		return
 	} else {
-		logger.Debug("Web服务启动成功，端口：%d", config.C.Vber.WebPort)
+		logger.Info("Web服务启动成功，端口：%d", config.C.Vber.WebPort)
 	}
 }