ref: 网元授权激活授权code/change/state接口优化

src/modules/network_element/controller/ne_license.go

@@ -37,6 +37,14 @@ func (s *NeLicenseController) List(c *gin.Context) {
 	querys := ctx.QueryMap(c)
 	data := s.neLicenseService.SelectPage(querys)
 
+	// 过滤屏蔽授权文件
+	rows := data["rows"].([]model.NeLicense)
+	arr := &rows
+	for i := range *arr {
+		(*arr)[i].ActivationRequestCode = "-"
+		(*arr)[i].LicensePath = "-"
+	}
+
 	c.JSON(200, result.Ok(data))
 }
 
@@ -73,24 +81,17 @@ func (s *NeLicenseController) Add(c *gin.Context) {
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(body.NeType, body.NeId)
-	if neInfo.NeId != body.NeId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-
 	// 检查属性值唯一
-	uniqueInfo := s.neLicenseService.CheckUniqueTypeAndID(neInfo.NeType, neInfo.NeId, "")
+	uniqueInfo := s.neLicenseService.CheckUniqueTypeAndID(body.NeType, body.NeId, "")
 	if !uniqueInfo {
 		// 网元授权激活操作【%s】失败，网元类型信息已存在
-		msg := i18n.TTemplate(language, "neLicense.errKeyExists", map[string]any{"name": neInfo.NeType})
+		msg := i18n.TTemplate(language, "neLicense.errKeyExists", map[string]any{"name": body.NeType})
 		c.JSON(200, result.ErrMsg(msg))
 		return
 	}
 
 	// 读取授权码
-	code, _ := s.neLicenseService.ReadLicenseInfo(neInfo)
+	code, _ := s.neLicenseService.ReadLicenseInfo(body)
 	body.ActivationRequestCode = code
 
 	body.CreateBy = ctx.LoginUserToUserName(c)
@@ -180,15 +181,8 @@ func (s *NeLicenseController) Code(c *gin.Context) {
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeId)
-	if neInfo.NeId != querys.NeId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-
 	// 检查是否存在授权记录
-	neLicense := s.neLicenseService.SelectByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+	neLicense := s.neLicenseService.SelectByNeTypeAndNeID(querys.NeType, querys.NeId)
 	if neLicense.NeId != querys.NeId {
 		// 没有可访问网元授权激活数据！
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neLicense.noData")))
@@ -196,7 +190,7 @@ func (s *NeLicenseController) Code(c *gin.Context) {
 	}
 
 	// 更新授权码
-	code, licensePath := s.neLicenseService.ReadLicenseInfo(neInfo)
+	code, licensePath := s.neLicenseService.ReadLicenseInfo(neLicense)
 	neLicense.ActivationRequestCode = code
 	if licensePath != "" {
 		neLicense.LicensePath = licensePath
@@ -218,7 +212,7 @@ func (s *NeLicenseController) Change(c *gin.Context) {
 	language := ctx.AcceptLanguage(c)
 	var body model.NeLicense
 	err := c.ShouldBindBodyWith(&body, binding.JSON)
-	if err != nil || body.HostId == "" {
+	if err != nil || body.LicensePath == "" {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
@@ -226,23 +220,30 @@ func (s *NeLicenseController) Change(c *gin.Context) {
 	// 检查是否存在授权记录
 	neLicense := s.neLicenseService.SelectByNeTypeAndNeID(body.NeType, body.NeId)
 	if neLicense.NeId != body.NeId {
-		body.Status = "0"
-		body.CreateBy = ctx.LoginUserToUserName(c)
-		body.ID = s.neLicenseService.Insert(body)
-	} else {
-		neLicense.LicensePath = body.LicensePath
-		neLicense.Status = "0"
-		neLicense.UpdateBy = ctx.LoginUserToUserName(c)
-		s.neLicenseService.Update(neLicense)
-	}
-
-	// 进行上传替换
-	err = s.neLicenseService.UploadToNeHost(body)
-	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		// 没有可访问网元授权激活数据！
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neLicense.noData")))
 		return
 	}
-	c.JSON(200, result.Ok(nil))
+
+	// 更新授权记录
+	if body.Remark != "" {
+		neLicense.Remark = body.Remark
+	}
+	neLicense.LicensePath = body.LicensePath
+	neLicense.Status = "0"
+	neLicense.UpdateBy = ctx.LoginUserToUserName(c)
+	upRows := s.neLicenseService.Update(neLicense)
+	if upRows > 0 {
+		// 进行上传替换
+		err = s.neLicenseService.UploadLicense(body)
+		if err != nil {
+			c.JSON(200, result.ErrMsg(err.Error()))
+			return
+		}
+		c.JSON(200, result.Ok(nil))
+		return
+	}
+	c.JSON(200, result.Err(nil))
 }
 
 // 网元授权激活状态
@@ -259,35 +260,31 @@ func (s *NeLicenseController) State(c *gin.Context) {
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeId)
-	if neInfo.NeId != querys.NeId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-
 	// 检查是否存在授权记录
-	neLicense := s.neLicenseService.SelectByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+	neLicense := s.neLicenseService.SelectByNeTypeAndNeID(querys.NeType, querys.NeId)
 	if neLicense.NeId != querys.NeId {
 		// 没有可访问网元授权激活数据！
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neLicense.noData")))
 		return
 	}
 
-	// 查询网元状态
-	neState, err := neService.NeState(neInfo)
-	if err != nil {
-		c.JSON(200, result.ErrMsg("network element service anomaly"))
+	// 查询网元获取IP获取网元状态
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(neLicense.NeType, neLicense.NeId)
+	if neInfo.NeId != neLicense.NeId || neInfo.IP == "" {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
+	neLicense.Status = "0"
+	if neState, err := neService.NeState(neInfo); err == nil {
+		neLicense.SerialNum = fmt.Sprint(neState["sn"])
+		neLicense.ExpiryDate = fmt.Sprint(neState["expire"])
+		neLicense.Status = "1"
+	}
 
 	// 更新授权信息
-	neLicense.SerialNum = fmt.Sprint(neState["sn"])
-	neLicense.ExpiryDate = fmt.Sprint(neState["expire"])
-	code, licensePath := s.neLicenseService.ReadLicenseInfo(neInfo)
+	code, licensePath := s.neLicenseService.ReadLicenseInfo(neLicense)
 	neLicense.ActivationRequestCode = code
 	neLicense.LicensePath = licensePath
-	neLicense.Status = "1"
 	neLicense.UpdateBy = ctx.LoginUserToUserName(c)
 	rows := s.neLicenseService.Update(neLicense)
 	if rows > 0 {