优化用户信息接口和新增neId字段

features/udm_user/api_udm_user.go

@@ -1,11 +1,15 @@
 package udmuser
 
 import (
+	"fmt"
 	"net/http"
 
 	"ems.agt/features/udm_user/service"
+	mmlclient "ems.agt/lib/core/mml_client"
 	"ems.agt/lib/core/utils/ctx"
 	"ems.agt/lib/core/vo/result"
+	"ems.agt/lib/dborm"
+	"ems.agt/lib/log"
 	"ems.agt/lib/services"
 	"ems.agt/restagent/config"
 )
@@ -21,25 +25,37 @@ func Routers() []services.RouterItem {
 	rs := [...]services.RouterItem{
 		{
 			Method:     "GET",
-			Pattern:    "/authUserList",
+			Pattern:    "/auths",
 			Handler:    apis.UdmAuthUserList,
 			Middleware: nil, //midware.Authorize(nil),
 		},
 		{
 			Method:     "POST",
-			Pattern:    "/authUserSave",
+			Pattern:    "/auth/getSave",
 			Handler:    apis.UdmAuthUserSave,
 			Middleware: nil, //midware.Authorize(nil),
 		},
 		{
 			Method:     "GET",
-			Pattern:    "/subUserList",
+			Pattern:    "/auth/{neId}/{imsi}",
+			Handler:    apis.UdmAuthUserInfo,
+			Middleware: nil, //midware.Authorize(nil),
+		},
+		{
+			Method:     "POST",
+			Pattern:    "/auth",
+			Handler:    apis.UdmAuthUserAdd,
+			Middleware: nil, //midware.Authorize(nil),
+		},
+		{
+			Method:     "GET",
+			Pattern:    "/subs",
 			Handler:    apis.UdmSubUserList,
 			Middleware: nil, //midware.Authorize(nil),
 		},
 		{
 			Method:     "POST",
-			Pattern:    "/subUserSave",
+			Pattern:    "/sub/getSave",
 			Handler:    apis.UdmSubUserSave,
 			Middleware: nil, //midware.Authorize(nil),
 		},
@@ -60,6 +76,16 @@ func Routers() []services.RouterItem {
 	return rsPrefix
 }
 
+// NeInfoByUDM 网元信息
+func NeInfoByUDM(neId string) (*dborm.NeInfo, error) {
+	neInfo, err := dborm.XormGetNeInfo("UDM", neId)
+	if err != nil {
+		log.Error("dborm.XormGetNeInfo is failed:", err)
+		return nil, err
+	}
+	return neInfo, nil
+}
+
 // UDM 用户
 //
 // PATH /udmUserManage
@@ -70,7 +96,7 @@ type UdmUserApi struct {
 
 // UDM鉴权用户
 //
-// GET /authUserList
+// GET /auths
 func (s *UdmUserApi) UdmAuthUserList(w http.ResponseWriter, r *http.Request) {
 	querys := ctx.QueryMap(r)
 	data := s.authUser.AuthUserList(querys)
@@ -79,15 +105,51 @@ func (s *UdmUserApi) UdmAuthUserList(w http.ResponseWriter, r *http.Request) {
 
 // UDM鉴权用户-获取全部保存数据库
 //
-// POST /authUserSave
+// POST /auth/getSave
 func (s *UdmUserApi) UdmAuthUserSave(w http.ResponseWriter, r *http.Request) {
-	data := s.authUser.AuthUserSave()
+	data := s.authUser.AuthUserSave("")
+	ctx.JSON(w, 200, result.OkData(data))
+}
+
+// UDM鉴权用户-信息
+//
+// GET /{neId}/{imsi}
+func (s *UdmUserApi) UdmAuthUserInfo(w http.ResponseWriter, r *http.Request) {
+	neId := ctx.Param(r, "neId")
+	imsi := ctx.Param(r, "imsi")
+	if neId == "" || imsi == "" {
+		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		return
+	}
+
+	neInfo, err := NeInfoByUDM(neId)
+	if err != nil {
+		ctx.JSON(w, 200, result.ErrMsg(err.Error()))
+		return
+	}
+
+	msg := fmt.Sprintf("dsp authdat:imsi=%s", imsi)
+
+	// 发送MML
+	data, err := mmlclient.MMLSendMsgToMap(neInfo.Ip, msg)
+	if err != nil {
+		ctx.JSON(w, 200, result.ErrMsg(err.Error()))
+		return
+	}
+	ctx.JSON(w, 200, result.OkData(data))
+}
+
+// UDM鉴权用户-新增
+//
+// POST /auth
+func (s *UdmUserApi) UdmAuthUserAdd(w http.ResponseWriter, r *http.Request) {
+	data := s.authUser.AuthUserSave("")
 	ctx.JSON(w, 200, result.OkData(data))
 }
 
 // UDM签约用户
 //
-// GET /subUserList
+// GET /subs
 func (s *UdmUserApi) UdmSubUserList(w http.ResponseWriter, r *http.Request) {
 	querys := ctx.QueryMap(r)
 	data := s.subUser.SubUserList(querys)
@@ -96,8 +158,8 @@ func (s *UdmUserApi) UdmSubUserList(w http.ResponseWriter, r *http.Request) {
 
 // UDM签约用户-获取全部保存数据库
 //
-// POST /subUserSave
+// POST /sub/getSave
 func (s *UdmUserApi) UdmSubUserSave(w http.ResponseWriter, r *http.Request) {
-	data := s.subUser.SubUserSave()
+	data := s.subUser.SubUserSave("")
 	ctx.JSON(w, 200, result.OkData(data))
 }