fix(meter): 修改结构体MeterCreationForm中的字段名称，和此结构体的调用处

controller/meter.go

@@ -100,6 +100,8 @@ func createNewMeterManually(c *fiber.Ctx) error {
 		meterLog.Error("无法手动添加一条0.4kV表计记录，无法解析表计创建表单", zap.Error(err))
 		return result.NotAccept(err.Error())
 	}
+	fmt.Println(creationForm)
+	fmt.Println(creationForm.Reading.ReadAt)
 	if err := service.MeterService.CreateMeterRecord(parkId, &creationForm); err != nil {
 		meterLog.Error("无法手动添加一条0.4kV表计记录，无法创建表计记录", zap.Error(err))
 		return result.NotAccept(err.Error())

repository/meter.go

@@ -243,7 +243,8 @@ func (mr _MeterRepository) FetchMeterDetail(pid, code string) (*model.MeterDetai
 // 创建一条新的表计信息
 func (mr _MeterRepository) CreateMeter(tx pgx.Tx, ctx context.Context, pid string, meter vo.MeterCreationForm) (bool, error) {
 	mr.log.Info("创建一条新的表计信息", zap.String("park id", pid), zap.String("meter code", meter.Code))
-	timeNow := types.Now()
+	//timeNow := types.Now()
+	fmt.Println(meter.Reading.ReadAt)
 	meterSql, meterArgs, _ := mr.ds.
 		Insert(goqu.T("meter_04kv")).
 		Cols(
@@ -252,7 +253,7 @@ func (mr _MeterRepository) CreateMeter(tx pgx.Tx, ctx context.Context, pid strin
 		).
 		Vals(
 			goqu.Vals{pid, meter.Code, meter.Address, meter.Ratio, meter.Seq, meter.MeterType, meter.Building, meter.OnFloor, meter.Area, meter.Enabled,
-				timeNow, timeNow, timeNow,
+				meter.Reading.ReadAt, meter.Reading.ReadAt, meter.Reading.ReadAt,
 			},
 		).
 		Prepared(true).ToSQL()

service/meter.go

@@ -49,7 +49,7 @@ func (ms _MeterService) CreateMeterRecord(pid string, form *vo.MeterCreationForm
 		return err
 	}
 
-	ok, err = repository.MeterRepository.RecordReading(tx, ctx, pid, form.Code, form.MeterType, form.Ratio, &form.MeterReadingForm)
+	ok, err = repository.MeterRepository.RecordReading(tx, ctx, pid, form.Code, form.MeterType, form.Ratio, &form.Reading)
 	if err != nil {
 		ms.log.Error("无法记录表计读数。", zap.Error(err))
 		tx.Rollback(ctx)
@@ -222,7 +222,7 @@ func (ms _MeterService) BatchImportMeters(pid string, file *multipart.FileHeader
 				Building:  element.Building,
 				OnFloor:   element.OnFloor,
 				Area:      element.Area,
-				MeterReadingForm: vo.MeterReadingForm{
+				Reading: vo.MeterReadingForm{
 					ReadAt:   &element.ReadAt,
 					Overall:  element.Overall,
 					Critical: element.Critical.Decimal,
@@ -257,7 +257,7 @@ func (ms _MeterService) BatchImportMeters(pid string, file *multipart.FileHeader
 	}
 	// 步骤5：将全部抄表信息保存进入数据库
 	for _, record := range meterCreationForms {
-		_, err := repository.MeterRepository.RecordReading(tx, ctx, pid, record.Code, record.MeterType, record.Ratio, &record.MeterReadingForm)
+		_, err := repository.MeterRepository.RecordReading(tx, ctx, pid, record.Code, record.MeterType, record.Ratio, &record.Reading)
 		if err != nil {
 			ms.log.Error("无法在数据插入阶段保存抄表信息。", zap.String("meter code", record.Code), zap.Error(err))
 			tx.Rollback(ctx)
@@ -372,7 +372,7 @@ func (ms _MeterService) ReplaceMeter(
 		Building:         oldMeter.Building,
 		OnFloor:          oldMeter.OnFloor,
 		Area:             oldMeter.Area,
-		MeterReadingForm: *newMeterReading,
+		Reading: *newMeterReading,
 	}
 
 	// 步骤7：将新表计写入系统
@@ -389,7 +389,7 @@ func (ms _MeterService) ReplaceMeter(
 	}
 
 	// 步骤8：将新表计的读数写入系统
-	ok, err = repository.MeterRepository.RecordReading(tx, ctx, pid, newMeterCode, newMeterCreationForm.MeterType, newMeterCreationForm.Ratio, &newMeterCreationForm.MeterReadingForm)
+	ok, err = repository.MeterRepository.RecordReading(tx, ctx, pid, newMeterCode, newMeterCreationForm.MeterType, newMeterCreationForm.Ratio, &newMeterCreationForm.Reading)
 	switch {
 	case err != nil:
 		ms.log.Error("无法将新表计的读数写入系统。", zap.Error(err))

settings.yaml

@@ -12,9 +12,9 @@ Server:
   ReadTimeout: 60
   WriteTimeout: 60
 Redis:
-  Host: 192.168.88.129
+  Host: 127.0.0.1
   Port: 6379
-  Password: 123456
+  Password:
   DB: 1
 Service:
   MaxSessionLife: 2h

vo/meter.go

@@ -7,16 +7,16 @@ import (
 )
 
 type MeterCreationForm struct {
-	Code             string              `json:"code"`
-	Address          *string             `json:"address"`
-	Ratio            decimal.Decimal     `json:"ratio"`
-	Seq              int64               `json:"seq"`
-	MeterType        int16               `json:"type"`
-	Building         *string             `json:"building"`
-	OnFloor          *string             `json:"onFloor"`
-	Area             decimal.NullDecimal `json:"area"`
-	Enabled          bool                `json:"enabled"`
-	MeterReadingForm `json:"-"`
+	Code      string              `json:"code"`
+	Address   *string             `json:"address"`
+	Ratio     decimal.Decimal     `json:"ratio"`
+	Seq       int64               `json:"seq"`
+	MeterType int16               `json:"type"`
+	Building  *string             `json:"building"`
+	OnFloor   *string             `json:"onFloor"`
+	Area      decimal.NullDecimal `json:"area"`
+	Enabled   bool                `json:"enabled"`
+	Reading   MeterReadingForm    `json:"reading"`
 }
 
 type MeterModificationForm struct {