diff --git a/global/redis.go b/global/redis.go index db8577b..ebf038b 100644 --- a/global/redis.go +++ b/global/redis.go @@ -18,8 +18,8 @@ func SetupRedisConnection() error { a := fmt.Sprintf("%s:%d", config.RedisSettings.Host, config.RedisSettings.Port) fmt.Println(a) Rd, err = rueidis.NewClient(rueidis.ClientOption{ - InitAddress: []string{"127.0.0.1:6379"}, - Password: "", + InitAddress: []string{"192.168.88.129:6379"}, + Password: "123456", SelectDB: config.RedisSettings.DB, DisableCache: true, }) diff --git a/repository/meter.go b/repository/meter.go index 0a095d1..191427d 100644 --- a/repository/meter.go +++ b/repository/meter.go @@ -784,14 +784,14 @@ func (mr _MeterRepository) ListMeterReadings(pid string, keyword *string, page u readingQuery := mr.ds. From(goqu.T("meter_reading").As("r")). - LeftJoin(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("r.meter_id").Eq(goqu.I("m.code")))). + LeftJoin(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("r.meter_id").Eq(goqu.I("m.code")), goqu.I("m.park_id").Eq(goqu.I("r.park_id")))). Select("r.*"). Where( goqu.I("r.park_id").Eq(pid), ) countQuery := mr.ds. From(goqu.T("meter_reading").As("r")). - LeftJoin(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("r.meter_id").Eq(goqu.I("m.code")))). + LeftJoin(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("r.meter_id").Eq(goqu.I("m.code")), goqu.I("m.park_id").Eq(goqu.I("r.park_id")))). Select(goqu.COUNT("*")). Where( goqu.I("r.park_id").Eq(pid),