|
@@ -148,41 +148,44 @@ func filterPermissionsByRisk(permissionList []permissionService.PermissionDTO, r
|
|
|
func SearchMaxMediaId(mediaType string, key string) (total int64, latestId int64) {
|
|
|
return mediaService.SearchMaxMediaId(mediaType, key)
|
|
|
}
|
|
|
-func GetMediaById(mediaType string, mediaId int, isLogin bool, userId int) (media mediaService.MediaDTO, err error) {
|
|
|
- media, err = mediaService.GetMediaById(mediaType, mediaId)
|
|
|
+func GetMediaById(mediaType string, mediaId int, isLogin bool, userId int) (media *mediaService.MediaDTO, err error) {
|
|
|
+ var mappingRiskLevel string
|
|
|
+ _, mappingRiskLevel, err = report.CheckUserRisk(nil, isLogin, userId)
|
|
|
+ *media, err = mediaService.GetMediaById(mediaType, mediaId)
|
|
|
if err != nil {
|
|
|
logger.Error("获取媒体失败:%v", err)
|
|
|
err = exception.New(exception.MediaFoundFailed)
|
|
|
return
|
|
|
}
|
|
|
- var status string
|
|
|
-
|
|
|
- status, media.RiskLevel, err = matchRiskLevel(userId, media)
|
|
|
- if err != nil {
|
|
|
- logger.Error("匹配风险等级失败:%v", err)
|
|
|
- err = exception.New(exception.ReportRiskLevelUnSet)
|
|
|
- return
|
|
|
- }
|
|
|
- idStr := strings.Split(media.PermissionIDs, ",")
|
|
|
- var ids []int
|
|
|
- ids, err = stringUtils.StringToIntSlice(idStr)
|
|
|
- if err != nil {
|
|
|
- logger.Error("品种名称列表转换失败:%v", err)
|
|
|
- return
|
|
|
- }
|
|
|
- media.PermissionNames = GetMediaPermissionNames(ids)
|
|
|
- if isLogin {
|
|
|
- media.Login = true
|
|
|
- if status != RiskLevelMatch {
|
|
|
- media.Src = ""
|
|
|
- }
|
|
|
- media.RiskLevelStatus = status
|
|
|
- } else {
|
|
|
- logger.Info("当前用户未登录,展示部分详情")
|
|
|
- media.Src = ""
|
|
|
- media.RiskLevelStatus = RiskLevelUnMatch
|
|
|
- media.Login = false
|
|
|
- }
|
|
|
+ return DealMediaInfo(media, isLogin, userId, mappingRiskLevel)
|
|
|
+ //var status string
|
|
|
+ //
|
|
|
+ //status, media.RiskLevel, err = matchRiskLevel(userId, media)
|
|
|
+ //if err != nil {
|
|
|
+ // logger.Error("匹配风险等级失败:%v", err)
|
|
|
+ // err = exception.New(exception.ReportRiskLevelUnSet)
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ //idStr := strings.Split(media.PermissionIDs, ",")
|
|
|
+ //var ids []int
|
|
|
+ //ids, err = stringUtils.StringToIntSlice(idStr)
|
|
|
+ //if err != nil {
|
|
|
+ // logger.Error("品种名称列表转换失败:%v", err)
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ //media.PermissionNames = GetMediaPermissionNames(ids)
|
|
|
+ //if isLogin {
|
|
|
+ // media.Login = true
|
|
|
+ // if status != RiskLevelMatch {
|
|
|
+ // media.Src = ""
|
|
|
+ // }
|
|
|
+ // media.RiskLevelStatus = status
|
|
|
+ //} else {
|
|
|
+ // logger.Info("当前用户未登录,展示部分详情")
|
|
|
+ // media.Src = ""
|
|
|
+ // media.RiskLevelStatus = RiskLevelUnMatch
|
|
|
+ // media.Login = false
|
|
|
+ //}
|
|
|
|
|
|
return
|
|
|
}
|