Browse Source

多计算公式计算

hsun 10 months ago
parent
commit
d60b93e819
3 changed files with 46 additions and 17 deletions
  1. 17 17
      controllers/base_from_calculate.go
  2. 9 0
      routers/commentsRouter.go
  3. 20 0
      utils/constants.go

+ 17 - 17
controllers/base_from_calculate.go

@@ -2351,39 +2351,39 @@ func (this *CalculateController) StepCalculate() {
 			Source:        v.Source,
 		}
 
-		//1:累计值转月;2:累计值转季;3:同比值;4:同差值;5:N数值移动平均数计算;6:环比值;7:环差值;8:升频;9:降频;10:时间移位;11:超季节性;12:年化;13:累计值;14:累计值年初至今;15:指数修匀;16:日均值
+		// 计算方式
 		switch baseCalculate.Source {
-		case 1:
+		case utils.EdbBaseCalculateLjzzy:
 			dateDataMap, e, errMsg = baseCalculate.Ljzzy()
-		case 2:
+		case utils.EdbBaseCalculateLjzzj:
 			dateDataMap, e, errMsg = baseCalculate.Ljzzj()
-		case 3:
+		case utils.EdbBaseCalculateTbz:
 			dateDataMap, e, errMsg = baseCalculate.Tbz()
-		case 4:
+		case utils.EdbBaseCalculateTcz:
 			dateDataMap, e, errMsg = baseCalculate.Tcz()
-		case 5:
+		case utils.EdbBaseCalculateNszydpjjs:
 			dateDataMap, e, errMsg = baseCalculate.Nszydpjjs()
-		case 6:
+		case utils.EdbBaseCalculateHbz:
 			dateDataMap, e, errMsg = baseCalculate.Hbz()
-		case 7:
+		case utils.EdbBaseCalculateHcz:
 			dateDataMap, e, errMsg = baseCalculate.Hcz()
-		case 8:
+		case utils.EdbBaseCalculateUpFrequency:
 			dateDataMap, e, errMsg = baseCalculate.UpFrequency()
-		case 9:
+		case utils.EdbBaseCalculateDownFrequency:
 			dateDataMap, e, errMsg = baseCalculate.DownFrequency()
-		case 10:
+		case utils.EdbBaseCalculateTimeShift:
 			dateDataMap, e, errMsg = baseCalculate.TimeShift()
-		case 11:
+		case utils.EdbBaseCalculateCjjx:
 			dateDataMap, e, errMsg = baseCalculate.Cjjx()
-		case 12:
+		case utils.EdbBaseCalculateAnnualized:
 			dateDataMap, e, errMsg = baseCalculate.Annualized()
-		case 13:
+		case utils.EdbBaseCalculateLjz:
 			dateDataMap, e, errMsg = baseCalculate.Ljz()
-		case 14:
+		case utils.EdbBaseCalculateLjzNczj:
 			dateDataMap, e, errMsg = baseCalculate.LjzNczj()
-		case 15:
+		case utils.EdbBaseCalculateExponentialSmoothing:
 			dateDataMap, e, errMsg = baseCalculate.ExponentialSmoothing()
-		case 16:
+		case utils.EdbBaseCalculateRjz:
 			dateDataMap, e, errMsg = baseCalculate.Rjz()
 		default:
 			errMsg = "计算方式无效"

+ 9 - 0
routers/commentsRouter.go

@@ -214,6 +214,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:CalculateController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:CalculateController"],
+        beego.ControllerComments{
+            Method: "StepCalculate",
+            Router: `/base/step_calculate`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_index_lib/controllers:CalculateController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:CalculateController"],
         beego.ControllerComments{
             Method: "BatchEdit",

+ 20 - 0
utils/constants.go

@@ -290,3 +290,23 @@ const (
 	ZhLangVersion = "zh" // 中文语言版本
 	EnLangVersion = "en" // 英文语言版本
 )
+
+// 指标计算方式
+const (
+	EdbBaseCalculateLjzzy                = 1  // 累计值转月->1
+	EdbBaseCalculateLjzzj                = 2  // 累计值转季->2
+	EdbBaseCalculateTbz                  = 3  // 同比值->3
+	EdbBaseCalculateTcz                  = 4  // 同差值->4
+	EdbBaseCalculateNszydpjjs            = 5  // N数值移动平均数计算->5
+	EdbBaseCalculateHbz                  = 6  // 环比值->6
+	EdbBaseCalculateHcz                  = 7  // 环差值->7
+	EdbBaseCalculateUpFrequency          = 8  // 升频->8
+	EdbBaseCalculateDownFrequency        = 9  // 降频->9
+	EdbBaseCalculateTimeShift            = 10 // 时间移位->10
+	EdbBaseCalculateCjjx                 = 11 // 超季节性->11
+	EdbBaseCalculateAnnualized           = 12 // 年化->12
+	EdbBaseCalculateLjz                  = 13 // 累计值->13
+	EdbBaseCalculateLjzNczj              = 14 // 累计值年初至今->14
+	EdbBaseCalculateExponentialSmoothing = 15 // 指数修匀->15
+	EdbBaseCalculateRjz                  = 16 // 日均值->16
+)