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

fix(deprecates):继续清理已经删除的表计摊薄字段。

Browse Source
This commit is contained in:
徐涛 2022-09-23 15:53:56 +08:00
parent 0169419707
commit df9bf83bb8
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
controller/meter04kv.go
View File

@ -2,7 +2,6 @@ package controller
import ( import (
"electricity_bill_calc/excel" "electricity_bill_calc/excel"
"electricity_bill_calc/logger"
"electricity_bill_calc/model" "electricity_bill_calc/model"
"electricity_bill_calc/response" "electricity_bill_calc/response"
"electricity_bill_calc/security" "electricity_bill_calc/security"
@ -15,7 +14,6 @@ import (
"github.com/jinzhu/copier" "github.com/jinzhu/copier"
"github.com/samber/lo" "github.com/samber/lo"
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
"go.uber.org/zap"
) )
func InitializeMeter04kVController(router *gin.Engine) { func InitializeMeter04kVController(router *gin.Engine) {
@ -96,7 +94,6 @@ type _MeterModificationFormData struct {
Ratio decimal.Decimal `json:"ratio" form:"ratio"` Ratio decimal.Decimal `json:"ratio" form:"ratio"`
Seq int `json:"seq" form:"seq"` Seq int `json:"seq" form:"seq"`
IsPublicMeter bool `json:"isPublicMeter" form:"isPublicMeter"` IsPublicMeter bool `json:"isPublicMeter" form:"isPublicMeter"`
WillDilute bool `json:"willDilute" form:"willDilute"`
Enabled bool `json:"enabled" form:"enabled"` Enabled bool `json:"enabled" form:"enabled"`
} }
@ -109,7 +106,6 @@ type _MeterCreationFormData struct {
Ratio decimal.Decimal `json:"ratio" form:"ratio"` Ratio decimal.Decimal `json:"ratio" form:"ratio"`
Seq int `json:"seq" form:"seq"` Seq int `json:"seq" form:"seq"`
IsPublicMeter bool `json:"isPublicMeter" form:"isPublicMeter"` IsPublicMeter bool `json:"isPublicMeter" form:"isPublicMeter"`
WillDilute bool `json:"willDilute" form:"willDilute"`
Enabled bool `json:"enabled" form:"enabled"` Enabled bool `json:"enabled" form:"enabled"`
} }
@ -151,7 +147,6 @@ func modifySingle04kVMeter(c *gin.Context) {
formData := new(_MeterModificationFormData) formData := new(_MeterModificationFormData)
c.BindJSON(formData) c.BindJSON(formData)
copier.Copy(meterDetail, formData) copier.Copy(meterDetail, formData)
logger.Named("Controller", "Meter").Debug("Check #1", zap.Any("meter", meterDetail))
err = service.Meter04kVService.UpdateSingleMeter(meterDetail) err = service.Meter04kVService.UpdateSingleMeter(meterDetail)
if err != nil { if err != nil {
result.Error(http.StatusInternalServerError, err.Error()) result.Error(http.StatusInternalServerError, err.Error())

1
service/god_mode.go
View File

@ -255,7 +255,6 @@ func (g _GodModeService) resynchronizeEndUserArchives(tx *bun.Tx, ctx *context.C
"contact_phone", "contact_phone",
"seq", "seq",
"public_meter", "public_meter",
"dilute",
) )
if err != nil { if err != nil {
return success, err return success, err

4
service/meter04kv.go
View File

@ -101,7 +101,7 @@ func (_Meter04kVService) updateMeter(tx *bun.Tx, ctx *context.Context, meter mod
_, err := tx.NewUpdate().Model(&meter). _, err := tx.NewUpdate().Model(&meter).
Where("code = ?", meter.Code). Where("code = ?", meter.Code).
Where("park_id = ?", meter.ParkId). Where("park_id = ?", meter.ParkId).
Column("address", "customer_name", "contact_name", "contact_phone", "ratio", "seq", "public_meter", "dilute", "enabled"). Column("address", "customer_name", "contact_name", "contact_phone", "ratio", "seq", "public_meter", "enabled").
Exec(*ctx) Exec(*ctx)
if err != nil { if err != nil {
tx.Rollback() tx.Rollback()
@ -206,7 +206,7 @@ func (m _Meter04kVService) BatchCreateMeter(meters []model.Meter04KV) error {
} }
if len(updates) > 0 { if len(updates) > 0 {
_, err = tx.NewUpdate().Model(&updates). _, err = tx.NewUpdate().Model(&updates).
Column("address", "customer_name", "contact_name", "contact_phone", "ratio", "seq", "public_meter", "dilute", "enabled"). Column("address", "customer_name", "contact_name", "contact_phone", "ratio", "seq", "public_meter", "enabled").
Bulk(). Bulk().
Exec(ctx) Exec(ctx)
if err != nil { if err != nil {