ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
ZiHangQin 2023-08-10 16:12:13 +08:00
parent c2d43bd98e
commit 01e944cb5a
5 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/meter.go
View File

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

5
repository/meter.go
View File

@ -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) { 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)) 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. meterSql, meterArgs, _ := mr.ds.
Insert(goqu.T("meter_04kv")). Insert(goqu.T("meter_04kv")).
Cols( Cols(
@ -252,7 +253,7 @@ func (mr _MeterRepository) CreateMeter(tx pgx.Tx, ctx context.Context, pid strin
). ).
Vals( Vals(
goqu.Vals{pid, meter.Code, meter.Address, meter.Ratio, meter.Seq, meter.MeterType, meter.Building, meter.OnFloor, meter.Area, meter.Enabled, 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() Prepared(true).ToSQL()

10
service/meter.go
View File

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

4
settings.yaml
View File

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

20
vo/meter.go
View File

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