From ffaccc4c88c1e02ef1e182a306affd48e80e081f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= <midnite@outlook.com>
Date: Sat, 17 Sep 2022 21:35:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(service):=E4=BF=AE=E6=AD=A3=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E4=BD=BF=E7=94=A8=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/abstract.go | 12 ------------
 service/end_user.go |  6 +++---
 service/god_mode.go |  2 +-
 service/report.go   |  4 ++--
 4 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 service/abstract.go

diff --git a/service/abstract.go b/service/abstract.go
deleted file mode 100644
index cb7874d..0000000
--- a/service/abstract.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package service
-
-func _postProcessSingle[T interface{}](instance *T, has bool, err error) (*T, error) {
-	if err != nil {
-		return nil, err
-	}
-	if has {
-		return instance, nil
-	} else {
-		return nil, nil
-	}
-}
diff --git a/service/end_user.go b/service/end_user.go
index a243e0a..8fae078 100644
--- a/service/end_user.go
+++ b/service/end_user.go
@@ -69,7 +69,7 @@ func (_EndUserService) SearchEndUserRecord(reportId, keyword string, page int) (
 
 	relations := []string{"end_user", "report", "park"}
 	for _, eu := range endUsers {
-		relations = append(relations, fmt.Sprintf("end_user:%s:%d", eu.ReportId, eu.MeterId))
+		relations = append(relations, fmt.Sprintf("end_user:%s:%s", eu.ReportId, eu.MeterId))
 	}
 	cache.CacheCount(relations, "end_user_detail", int64(total), conditions...)
 	cache.CacheSearch(endUsers, relations, "end_user_detail", conditions...)
@@ -164,7 +164,7 @@ func (es _EndUserService) BatchImportNonPVRegister(reportId string, file io.Read
 		errs.AddError(es.newVirtualExcelAnalysisError(err))
 		return errs
 	}
-	reportDetail := new(model.Report)
+	var reportDetail *model.Report
 	err = global.DB.NewSelect().Model(reportDetail).
 		Where("id = ?", reportId).
 		Scan(ctx)
@@ -269,7 +269,7 @@ func (es _EndUserService) BatchImportPVRegister(reportId string, file io.Reader)
 		errs.AddError(es.newVirtualExcelAnalysisError(err))
 		return errs
 	}
-	reportDetail := new(model.Report)
+	var reportDetail *model.Report
 	err = global.DB.NewSelect().Model(reportDetail).Where("id = ?", reportId).Scan(ctx)
 	if err != nil {
 		errs.AddError(es.newVirtualExcelAnalysisError(err))
diff --git a/service/god_mode.go b/service/god_mode.go
index 7fc5007..6024635 100644
--- a/service/god_mode.go
+++ b/service/god_mode.go
@@ -28,7 +28,7 @@ var GodModeService = _GodModeService{
 // 从此处开始为删除报表相关的部分
 
 func (_GodModeService) resetReportIndex(tx *bun.Tx, ctx *context.Context, reportId string) (bool, error) {
-	var report = new(model.Report)
+	var report *model.Report
 	err := tx.NewSelect().Model(report).Where("id = ?", reportId).Scan(*ctx)
 	if err != nil {
 		tx.Rollback()
diff --git a/service/report.go b/service/report.go
index d0b1ab1..80fbdbe 100644
--- a/service/report.go
+++ b/service/report.go
@@ -66,7 +66,7 @@ func (_ReportService) FetchParksWithNewestReport(uid string) ([]model.ParkNewest
 		make(map[string]model.ParkNewestReport, 0),
 	)
 	relations := lo.Map(reports, func(r model.Report, _ int) string {
-		return fmt.Sprint("report:%s", r.Id)
+		return fmt.Sprintf("report:%s", r.Id)
 	})
 	relations = append(relations, "park", "report")
 	cache.CacheSearch(reducedParks, relations, "park_newest_report", uid)
@@ -277,7 +277,7 @@ func (_ReportService) RetreiveReportIndex(rid string) (*model.Report, error) {
 	}
 	ctx, cancel := global.TimeoutContext()
 	defer cancel()
-	report := new(model.Report)
+	var report *model.Report
 	err := global.DB.NewSelect().Model(report).
 		Where("id = ?", rid).
 		Scan(ctx)