价格驱动详情

controller/price_driven/price_driven.go

@@ -5,7 +5,6 @@ import (
 	"hongze/hongze_yb/controller/response"
 	"hongze/hongze_yb/models/request"
 	"hongze/hongze_yb/services/price_driven"
-	"hongze/hongze_yb/services/user"
 )
 
 // PriceDrivenDetail 价格驱动详情
@@ -15,7 +14,7 @@ import (
 // @Success 200 {object} response.PriceDrivenItem
 // @failure 400 {string} string "获取失败"
 // @Router /price_driven/detail [get]
-func PriceDrivenDetail(c *gin.Context)  {
+func PriceDrivenDetail(c *gin.Context) {
 	var req request.PriceDrivenDetailReq
 	if err := c.Bind(&req); err != nil {
 		response.Fail("参数有误", c)
@@ -25,11 +24,10 @@ func PriceDrivenDetail(c *gin.Context)  {
 		response.Fail("参数有误", c)
 		return
 	}
-	userInfo := user.GetInfoByClaims(c)
-	item, errMsg, err := price_driven.GetPriceDrivenDetail(req.ChartPermissionId, userInfo)
+	item, errMsg, err := price_driven.GetPriceDrivenDetail(req.ChartPermissionId)
 	if err != nil {
 		response.FailMsg(errMsg, "GetPriceDrivenDetail ErrMsg:"+err.Error(), c)
 		return
 	}
 	response.OkData("获取成功", item, c)
-}
+}

models/response/price_driven.go

@@ -2,14 +2,12 @@ package response
 
 // PriceDrivenItem 价格驱动详情
 type PriceDrivenItem struct {
-	PriceDrivenID       int                 `json:"price_driven_id" description:"价格驱动ID"`
-	ChartPermissionID   int                 `json:"chart_permission_id" description:"品种ID"`
-	MainVariable        string              `json:"main_variable" description:"关键变量"`
-	CoreDrivenType      int                 `json:"core_driven_type" description:"核心驱动类型 0-多 1-空"`
-	CoreDrivenContent   string              `json:"core_driven_content" description:"核心驱动内容"`
-	CoreContent         string              `json:"core_content" description:"核心内容"`
-	CreateTime          string              `json:"create_time" description:"创建时间"`
-	ModifyTime          string              `json:"modify_time" description:"更新时间"`
-	AuthOk              bool                `json:"auth_ok" description:"是否有权限"`
-	PermissionCheckInfo PermissionCheckInfo `json:"permission_check_info" description:"权限信息详情"`
+	PriceDrivenID     int    `json:"price_driven_id" description:"价格驱动ID"`
+	ChartPermissionID int    `json:"chart_permission_id" description:"品种ID"`
+	MainVariable      string `json:"main_variable" description:"关键变量"`
+	CoreDrivenType    int    `json:"core_driven_type" description:"核心驱动类型 0-多 1-空"`
+	CoreDrivenContent string `json:"core_driven_content" description:"核心驱动内容"`
+	CoreContent       string `json:"core_content" description:"核心内容"`
+	CreateTime        string `json:"create_time" description:"创建时间"`
+	ModifyTime        string `json:"modify_time" description:"更新时间"`
 }

routers/price_driven.go

@@ -7,6 +7,6 @@ import (
 )
 
 func InitPriceDriven(r *gin.Engine)  {
-	rGroup := r.Group("api/price_driven").Use(middleware.Token())
+	rGroup := r.Group("api/price_driven").Use(middleware.Token(), middleware.CheckBaseAuth())
 	rGroup.GET("/detail", price_driven.PriceDrivenDetail)
 }

services/price_driven/price_driven.go

@@ -4,13 +4,11 @@ import (
 	"errors"
 	"hongze/hongze_yb/models/response"
 	"hongze/hongze_yb/models/tables/yb_price_driven"
-	"hongze/hongze_yb/services/company"
-	"hongze/hongze_yb/services/user"
 	"hongze/hongze_yb/utils"
 )
 
 // GetPriceDrivenDetail 获取价格驱动详情
-func GetPriceDrivenDetail(chartPermissionId int, userInfo user.UserInfo) (resp *response.PriceDrivenItem, errMsg string, err error) {
+func GetPriceDrivenDetail(chartPermissionId int) (resp *response.PriceDrivenItem, errMsg string, err error) {
 	resp = new(response.PriceDrivenItem)
 	// 获取详情
 	item, e := yb_price_driven.GetPriceDrivenByChartPermissionId(chartPermissionId)
@@ -29,23 +27,5 @@ func GetPriceDrivenDetail(chartPermissionId int, userInfo user.UserInfo) (resp *
 		resp.CreateTime = item.CreateTime.Format(utils.FormatDateTime)
 		resp.ModifyTime = item.ModifyTime.Format(utils.FormatDateTime)
 	}
-	// 校验权限
-	ok, permissionInfo, permissionIdArr, e := company.CheckBaseFiccPermission(userInfo.CompanyID, int(userInfo.UserID))
-	if e != nil {
-		errMsg = "获取失败"
-		err = errors.New("校验价格驱动详情权限失败, Err:" + e.Error())
-		return
-	}
-	authOk := false
-	// 用户状态正常时校验是否有对应的品种权限, 不正常则默认无权限
-	if ok {
-		for _, v := range permissionIdArr {
-			if chartPermissionId == v {
-				authOk = true
-			}
-		}
-	}
-	resp.AuthOk = authOk
-	resp.PermissionCheckInfo = permissionInfo
 	return
 }