diff --git a/repository/meter.go b/repository/meter.go index c0d3a00..e5c818d 100644 --- a/repository/meter.go +++ b/repository/meter.go @@ -281,7 +281,7 @@ func (mr _MeterRepository) CreateOrUpdateMeter(tx pgx.Tx, ctx context.Context, p }, ). OnConflict( - goqu.DoUpdate("meter_04kv_pkey", + goqu.DoUpdate("code, park_id", goqu.Record{ "address": goqu.I("excluded.address"), "seq": goqu.I("excluded.seq"), diff --git a/router/router.go b/router/router.go index b436fd1..fe8c98f 100644 --- a/router/router.go +++ b/router/router.go @@ -26,7 +26,7 @@ func init() { func App() *fiber.App { app := fiber.New(fiber.Config{ - BodyLimit: 10 * 1024 * 1024, + BodyLimit: 30 * 1024 * 1024, EnablePrintRoutes: true, EnableTrustedProxyCheck: false, Prefork: false, diff --git a/service/meter.go b/service/meter.go index bea9bb1..ff3be35 100644 --- a/service/meter.go +++ b/service/meter.go @@ -155,7 +155,7 @@ func (ms _MeterService) BatchImportMeters(pid string, file *multipart.FileHeader // 步骤2.1:获取表计档案中出现的所有建筑,并对档案中新出现的建筑进行创建操作 unexistsBuildingNames := make([]string, 0) for _, record := range records { - if !lo.Contains(buildingNames, *record.Building) { + if record.Building != nil && !lo.Contains(buildingNames, *record.Building) { unexistsBuildingNames = append(unexistsBuildingNames, *record.Building) } } @@ -186,7 +186,7 @@ func (ms _MeterService) BatchImportMeters(pid string, file *multipart.FileHeader // 步骤2.3:检测并替换表计档案中的建筑ID for _, record := range records { for _, building := range buildings { - if building.Name == *record.Building { + if record.Building != nil && building.Name == *record.Building { record.Building = &building.Id break }