ref: 多core表结构和代码调整修改

This commit is contained in:
TsMask
2025-06-10 17:50:54 +08:00
parent c7501a952d
commit cfe6ab61e3
189 changed files with 2159 additions and 3195 deletions

View File

@@ -98,8 +98,8 @@ func (s *NeLicenseController) Info(c *gin.Context) {
func (s *NeLicenseController) NeTypeAndID(c *gin.Context) {
language := reqctx.AcceptLanguage(c)
var querys struct {
NeType string `form:"neType" binding:"required"`
NeId string `form:"neId" binding:"required"`
CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
NeUID string `form:"neUid" binding:"required"` // 网元唯一标识
}
if err := c.ShouldBindQuery(&querys); err != nil {
errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -107,8 +107,8 @@ func (s *NeLicenseController) NeTypeAndID(c *gin.Context) {
return
}
neLicense := s.neLicenseService.FindByNeTypeAndNeID(querys.NeType, querys.NeId)
if neLicense.NeId != querys.NeId {
neLicense := s.neLicenseService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID)
if neLicense.CoreUID != querys.CoreUID || neLicense.NeUID != querys.NeUID {
// 没有可访问网元授权激活数据!
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData")))
return
@@ -134,8 +134,8 @@ func (s *NeLicenseController) NeTypeAndID(c *gin.Context) {
func (s *NeLicenseController) Code(c *gin.Context) {
language := reqctx.AcceptLanguage(c)
var querys struct {
NeType string `form:"neType" binding:"required"`
NeId string `form:"neId" binding:"required"`
CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
NeUID string `form:"neUid" binding:"required"` // 网元唯一标识
}
if err := c.ShouldBindQuery(&querys); err != nil {
errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -144,8 +144,8 @@ func (s *NeLicenseController) Code(c *gin.Context) {
}
// 检查是否存在授权记录
neLicense := s.neLicenseService.FindByNeTypeAndNeID(querys.NeType, querys.NeId)
if neLicense.NeId != querys.NeId {
neLicense := s.neLicenseService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID)
if neLicense.CoreUID != querys.CoreUID || neLicense.NeUID != querys.NeUID {
// 没有可访问网元授权激活数据!
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData")))
return
@@ -192,8 +192,8 @@ func (s *NeLicenseController) Change(c *gin.Context) {
}
// 检查是否存在授权记录
neLicense := s.neLicenseService.FindByNeTypeAndNeID(body.NeType, body.NeId)
if neLicense.NeId != body.NeId {
neLicense := s.neLicenseService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
if neLicense.CoreUID != body.CoreUID || neLicense.NeUID != body.NeUID {
// 没有可访问网元授权激活数据!
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData")))
return
@@ -237,8 +237,8 @@ func (s *NeLicenseController) Change(c *gin.Context) {
func (s *NeLicenseController) State(c *gin.Context) {
language := reqctx.AcceptLanguage(c)
var querys struct {
NeType string `form:"neType" binding:"required"`
NeId string `form:"neId" binding:"required"`
CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
NeUID string `form:"neUid" binding:"required"` // 网元唯一标识
}
if err := c.ShouldBindQuery(&querys); err != nil {
c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
@@ -246,16 +246,16 @@ func (s *NeLicenseController) State(c *gin.Context) {
}
// 检查是否存在授权记录
neLicense := s.neLicenseService.FindByNeTypeAndNeID(querys.NeType, querys.NeId)
if neLicense.NeId != querys.NeId {
neLicense := s.neLicenseService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID)
if neLicense.CoreUID != querys.CoreUID || neLicense.NeUID != querys.NeUID {
// 没有可访问网元授权激活数据!
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData")))
return
}
// 查询网元获取IP获取网元状态
neInfo := s.neInfoService.FindByNeTypeAndNeID(neLicense.NeType, neLicense.NeId)
if neInfo.NeId != neLicense.NeId || neInfo.IP == "" {
neInfo := s.neInfoService.FindByCoreUidAndNeUid(neLicense.CoreUID, neLicense.NeUID)
if neInfo.CoreUID != neLicense.CoreUID || neInfo.NeUID != neLicense.NeUID {
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
return
}