ソースを参照

wip:离线逻辑

wangshan 6 ヶ月 前
コミット
896b595a99

+ 1 - 1
src/jfw/modules/bigmember/src/go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.28.8
+	app.yhyue.com/moapp/jypkg v1.29.1
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20241213060113-ac41966a58ec
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18
 	github.com/donnie4w/go-logger v0.0.0-20230316073421-36a48f87a69a

+ 2 - 2
src/jfw/modules/bigmember/src/go.sum

@@ -20,8 +20,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66/go.mod h1:XHNATN6t
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v1.28.8 h1:KpfNZraD3GuSYXfz3YqsvgQ+XMy1yr5/P1osoDfeBsA=
-app.yhyue.com/moapp/jypkg v1.28.8/go.mod h1:7f9hBxeF9RTp6vhTMZ24k4VLsn7HJHyAXOx6qzA3xOw=
+app.yhyue.com/moapp/jypkg v1.29.1 h1:NuTFVNS7SO6PJjmCSVIAVR+1oUTI7+phJX+qiBxLbkk=
+app.yhyue.com/moapp/jypkg v1.29.1/go.mod h1:7f9hBxeF9RTp6vhTMZ24k4VLsn7HJHyAXOx6qzA3xOw=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=

+ 10 - 2
src/jfw/modules/bigmember/src/service/report/marketAnalysis.go

@@ -268,7 +268,14 @@ func (this *MarketAnalysis) DoAnalysis() {
 		var status int
 		var msgOpen bool
 		// 判断是否为离线生成报告
-		offline := mae.IsOffline()
+		mae.IsOffline()
+		if mae.Offline < 0 {
+			return map[string]interface{}{
+				"msg":    "当前请求分析数量过大,请修改条件后再试",
+				"status": -1,
+			}, nil
+		}
+		offline := mae.Offline == 1
 		if offline {
 			// 查询消息开关
 			status = AnalysisStatusOffline
@@ -399,7 +406,8 @@ func (this *MarketAnalysis) IsOffline() {
 		var status int
 		var msgOpen bool
 		// 判断是实时的还是离线的
-		offline := mae.IsOffline()
+		mae.IsOffline()
+		offline := mae.Offline == 1
 		if err != nil {
 			return nil, err
 		}