Browse Source

指数修匀

hsun 1 year ago
parent
commit
51d8c7a78b

+ 20 - 0
controllers/data_manage/edb_info_calculate.go

@@ -601,6 +601,9 @@ func (this *ChartInfoController) CalculateBatchSave() {
 func (this *ChartInfoController) CalculateBatchEdit() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
@@ -733,6 +736,20 @@ func (this *ChartInfoController) CalculateBatchEdit() {
 			br.Msg = "日期间隔不得少于两天"
 			return
 		}
+	case utils.DATA_SOURCE_CALCULATE_ZSXY: // 指数修匀
+		if req.Formula == "" {
+			br.Msg = "请填写alpha值"
+			return
+		}
+		alpha, e := strconv.ParseFloat(req.Formula, 64)
+		if e != nil {
+			br.Msg = "alpha值输入错误, 请重新输入"
+			return
+		}
+		if alpha <= 0 || alpha >= 1 {
+			br.Msg = "alpha值输入错误, 请重新输入"
+			return
+		}
 	}
 
 	// 构造请求
@@ -1485,6 +1502,9 @@ func (this *ChartInfoController) SaveAdjustEdbInfo() {
 func (this *ChartInfoController) BatchCalculateBatchSave() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()

+ 5 - 1
models/data_manage/edb_data_base.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
-	"eta/eta_api/utils"
 	"time"
 )
 
@@ -148,6 +148,10 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_predict_ccalculate_percentile"
 	case utils.DATA_SOURCE_FUBAO: //富宝-71
 		tableName = "edb_data_fubao"
+	case utils.DATA_SOURCE_CALCULATE_ZSXY:
+		tableName = "edb_data_calculate_zsxy" // 指数修匀->72
+	case utils.DATA_SOURCE_PREDICT_CALCULATE_ZSXY:
+		tableName = "edb_data_predict_calculate_zsxy" // 预测指数修匀->73
 	default:
 		tableName = ""
 	}

+ 3 - 1
services/data/edb_info.go

@@ -3,13 +3,13 @@ package data
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/elastic"
 	"eta/eta_api/utils"
+	"fmt"
 	"sort"
 	"strconv"
 	"strings"
@@ -2958,6 +2958,8 @@ func getEdbRuleTitle(edbInfo, parentEdbInfo *data_manage.EdbInfo, childList []da
 			return
 		}
 		ruleTitle = fmt.Sprintf("百分位(时间长度%d%s)", cf.CalculateValue, cf.CalculateUnit)
+	case utils.DATA_SOURCE_CALCULATE_ZSXY, utils.DATA_SOURCE_PREDICT_CALCULATE_ZSXY:
+		ruleTitle = `指数修匀计算`
 	}
 
 	return

+ 3 - 2
utils/constants.go

@@ -156,8 +156,9 @@ const (
 	DATA_SOURCE_CALCULATE_PERCENTILE                            //百分位图表->68
 	DATA_SOURCE_PREDICT_CALCULATE_STANDARD_DEVIATION            //预测标准差->69
 	DATA_SOURCE_PREDICT_CALCULATE_PERCENTILE                    //预测百分位->70
-	DATA_SOURCE_FUBAO                                = 71       //富宝->71
-	DATA_SOURCE_CALCULATE_ZSXY                       = 72       // 指数修匀->72
+	DATA_SOURCE_FUBAO                                           //富宝->71
+	DATA_SOURCE_CALCULATE_ZSXY                                  // 指数修匀->72
+	DATA_SOURCE_PREDICT_CALCULATE_ZSXY                          // 预测指数修匀->73
 )
 
 // 数据刷新频率