From 0fc8189057a79beaf8a1595bc3fd451b6328ac72 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Tue, 22 Aug 2023 08:48:48 +0800 Subject: [PATCH] tijiao --- api/version1/administrativeorganization/govcont.go | 2 +- api/version1/personnelapi/staff.go | 2 +- main.go | 1 + middleware/snowflake/type.go | 6 +++--- overall/overallhandle/overall_handle.go | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/api/version1/administrativeorganization/govcont.go b/api/version1/administrativeorganization/govcont.go index 6f2103e..ffbdf2c 100644 --- a/api/version1/administrativeorganization/govcont.go +++ b/api/version1/administrativeorganization/govcont.go @@ -571,7 +571,7 @@ func (o *OrganizationApi) GovThreeAboutMan(c *gin.Context) { } synPro.Wait() // fmt.Printf("%v\n", len(allOrgAndPeople.OrgAndPeopleList)) - for oi, _ := range allOrgAndPeople.OrgAndPeopleList { + for oi := range allOrgAndPeople.OrgAndPeopleList { allOrgAndPeople.OrgAndPeopleList[oi].Identify = oi + 1 } diff --git a/api/version1/personnelapi/staff.go b/api/version1/personnelapi/staff.go index d1185f2..6897790 100644 --- a/api/version1/personnelapi/staff.go +++ b/api/version1/personnelapi/staff.go @@ -1779,7 +1779,7 @@ func (s *StaffApi) GetPeopleDataIntegrity(c *gin.Context) { scoreVal = scoreVal + 30 } else { scoreVal = scoreVal + (mainScore/12)*30 - fmt.Printf("main----121--->%v-------->%v\n", mainScore, (mainScore / 12)) + fmt.Printf("main----121--->%v-------->%v\n", mainScore, mainScore/12) } fmt.Printf("main----12--->%v-------->%v\n", mainScore, scoreVal) diff --git a/main.go b/main.go index fd3da61..d622096 100644 --- a/main.go +++ b/main.go @@ -17,4 +17,5 @@ func main() { //启动定时任务 scheduledtask.TimeTask() app.RunItem() + } diff --git a/middleware/snowflake/type.go b/middleware/snowflake/type.go index bafe50c..43f69f0 100644 --- a/middleware/snowflake/type.go +++ b/middleware/snowflake/type.go @@ -2,14 +2,14 @@ package snowflake import "sync" -//雪花算法 +// 雪花算法 const ( workerBits uint8 = 10 numberBits uint8 = 12 workerMax int64 = -1 ^ (-1 << workerBits) numberMax int64 = -1 ^ (-1 << numberBits) - timeShift uint8 = workerBits + numberBits - workerShift uint8 = numberBits + timeShift = workerBits + numberBits + workerShift = numberBits startTime int64 = 1655827200000 // 如果在程序跑了一段时间修改了epoch这个值 可能会导致生成相同的ID ) diff --git a/overall/overallhandle/overall_handle.go b/overall/overallhandle/overall_handle.go index d696d5c..ccc816b 100644 --- a/overall/overallhandle/overall_handle.go +++ b/overall/overallhandle/overall_handle.go @@ -220,7 +220,7 @@ func ChineseFirstWordCapitalize(wordStr string) (firstWord string) { @parentId 上级 */ func GetGovFirstWords(govName, abbreviation, govClass, parentId string) (firstWord string) { - var lev int = 0 + var lev = 0 overall.CONSTANT_DB_HR.Model(&models.AdministrativeOrganizationType{}).Select("`level`").Where("`id` = ?", govClass).First(&lev) if lev <= 2 { if abbreviation != "" { @@ -1282,7 +1282,7 @@ func DateToTimeStampOld(dataStr string) (timeStamp int64) { // 时间计算(年、季、月、周、日、时、分、秒) func ComputingTime(timeStamp int64, timeType int) (timeDataInt int64) { - var timeData string = "1" + var timeData = "1" switch timeType { case 1: timeData = time.Unix(timeStamp, 0).Format("2006") //年