From 8d5cba8df2d231c6bbb970d8fa8c9e057be9c3db Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Fri, 25 Sep 2020 11:26:09 +0800 Subject: [PATCH 1/3] 'commit' --- .../Tools/SystemAccount/SystemAccount.go | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dsBaseRpc/Tools/SystemAccount/SystemAccount.go b/dsBaseRpc/Tools/SystemAccount/SystemAccount.go index 9ca0051d..97a8be66 100644 --- a/dsBaseRpc/Tools/SystemAccount/SystemAccount.go +++ b/dsBaseRpc/Tools/SystemAccount/SystemAccount.go @@ -22,6 +22,7 @@ var arrayTBaseOrganization = make([]models.TBaseOrganization, 0) var arrayTBaseTeacher = make([]models.TBaseTeacher, 0) var arrayTSysLoginperson = make([]models.TSysLoginperson, 0) var arrayTBaseRolePerson = make([]models.TBaseRolePerson, 0) +var arrayTBaseTeacherOrg = make([]models.TBaseTeacherOrg, 0) /** 功能：为指定身份的人员，批量生成账号 @@ -129,6 +130,19 @@ func AddVirtualManager(areaCode string, areaName string) { modelBaseRolePerson.RuleId = areaCode modelBaseRolePerson.BUse = -1 arrayTBaseRolePerson = append(arrayTBaseRolePerson, *modelBaseRolePerson) + //(4)、t_base_teacher_org + modelTeacherOrg := new(models.TBaseTeacherOrg) + modelTeacherOrg.SortId = 1 + modelTeacherOrg.PersonId = model.PersonId + modelTeacherOrg.BureauId = "-1" + modelTeacherOrg.OrgId = "-1" + modelTeacherOrg.CityCode = "-1" + modelTeacherOrg.ProvinceCode = "-1" + modelTeacherOrg.DistrictCode = "-1" + modelTeacherOrg.MainSchoolId = "-1" + modelTeacherOrg.IsMain = 1 + modelTeacherOrg.BUse = 1 + arrayTBaseTeacherOrg = append(arrayTBaseTeacherOrg, *modelTeacherOrg) } /** @@ -238,6 +252,23 @@ func AddSuperManager() { modelBaseRolePerson.RuleId = "100000" modelBaseRolePerson.BUse = 1 arrayTBaseRolePerson = append(arrayTBaseRolePerson, *modelBaseRolePerson) + + //(4)、人员所在的单位 + modelTeacherOrg := new(models.TBaseTeacherOrg) + modelTeacherOrg.SortId = 1 + modelTeacherOrg.PersonId = model.PersonId + modelTeacherOrg.BureauId = "-1" + modelTeacherOrg.OrgId = "-1" + modelTeacherOrg.CityCode = "-1" + modelTeacherOrg.ProvinceCode = "-1" + modelTeacherOrg.DistrictCode = "-1" + modelTeacherOrg.MainSchoolId = "-1" + modelTeacherOrg.IsMain = 1 + modelTeacherOrg.BUse = 1 + _, err := db.Insert(modelTeacherOrg) + if err != nil { + log.Fatalln(err.Error()) + } } func main() { @@ -302,6 +333,14 @@ func main() { log.Fatal(err.Error()) } + //删除人员与部门的关系 + sql = "truncate table t_base_teacher_org" + db.Exec(sql) + _, err = db.Exec(sql) + if err != nil { + log.Fatal(err.Error()) + } + //登录表 sql = "truncate table t_sys_loginperson" db.Exec(sql) @@ -493,6 +532,21 @@ func main() { t4 = t4[0:0] } } + + //批量插入5 + var t5 = make([]models.TBaseTeacherOrg, 0) + for i := range arrayTBaseTeacherOrg { + t5 = append(t5, arrayTBaseTeacherOrg[i]) + if (i > 0 && (i+1)%1000 == 0) || i == len(arrayTBaseTeacherOrg)-1 { + _, err = db.Insert(t5) + if err != nil { + log.Fatalln(err.Error()) + } + //清空数组 + t5 = t5[0:0] + } + } + //show variables like 'max_allowed_packet'; /** //1073741824 --->最大值，即1G From 05b738508172a81c925c8bc071dc3574f33ba958 Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Fri, 25 Sep 2020 11:28:42 +0800 Subject: [PATCH 2/3] 'commit' --- dsBaseRpc/Tools/SystemAccount/SystemAccount.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dsBaseRpc/Tools/SystemAccount/SystemAccount.go b/dsBaseRpc/Tools/SystemAccount/SystemAccount.go index 97a8be66..bdaaa28f 100644 --- a/dsBaseRpc/Tools/SystemAccount/SystemAccount.go +++ b/dsBaseRpc/Tools/SystemAccount/SystemAccount.go @@ -142,6 +142,7 @@ func AddVirtualManager(areaCode string, areaName string) { modelTeacherOrg.MainSchoolId = "-1" modelTeacherOrg.IsMain = 1 modelTeacherOrg.BUse = 1 + modelTeacherOrg.Id=CommonUtil.GetUUID() arrayTBaseTeacherOrg = append(arrayTBaseTeacherOrg, *modelTeacherOrg) } @@ -265,6 +266,7 @@ func AddSuperManager() { modelTeacherOrg.MainSchoolId = "-1" modelTeacherOrg.IsMain = 1 modelTeacherOrg.BUse = 1 + modelTeacherOrg.Id=CommonUtil.GetUUID() _, err := db.Insert(modelTeacherOrg) if err != nil { log.Fatalln(err.Error()) From d118fcabbe703ff97eb5af91b45114c58b4cf6de Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Fri, 25 Sep 2020 11:32:55 +0800 Subject: [PATCH 3/3] 'commit' --- dsBaseRpc/Tools/SystemAccount/SystemAccount.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dsBaseRpc/Tools/SystemAccount/SystemAccount.go b/dsBaseRpc/Tools/SystemAccount/SystemAccount.go index bdaaa28f..9ebb5e34 100644 --- a/dsBaseRpc/Tools/SystemAccount/SystemAccount.go +++ b/dsBaseRpc/Tools/SystemAccount/SystemAccount.go @@ -142,7 +142,7 @@ func AddVirtualManager(areaCode string, areaName string) { modelTeacherOrg.MainSchoolId = "-1" modelTeacherOrg.IsMain = 1 modelTeacherOrg.BUse = 1 - modelTeacherOrg.Id=CommonUtil.GetUUID() + modelTeacherOrg.Id = CommonUtil.GetUUID() arrayTBaseTeacherOrg = append(arrayTBaseTeacherOrg, *modelTeacherOrg) } @@ -198,6 +198,20 @@ func AddWardManager(orgId string, orgName string, areaCode string) { modelBaseRolePerson.RuleId = orgId modelBaseRolePerson.BUse = -1 arrayTBaseRolePerson = append(arrayTBaseRolePerson, *modelBaseRolePerson) + //(4)t_base_teacher_org + modelTeacherOrg := new(models.TBaseTeacherOrg) + modelTeacherOrg.SortId = 1 + modelTeacherOrg.PersonId = model.PersonId + modelTeacherOrg.BureauId = orgId + modelTeacherOrg.OrgId = orgId + modelTeacherOrg.ProvinceCode = areaCode[0:2] + "0000" + modelTeacherOrg.CityCode = areaCode[0:4] + "00" + modelTeacherOrg.DistrictCode = areaCode + modelTeacherOrg.MainSchoolId = "-1" + modelTeacherOrg.IsMain = 1 + modelTeacherOrg.BUse = 1 + modelTeacherOrg.Id = CommonUtil.GetUUID() + arrayTBaseTeacherOrg = append(arrayTBaseTeacherOrg, *modelTeacherOrg) } /** @@ -266,7 +280,7 @@ func AddSuperManager() { modelTeacherOrg.MainSchoolId = "-1" modelTeacherOrg.IsMain = 1 modelTeacherOrg.BUse = 1 - modelTeacherOrg.Id=CommonUtil.GetUUID() + modelTeacherOrg.Id = CommonUtil.GetUUID() _, err := db.Insert(modelTeacherOrg) if err != nil { log.Fatalln(err.Error())