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

refactor(deps):将一些工具函数用工具库替换。

Browse Source
This commit is contained in:
徐涛
2022-08-21 12:59:16 +08:00
parent 6edee68df6
commit dc9b0849e1
15 changed files with 84 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controller/meter04kv.go
View File

@@ -6,7 +6,6 @@ import (
"electricity_bill_calc/response"
"electricity_bill_calc/security"
"electricity_bill_calc/service"
"electricity_bill_calc/utils"
"fmt"
"log"
"net/http"
@@ -14,6 +13,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/jinzhu/copier"
"github.com/samber/lo"
"github.com/shopspring/decimal"
)
@@ -187,7 +187,7 @@ func batchImport04kVMeterArchive(c *gin.Context) {
return
}
mergedMeters := utils.Map(records, func(meter model.Meter04KV) model.Meter04KV {
mergedMeters := lo.Map(records, func(meter model.Meter04KV, index int) model.Meter04KV {
meter.ParkId = requestParkId
meter.Enabled = true
return meter

6
controller/park.go
View File

@@ -5,7 +5,7 @@ import (
"electricity_bill_calc/response"
"electricity_bill_calc/security"
"electricity_bill_calc/service"
"electricity_bill_calc/utils"
"electricity_bill_calc/tools"
"net/http"
"github.com/gin-gonic/gin"
@@ -94,7 +94,7 @@ func createNewPark(c *gin.Context) {
copier.Copy(newPark, formData)
newPark.Id = uuid.New().String()
newPark.UserId = userSession.Uid
nameAbbr := utils.PinyinAbbr(newPark.Name)
nameAbbr := tools.PinyinAbbr(newPark.Name)
newPark.Abbr = &nameAbbr
newPark.Enabled = true
err = service.ParkService.SaveNewPark(*newPark)
@@ -125,7 +125,7 @@ func modifyPark(c *gin.Context) {
return
}
copier.Copy(park, formData)
nameAbbr := utils.PinyinAbbr(formData.Name)
nameAbbr := tools.PinyinAbbr(formData.Name)
park.Abbr = &nameAbbr
err = service.ParkService.UpdateParkInfo(park)
if err != nil {