Merge branch 'fix/2023-9-1' into debug

controllers/data_manage/chart_info.go

@@ -1863,7 +1863,7 @@ func (this *EdbInfoController) ChartInfoRefresh() {
 		br.ErrMsg = "获取图表信息失败，Err:" + err.Error()
 		return
 	}
-	err = data.ChartInfoRefreshV2(chartInfo.ChartInfoId)
+	err, isAsync := data.ChartInfoRefreshV2(chartInfo.ChartInfoId)
 	if err != nil {
 		br.Msg = "刷新失败"
 		br.ErrMsg = "刷新图表关联指标信息失败，Err:" + err.Error()
@@ -1887,6 +1887,9 @@ func (this *EdbInfoController) ChartInfoRefresh() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "刷新成功"
+	if isAsync {
+		br.Msg = "图表关联指标较多，请10分钟后刷新页面查看最新数据"
+	}
 }
 
 // @Title 设置图表图片
@@ -2368,7 +2371,7 @@ func (this *EdbInfoController) BatchChartInfoRefresh() {
 		return
 	}
 
-	err = data.BatchChartInfoRefreshV2(chartInfoList)
+	err, isAsync := data.BatchChartInfoRefreshV2(chartInfoList)
 	if err != nil {
 		br.Msg = "刷新失败"
 		br.ErrMsg = "刷新图表关联指标信息失败，Err:" + err.Error()
@@ -2383,6 +2386,9 @@ func (this *EdbInfoController) BatchChartInfoRefresh() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "刷新成功"
+	if isAsync {
+		br.Msg = "图表关联指标较多，请10分钟后刷新页面查看最新数据"
+	}
 }
 
 // CopyChartInfo

controllers/data_manage/line_equation/line_chart_info.go

@@ -1006,7 +1006,7 @@ func (this *LineEquationChartInfoController) Refresh() {
 	}
 
 	// 刷新图表的指标信息
-	err = data.ChartInfoRefreshV2(chartInfo.ChartInfoId)
+	err, isAsync := data.ChartInfoRefreshV2(chartInfo.ChartInfoId)
 
 	//清除图表缓存
 	{
@@ -1017,6 +1017,9 @@ func (this *LineEquationChartInfoController) Refresh() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "刷新成功"
+	if isAsync {
+		br.Msg = "图表关联指标较多，请10分钟后刷新页面查看最新数据"
+	}
 }
 
 // Copy

controllers/data_manage/line_feature/chart_info.go

@@ -2079,7 +2079,7 @@ func (this *LineFeaturesChartInfoController) Refresh() {
 	}
 
 	// 刷新图表的指标信息
-	err = data.ChartInfoRefreshV2(chartInfo.ChartInfoId)
+	err, isAsync := data.ChartInfoRefreshV2(chartInfo.ChartInfoId)
 
 	//清除图表缓存
 	{
@@ -2090,6 +2090,9 @@ func (this *LineFeaturesChartInfoController) Refresh() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "刷新成功"
+	if isAsync {
+		br.Msg = "图表关联指标较多，请10分钟后刷新页面查看最新数据"
+	}
 }
 
 // Copy

controllers/user_login.go

@@ -7,6 +7,7 @@ import (
 	"eta/eta_api/models/company"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services"
+	"eta/eta_api/services/eta_trial"
 	"eta/eta_api/utils"
 	"fmt"
 	"github.com/mojocn/base64Captcha"
@@ -552,6 +553,15 @@ func (this *UserLoginController) Login() {
 		_ = system.AddSysUserLoginRecord(record)
 	}()
 
+	// ETA试用平台-请求中间服务更新用户最后登录时间和次数
+	if utils.BusinessCode == utils.BusinessCodeSandbox {
+		go func() {
+			var r eta_trial.EtaTrialUserReq
+			r.Mobile = sysUser.Mobile
+			_, _ = eta_trial.UpdateEtaTrialUserLogin(r)
+		}()
+	}
+
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true

services/data/chart_info.go

@@ -1062,7 +1062,7 @@ func BarChartData(mappingList []*data_manage.ChartEdbInfoMapping, edbDataListMap
 // @author Roc
 // @datetime 2022-09-16 10:15:38
 // @description 将原来自己写的一套获取所有关联指标，然后刷新指标逻辑 改成  只获取使用的指标id，然后遍历去调用“指标刷新服务”
-func ChartInfoRefreshV2(chartInfoId int) (err error) {
+func ChartInfoRefreshV2(chartInfoId int) (err error, isAsync bool) {
 	var errmsg string
 	defer func() {
 		if err != nil {
@@ -1083,7 +1083,7 @@ func ChartInfoRefreshV2(chartInfoId int) (err error) {
 	}
 
 	// 批量刷新
-	err, _ = EdbInfoRefreshAllFromBaseV3(edbIdList, false, true)
+	err, isAsync = EdbInfoRefreshAllFromBaseV3(edbIdList, false, false)
 	if err != nil {
 		return
 	}
@@ -1095,7 +1095,7 @@ func ChartInfoRefreshV2(chartInfoId int) (err error) {
 // @author Roc
 // @datetime 2022-09-16 10:15:38
 // @description 将原来自己写的一套获取所有关联指标，然后刷新指标逻辑 改成  只获取使用的指标id，然后遍历去调用“指标刷新服务”
-func BatchChartInfoRefreshV2(chartInfoList []*data_manage.ChartInfo) (err error) {
+func BatchChartInfoRefreshV2(chartInfoList []*data_manage.ChartInfo) (err error, isAsync bool) {
 	if len(chartInfoList) <= 0 {
 		return
 	}
@@ -1124,7 +1124,7 @@ func BatchChartInfoRefreshV2(chartInfoList []*data_manage.ChartInfo) (err error)
 	}
 
 	// 批量刷新
-	err, _ = EdbInfoRefreshAllFromBaseV3(edbIdList, false, true)
+	err, isAsync = EdbInfoRefreshAllFromBaseV3(edbIdList, false, false)
 	if err != nil {
 		return
 	}