Merge branch 'master' of http://10.10.14.250:3000/huanghai/dsMin

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,20 @@ 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
+	modelTeacherOrg.Id = CommonUtil.GetUUID()
+	arrayTBaseTeacherOrg = append(arrayTBaseTeacherOrg, *modelTeacherOrg)
 }
 
 /**
@@ -183,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)
 }
 
 /**
@@ -238,6 +267,24 @@ 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
+	modelTeacherOrg.Id = CommonUtil.GetUUID()
+	_, err := db.Insert(modelTeacherOrg)
+	if err != nil {
+		log.Fatalln(err.Error())
+	}
 }
 
 func main() {
@@ -302,6 +349,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 +548,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