fix(meter):修复批量导入表计时的SQL语句和数据处理行为。
This commit is contained in:
parent
a626869f14
commit
a1a72b7204
|
@ -281,7 +281,7 @@ func (mr _MeterRepository) CreateOrUpdateMeter(tx pgx.Tx, ctx context.Context, p
|
||||||
},
|
},
|
||||||
).
|
).
|
||||||
OnConflict(
|
OnConflict(
|
||||||
goqu.DoUpdate("meter_04kv_pkey",
|
goqu.DoUpdate("code, park_id",
|
||||||
goqu.Record{
|
goqu.Record{
|
||||||
"address": goqu.I("excluded.address"),
|
"address": goqu.I("excluded.address"),
|
||||||
"seq": goqu.I("excluded.seq"),
|
"seq": goqu.I("excluded.seq"),
|
||||||
|
|
|
@ -26,7 +26,7 @@ func init() {
|
||||||
|
|
||||||
func App() *fiber.App {
|
func App() *fiber.App {
|
||||||
app := fiber.New(fiber.Config{
|
app := fiber.New(fiber.Config{
|
||||||
BodyLimit: 10 * 1024 * 1024,
|
BodyLimit: 30 * 1024 * 1024,
|
||||||
EnablePrintRoutes: true,
|
EnablePrintRoutes: true,
|
||||||
EnableTrustedProxyCheck: false,
|
EnableTrustedProxyCheck: false,
|
||||||
Prefork: false,
|
Prefork: false,
|
||||||
|
|
|
@ -155,7 +155,7 @@ func (ms _MeterService) BatchImportMeters(pid string, file *multipart.FileHeader
|
||||||
// 步骤2.1:获取表计档案中出现的所有建筑,并对档案中新出现的建筑进行创建操作
|
// 步骤2.1:获取表计档案中出现的所有建筑,并对档案中新出现的建筑进行创建操作
|
||||||
unexistsBuildingNames := make([]string, 0)
|
unexistsBuildingNames := make([]string, 0)
|
||||||
for _, record := range records {
|
for _, record := range records {
|
||||||
if !lo.Contains(buildingNames, *record.Building) {
|
if record.Building != nil && !lo.Contains(buildingNames, *record.Building) {
|
||||||
unexistsBuildingNames = append(unexistsBuildingNames, *record.Building)
|
unexistsBuildingNames = append(unexistsBuildingNames, *record.Building)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -186,7 +186,7 @@ func (ms _MeterService) BatchImportMeters(pid string, file *multipart.FileHeader
|
||||||
// 步骤2.3:检测并替换表计档案中的建筑ID
|
// 步骤2.3:检测并替换表计档案中的建筑ID
|
||||||
for _, record := range records {
|
for _, record := range records {
|
||||||
for _, building := range buildings {
|
for _, building := range buildings {
|
||||||
if building.Name == *record.Building {
|
if record.Building != nil && building.Name == *record.Building {
|
||||||
record.Building = &building.Id
|
record.Building = &building.Id
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user