Merge branch 'yb/4.0' into debug

controller/comment/comment.go

@@ -83,10 +83,6 @@ func HotList(c *gin.Context)  {
 			response.Fail("章节ID格式有误", c)
 			return
 		}
-		if reportId <= 0 {
-			response.Fail("请输入报告ID", c)
-			return
-		}
 	}
 
 	if reqOldReportId != ""{
@@ -103,10 +99,6 @@ func HotList(c *gin.Context)  {
 			response.Fail("章节ID格式有误", c)
 			return
 		}
-		if oldReportId <= 0 {
-			response.Fail("请输入报告ID", c)
-			return
-		}
 	}
 
 	userinfo := userService.GetInfoByClaims(c)

core/run_server.go

@@ -20,7 +20,7 @@ func RunServe() {
 	init_serve.NewEsClient()
 
 	//启动任务
-	init_serve.InitTask()
+	//init_serve.InitTask()
 	// 3.监听端口，默认在8080
 	// Run("里面不指定端口号默认为8080")
 	err := r.Run(fmt.Sprint("0.0.0.0:", global.CONFIG.Serve.Port)) // 监听并在 0.0.0.0:8080 上启动服务

services/comment/comment.go

@@ -44,7 +44,7 @@ func Comment(user user.UserInfo, req reqComment.ReqComment) (ret response.RespCo
 		err = errors.New("请输入报告ID")
 		return
 	}
-	if (req.ReportChapterId > 0 && req.ReportId <=0 ) || (req.OldReportChapterId > 0 && req.OldReportId <= 0){
+	if req.ReportId <=0 && req.OldReportId <= 0 {
 		err = errors.New("请输入报告ID")
 		return
 	}
@@ -168,13 +168,22 @@ func List(user user.UserInfo,  reportId, reportChapterId, oldReportId, oldReport
 		err = errors.New("请输入报告ID")
 		return
 	}
-
+	if reportId <=0 && oldReportId <= 0 {
+		err = errors.New("请输入报告ID")
+		return
+	}
 	//处理老报告, 转化成新报告ID
 	if  reportId <=0 && reportChapterId <=0 && (oldReportId >0 || oldReportChapterId > 0) {
 		reportId, reportChapterId, err, errMsg = services.GetReportIdReportChapterIdByOldReportId(uint64(oldReportId), uint64(oldReportChapterId))
 		if err != nil {
 			return
 		}
+	} else {
+		// 判断报告ID是否正确
+		err, errMsg = services.CheckReportExistByReportIdReportChapterId(reportId, reportChapterId)
+		if err != nil {
+			return
+		}
 	}
 	offset := (pageIndex -1)*pageSize
 	var commentList []*yb_comment.YbComment

services/report/report.go

@@ -23,7 +23,6 @@ import (
 	"hongze/hongze_yb/services/company"
 	elasticService "hongze/hongze_yb/services/elastic"
 	"hongze/hongze_yb/services/user"
-	"hongze/hongze_yb/task"
 	"hongze/hongze_yb/utils"
 	"html"
 	"sort"
@@ -343,7 +342,7 @@ func GetPurchaseDetail(permissionIds []int, userId uint64, classifyIdFirst int,
 	ret.Paging = response.GetPaging(pageIndex, pageSize, int(total))
 	// 执行一个协程任务，新增用户浏览记录
 	//_, tErr := BatchInsertReportView(weekReportIds, userId, classifyNameFirst, classifyIdSeconds)
-	task.Task(BatchInsertReportView, weekReportIds, userId, classifyNameFirst, classifyIdSeconds)
+	go BatchInsertReportView(userId, weekReportIds, classifyNameFirst, classifyIdSeconds)
 	/*if tErr != nil {
 		err = tErr
 		return
@@ -472,7 +471,7 @@ func GetReportDetail(userinfo user.UserInfo, reportId int) (reportDetail respons
 	var likeNum int64
 	var likeEnabled int8
 	if authOk {
-		task.Task(AddViewRecord, userinfo, reportInfo.Id, reportInfo.ClassifyNameFirst, 0)
+		go AddViewRecord(userinfo, reportInfo.Id, reportInfo.ClassifyNameFirst, 0)
 		reportItem.Content = html.UnescapeString(reportInfo.Content)
 		reportItem.VideoUrl = reportInfo.VideoUrl
 		//查询点赞数
@@ -480,7 +479,7 @@ func GetReportDetail(userinfo user.UserInfo, reportId int) (reportDetail respons
 	}
 
 	//新增用户访问日志
-	task.Task(AddUserAccessRecord, userinfo, reportInfo.Id, reportInfo.ClassifyNameFirst, 0, authOk)
+	go AddUserAccessRecord(userinfo, reportInfo.Id, reportInfo.ClassifyNameFirst, 0, authOk)
 	reportDetail.ReportInfo = reportItem
 	reportDetail.ReportChapterList = reportTypeList
 	reportDetail.PermissionCheck = &permissionCheckInfo

services/report/report_chapter.go

@@ -14,7 +14,6 @@ import (
 	"hongze/hongze_yb/services"
 	"hongze/hongze_yb/services/company"
 	"hongze/hongze_yb/services/user"
-	"hongze/hongze_yb/task"
 	"hongze/hongze_yb/utils"
 	"html"
 	"sort"
@@ -272,12 +271,12 @@ func GetChapterDetail(user user.UserInfo, reportChapterId int) (reportChapterDet
 		}
 		//查询点赞数
 		likeNum,likeEnabled, _ = services.GetReportLikeByReportIdOldReportId(user.UserID, reportInfo.Id, reportChapter.ReportChapterId,0,0)
-		task.Task(AddViewRecord, user, reportInfo.Id, reportInfo.ClassifyNameFirst, reportChapterId)
+		go AddViewRecord(user, reportInfo.Id, reportInfo.ClassifyNameFirst, reportChapterId)
 	}else{
 		reportChapterItem.ContentSub = html.UnescapeString(reportChapter.ContentSub)
 	}
 
-	task.Task(AddUserAccessRecord, user, reportInfo.Id, reportInfo.ClassifyNameFirst, reportChapterId, authOk)
+	go AddUserAccessRecord(user, reportInfo.Id, reportInfo.ClassifyNameFirst, reportChapterId, authOk)
 	reportChapterDetail = new(response.ReportChapterDetail)
 	reportChapterDetail.ReportChapterItem = reportChapterItem
 	reportChapterDetail.PermissionCheck = &permissionCheckInfo

services/report/report_view_log.go

@@ -52,19 +52,13 @@ func GetUnRead(classifyIdSeconds []int, userId uint64) (unReadItem map[string]in
 }
 
 // BatchInsertReportView 批量新增报告已读记录
-func BatchInsertReportView(params ...interface{}) {
+func BatchInsertReportView(userId uint64, weekReportIds []int, classifyNameFirst string, classifyIdSeconds []int) {
 	var err error
-	userId   := params[1].(uint64)
 	defer func() {
 		if err != nil {
 			global.LOG.Critical(fmt.Sprintf("Task BatchInsertReportView: userId=%d, err:%s, recover:%s", userId, err.Error(), recover()))
 		}
 	}()
-
-	weekReportIds := params[0]
-	classifyNameFirst := params[2]
-	classifyIdSeconds := params[3]
-
 	firstDay := "2022-01-01"
 	var newReports []*report.Report
 	pars := make([]interface{}, 0)

services/report/report_view_record.go

@@ -1,7 +1,6 @@
 package report
 
 import (
-	"errors"
 	"fmt"
 	companyCache "hongze/hongze_yb/cache/company"
 	"hongze/hongze_yb/global"
@@ -10,23 +9,13 @@ import (
 	"time"
 )
 
-func AddViewRecord(params ...interface{}) {
+func AddViewRecord(userInfo user.UserInfo, reportId int, classifyName string, reportChapterId int) {
 	var err error
-	userInter  := params[0]
-	userInfo, ok := (userInter).(user.UserInfo)
-	if !ok {
-		err = errors.New("格式换转失败")
-		return
-	}
 	defer func() {
 		if err != nil {
-			global.LOG.Critical(fmt.Sprintf("Task BatchInsertReportView: userId=%d, err:%s", userInfo.UserID, err.Error()))
+			global.LOG.Critical(fmt.Sprintf("BatchInsertReportView: userId=%d, err:%s", userInfo.UserID, err.Error()))
 		}
 	}()
-
-	reportId := params[1].(int)
-	classifyName := params[2]
-	reportChapterId := params[3].(int)
 	companyInfo, err := companyCache.GetByCompanyId(userInfo.CompanyID)
 	if err != nil {
 		return

services/report/user_access_record.go

@@ -1,7 +1,6 @@
 package report
 
 import (
-	"errors"
 	"fmt"
 	"hongze/hongze_yb/global"
 	"hongze/hongze_yb/models/tables/user_access_record"
@@ -10,24 +9,14 @@ import (
 )
 
 // AddUserAccessRecord 新增报告浏览记录
-func AddUserAccessRecord(params ...interface{}){
+func AddUserAccessRecord(userInfo user.UserInfo, reportId int, classifyName string, reportChapterId int, authOk bool){
 	var err error
-	userInter  := params[0]
-	userInfo, ok := (userInter).(user.UserInfo)
-	if !ok {
-		err = errors.New("格式换转失败")
-		return
-	}
 	defer func() {
 		if err != nil {
-			global.LOG.Critical(fmt.Sprintf("Task AddUserAccessRecord: userId=%d, err:%s", userInfo.UserID, err.Error()))
+			global.LOG.Critical(fmt.Sprintf("AddUserAccessRecord: userId=%d, err:%s", userInfo.UserID, err.Error()))
 		}
 	}()
-	reportId := params[1].(int)
 	if reportId > 0 {
-		classifyName := params[2]
-		reportChapterId := params[3].(int)
-		authOk := params[4].(bool)
 		record := new(user_access_record.UserAccessRecord)
 		record.Uid = int(userInfo.UserID)
 		record.Token = userInfo.LoginToken