daihengshun/ArmedPolice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目

Browse Source
This commit is contained in:
henry
2021-11-04 15:15:11 +08:00
parent 288c74dc41
commit 153df336b8
18 changed files with 898 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/common/model/common.go
View File

@ -3,7 +3,6 @@ package model
import (
"ArmedPolice/config"
"ArmedPolice/utils"
"strings"
)
type Gender struct {
@ -60,21 +59,26 @@ type Area struct {
Address string `gorm:"column:address;type:varchar(255);default:null;comment:详细地址" json:"address"`
}
func (m *Area) FormatBasic() string {
address := make([]string, 0)
address = append(address, config.SettingAreaInfo[config.DefaultChinaAreaCode][m.Province])
if m.City != "" {
address = append(address, config.SettingAreaInfo[m.Province][m.City])
}
if m.District != "" {
address = append(address, config.SettingAreaInfo[m.City][m.District])
}
return strings.Join(address, "-")
type AreaInfo struct {
Province string `json:"province"`
City string `json:"city"`
District string `json:"district"`
Address string `json:"address"`
}
func (m *Area) FormatDetail() string {
return m.FormatBasic() + "；" + m.Address
func (m *Area) Format() *AreaInfo {
out := &AreaInfo{Address: m.Address}
if m.Province != "" {
out.Province = config.SettingAreaInfo[config.DefaultChinaAreaCode][m.Province]
}
if m.City != "" {
out.City = config.SettingAreaInfo[m.Province][m.City]
}
if m.District != "" {
out.District = config.SettingAreaInfo[m.City][m.District]
}
return out
}
// Position 坐标信息