From 546c6f165bf0732de63c4d26b82f77c233280074 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 8 Nov 2023 15:01:57 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E8=BF=94=E5=9B=9E-featues=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- features/sys_config/service/service_sys_config.go | 6 +++--- .../sys_dict_data/service/service_sys_dict_data.go | 4 ++-- .../sys_dict_type/service/service_sys_dict_type.go | 6 +++--- features/sys_role/service/service_sys_role.go | 8 ++++---- features/sys_user/service/service_sys_user.go | 4 ++-- features/udm_user/api_udm_user.go | 10 ++++++---- features/udm_user/repo/repo_udm_auth_user.go | 1 + features/udm_user/repo/repo_udm_sub_user.go | 8 ++++++++ features/udm_user/service/service_udm_auth_user.go | 6 +++--- features/udm_user/service/service_udm_sub_user.go | 11 +++++++++++ 10 files changed, 43 insertions(+), 21 deletions(-) diff --git a/features/sys_config/service/service_sys_config.go b/features/sys_config/service/service_sys_config.go index ed0bf3c7..2e39ba13 100644 --- a/features/sys_config/service/service_sys_config.go +++ b/features/sys_config/service/service_sys_config.go @@ -92,12 +92,12 @@ func (r *ServiceSysConfig) DeleteConfigByIds(configIds []string) (int64, error) // 检查是否存在 configs := r.sysConfigRepository.SelectConfigByIds(configIds) if len(configs) <= 0 { - return 0, errors.New("没有权限访问参数配置数据！") + return 0, errors.New("does not have permission to access parameter configuration data") } for _, config := range configs { // 检查是否为内置参数 if config.ConfigType == "Y" { - return 0, errors.New(config.ConfigID + " 配置参数属于内置参数，禁止删除！") + return 0, errors.New(config.ConfigID + " Configuration parameters are built-in parameters and their deletion is prohibited!") } // 清除缓存 r.clearConfigCache(config.ConfigKey) @@ -106,7 +106,7 @@ func (r *ServiceSysConfig) DeleteConfigByIds(configIds []string) (int64, error) rows := r.sysConfigRepository.DeleteConfigByIds(configIds) return rows, nil } - return 0, errors.New("删除参数配置信息失败！") + return 0, errors.New("failed to delete parameter configuration information") } // ResetConfigCache 重置参数缓存数据 diff --git a/features/sys_dict_data/service/service_sys_dict_data.go b/features/sys_dict_data/service/service_sys_dict_data.go index 624105e2..1dba4e9d 100644 --- a/features/sys_dict_data/service/service_sys_dict_data.go +++ b/features/sys_dict_data/service/service_sys_dict_data.go @@ -78,7 +78,7 @@ func (r *ServiceSysDictData) DeleteDictDataByCodes(dictCodes []string) (int64, e // 检查是否存在 dictDatas := r.sysDictDataRepository.SelectDictDataByCodes(dictCodes) if len(dictDatas) <= 0 { - return 0, errors.New("没有权限访问字典编码数据！") + return 0, errors.New("does not have permission to access dictionary-encoded data") } if len(dictDatas) == len(dictCodes) { for _, v := range dictDatas { @@ -89,7 +89,7 @@ func (r *ServiceSysDictData) DeleteDictDataByCodes(dictCodes []string) (int64, e rows := r.sysDictDataRepository.DeleteDictDataByCodes(dictCodes) return rows, nil } - return 0, errors.New("删除字典数据信息失败！") + return 0, errors.New("failed to delete dictionary data information") } // InsertDictData 新增字典数据信息 diff --git a/features/sys_dict_type/service/service_sys_dict_type.go b/features/sys_dict_type/service/service_sys_dict_type.go index 8cbb16b9..400aabac 100644 --- a/features/sys_dict_type/service/service_sys_dict_type.go +++ b/features/sys_dict_type/service/service_sys_dict_type.go @@ -108,13 +108,13 @@ func (r *ServiceSysDictType) DeleteDictTypeByIDs(dictIDs []string) (int64, error // 检查是否存在 dictTypes := r.sysDictTypeRepository.SelectDictTypeByIDs(dictIDs) if len(dictTypes) <= 0 { - return 0, errors.New("没有权限访问字典类型数据！") + return 0, errors.New("no permission to access dictionary type data") } for _, v := range dictTypes { // 字典类型下级含有数据 useCount := r.sysDictDataRepository.CountDictDataByType(v.DictType) if useCount > 0 { - msg := fmt.Sprintf("【%s】存在字典数据,不能删除", v.DictName) + msg := fmt.Sprintf("[%s] Dictionary data exists and cannot be deleted. ", v.DictName) return 0, errors.New(msg) } // 清除缓存 @@ -124,7 +124,7 @@ func (r *ServiceSysDictType) DeleteDictTypeByIDs(dictIDs []string) (int64, error rows := r.sysDictTypeRepository.DeleteDictTypeByIDs(dictIDs) return rows, nil } - return 0, errors.New("删除字典数据信息失败！") + return 0, errors.New("failed to delete dictionary data information") } // ResetDictCache 重置字典缓存数据 diff --git a/features/sys_role/service/service_sys_role.go b/features/sys_role/service/service_sys_role.go index 187d0c04..b5a8d1f0 100644 --- a/features/sys_role/service/service_sys_role.go +++ b/features/sys_role/service/service_sys_role.go @@ -97,17 +97,17 @@ func (r *ServiceSysRole) DeleteRoleByIds(roleIds []string) (int64, error) { // 检查是否存在 roles := r.sysRoleRepository.SelectRoleByIds(roleIds) if len(roles) <= 0 { - return 0, errors.New("没有权限访问角色数据！") + return 0, errors.New("no permission to access role data") } for _, role := range roles { // 检查是否为已删除 if role.DelFlag == "1" { - return 0, errors.New(role.RoleID + " 角色信息已经删除！") + return 0, errors.New(role.RoleID + " The character information has been deleted") } // 检查分配用户 userCount := r.sysUserRoleRepository.CountUserRoleByRoleId(role.RoleID) if userCount > 0 { - msg := fmt.Sprintf("【%s】已分配给用户,不能删除", role.RoleName) + msg := fmt.Sprintf("[%s] has been assigned to a user and cannot be deleted", role.RoleName) return 0, errors.New(msg) } } @@ -117,7 +117,7 @@ func (r *ServiceSysRole) DeleteRoleByIds(roleIds []string) (int64, error) { rows := r.sysRoleRepository.DeleteRoleByIds(roleIds) return rows, nil } - return 0, errors.New("删除角色信息失败！") + return 0, errors.New("failed to delete role information") } // CheckUniqueRoleName 校验角色名称是否唯一 diff --git a/features/sys_user/service/service_sys_user.go b/features/sys_user/service/service_sys_user.go index 0401d304..d1284902 100644 --- a/features/sys_user/service/service_sys_user.go +++ b/features/sys_user/service/service_sys_user.go @@ -103,7 +103,7 @@ func (r *ServiceSysUser) DeleteUserByIds(userIds []string) (int64, error) { // 检查是否存在 users := r.sysUserRepository.SelectUserByIds(userIds) if len(users) <= 0 { - return 0, errors.New("没有权限访问用户数据！") + return 0, errors.New("no permission to access user data") } if len(users) == len(userIds) { // 删除用户与角色关联 @@ -113,7 +113,7 @@ func (r *ServiceSysUser) DeleteUserByIds(userIds []string) (int64, error) { rows := r.sysUserRepository.DeleteUserByIds(userIds) return rows, nil } - return 0, errors.New("删除用户信息失败！") + return 0, errors.New("failed to delete user information") } // CheckUniqueUserName 校验用户名称是否唯一 diff --git a/features/udm_user/api_udm_user.go b/features/udm_user/api_udm_user.go index bb378569..28c007e2 100644 --- a/features/udm_user/api_udm_user.go +++ b/features/udm_user/api_udm_user.go @@ -511,9 +511,9 @@ func (s *UdmUserApi) UdmAuthUserExport(w http.ResponseWriter, r *http.Request) { if body.Type == "csv" { // 转换数据 data := [][]string{} - data = append(data, []string{"imsi", "ki", "amf", "algo", "opc"}) + data = append(data, []string{"imsi", "ki", "algo", "amf", "opc"}) for _, v := range list { - data = append(data, []string{v.Imsi, v.Ki, v.Amf, v.AlgoIndex, v.Opc}) + data = append(data, []string{v.Imsi, v.Ki, v.AlgoIndex, v.Amf, v.Opc}) } // 输出到文件 err := file.WriterCSVFile(data, filePath) @@ -527,7 +527,7 @@ func (s *UdmUserApi) UdmAuthUserExport(w http.ResponseWriter, r *http.Request) { // 转换数据 data := [][]string{} for _, v := range list { - data = append(data, []string{v.Imsi, v.Ki, v.Amf, v.AlgoIndex, v.Opc}) + data = append(data, []string{v.Imsi, v.Ki, v.AlgoIndex, v.Amf, v.Opc}) } // 输出到文件 err = file.WriterTxtFile(data, filePath) @@ -1168,7 +1168,9 @@ func (s *UdmUserApi) UdmSubUserImport(w http.ResponseWriter, r *http.Request) { ctx.JSON(w, 200, result.ErrMsg(err.Error())) return } - + data2 := file.ReadCSVFile(localPath) + neId = "" + go s.subUser.InsertCSV(neId, data2) // 复制到远程 err = ssh.FileSCPLocalToNe(neInfo.Ip, localPath, nePath) if err != nil { diff --git a/features/udm_user/repo/repo_udm_auth_user.go b/features/udm_user/repo/repo_udm_auth_user.go index 23c458ad..8ad73ee1 100644 --- a/features/udm_user/repo/repo_udm_auth_user.go +++ b/features/udm_user/repo/repo_udm_auth_user.go @@ -210,6 +210,7 @@ func (r *RepoUdmAuthUser) Inserts(authUsers []model.UdmAuthUser) int64 { // 调用 InsertMulti 函数将批量数据插入数据库 results, err := datasource.DefaultDB().Table("u_auth_user").InsertMulti(batch) if err != nil { + log.Errorf("Insert err => %v", err) continue } num += results diff --git a/features/udm_user/repo/repo_udm_sub_user.go b/features/udm_user/repo/repo_udm_sub_user.go index 72a7b1f3..295d96a9 100644 --- a/features/udm_user/repo/repo_udm_sub_user.go +++ b/features/udm_user/repo/repo_udm_sub_user.go @@ -220,6 +220,7 @@ func (r *RepoUdmSubUser) ClearAndInsert(neID string, subArr []model.UdmSubUser) func (r *RepoUdmSubUser) Insert(subUser model.UdmSubUser) int64 { results, err := datasource.DefaultDB().Table("u_sub_user").Insert(subUser) if err != nil { + log.Errorf("Insert err => %v", err) return results } return results @@ -240,6 +241,7 @@ func (r *RepoUdmSubUser) Inserts(subUser []model.UdmSubUser) int64 { // 调用 InsertMulti 函数将批量数据插入数据库 results, err := datasource.DefaultDB().Table("u_sub_user").InsertMulti(batch) if err != nil { + log.Errorf("Insert err => %v", err) continue } num += results @@ -266,6 +268,7 @@ func (r *RepoUdmSubUser) Insert4G(neID string, subUser model.UdmSubUser) int64 { results, err := datasource.DefaultDB().Table("u_sub_user").Insert(subUser) if err == nil { + log.Errorf("Insert err => %v", err) insertNum += results } } @@ -336,6 +339,7 @@ func (r *RepoUdmSubUser) Update(neID string, authUser model.UdmSubUser) int64 { results, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", user.Imsi, user.NeID).Update(user) if err != nil { + log.Errorf("Update err => %v", err) return 0 } return results @@ -373,6 +377,7 @@ func (r *RepoUdmSubUser) Update4GIP(neID string, subUser model.UdmSubUser) int64 // 更新 results, err := datasource.DefaultDB().Table("u_sub_user").Update(user) if err == nil { + log.Errorf("Update err => %v", err) insertNum += results } } @@ -406,6 +411,7 @@ func (r *RepoUdmSubUser) UpdateSmData(neID string, subUser model.UdmSubUser) int // 更新 results, err := datasource.DefaultDB().Table("u_sub_user").Update(user) if err == nil { + log.Errorf("Update err => %v", err) insertNum += results } } @@ -417,6 +423,7 @@ func (r *RepoUdmSubUser) UpdateSmData(neID string, subUser model.UdmSubUser) int func (r *RepoUdmSubUser) Delete(neID, imsi string) int64 { results, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", imsi, neID).Delete() if err != nil { + log.Errorf("Delete err => %v", err) return results } return results @@ -436,6 +443,7 @@ func (r *RepoUdmSubUser) Deletes(neID, imsi, num string) int64 { results, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi >= ? and imsi < ? and ne_id = ?", imsiV, imsiV+numV, neID).Delete() if err != nil { + log.Errorf("Delete err => %v", err) return results } return results diff --git a/features/udm_user/service/service_udm_auth_user.go b/features/udm_user/service/service_udm_auth_user.go index 4fa4b56d..77bfa08b 100644 --- a/features/udm_user/service/service_udm_auth_user.go +++ b/features/udm_user/service/service_udm_auth_user.go @@ -90,12 +90,12 @@ func (r *ServiceUdmAuthUser) InsertCSV(neID string, data []map[string]string) in if s, ok := v["ki"]; ok { authUser.Ki = s } - if s, ok := v["amf"]; ok { - authUser.Amf = s - } if s, ok := v["algo"]; ok { authUser.AlgoIndex = s } + if s, ok := v["amf"]; ok { + authUser.Amf = s + } if s, ok := v["opc"]; ok { authUser.Opc = s } diff --git a/features/udm_user/service/service_udm_sub_user.go b/features/udm_user/service/service_udm_sub_user.go index 9145c055..f1c54abb 100644 --- a/features/udm_user/service/service_udm_sub_user.go +++ b/features/udm_user/service/service_udm_sub_user.go @@ -137,6 +137,17 @@ func (r *ServiceUdmSubUser) InsertCSV(neID string, data []map[string]string) int } if s, ok := v["eps_dat"]; ok { subUser.EpsDat = s + arr := strings.Split(s, ",") + if len(arr) == 9 { + subUser.EpsFlag = arr[0] + subUser.EpsOdb = arr[1] + subUser.HplmnOdb = arr[2] + subUser.Ard = arr[3] + subUser.Epstpl = arr[4] + subUser.ContextId = arr[5] + subUser.ApnContext = arr[7] + subUser.StaticIp = arr[8] + } } arr = append(arr, subUser) }