Merge remote-tracking branch 'origin/master' into debug

controllers/base_from_lt.go

@@ -45,7 +45,7 @@ func (this *LtController) Add() {
 		dataItem, err := services.GetEdbDataFromLt(req.EdbCode, utils.BASE_START_DATE, utils.BASE_END_DATE)
 		if err != nil {
 			br.Msg = "获取指标信息失败！"
-			br.ErrMsg = "获取指标信息失败 GetEdbDataFromWind，Err:" + err.Error()
+			br.ErrMsg = "获取指标信息失败 GetEdbDataFromLt，Err:" + err.Error()
 			return
 		}
 		err = models.AddEdbDataFromLt(req.EdbCode, dataItem)

controllers/base_from_pb.go

@@ -100,7 +100,6 @@ func (this *PbController) Refresh() {
 
 		//开始日期格式化
 		startDateTime, _ := time.Parse(utils.FormatDate, req.StartDate)
-
 		dataItem, err := services.GetEdbDataFromPb(req.EdbCode, startDateTime.Format(utils.FormatDateUnSpace), utils.BASE_END_DATE_UnSpace)
 		if err != nil {
 			br.Msg = "获取指标信息失败！"

models/edb_data_calculate_hbz.go

@@ -294,10 +294,10 @@ func RefreshAllCalculateHbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode
 		condition += " AND data_time>=? "
 		pars = append(pars, startDate)
 	}
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
+	//if endDate != "" {
+	//	condition += " AND data_time<=? "
+	//	pars = append(pars, endDate)
+	//}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
 	if err != nil {

models/edb_data_calculate_hcz.go

@@ -310,10 +310,10 @@ func RefreshAllCalculateHcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode
 		condition += " AND data_time>=? "
 		pars = append(pars, startDate)
 	}
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
+	//if endDate != "" {
+	//	condition += " AND data_time<=? "
+	//	pars = append(pars, endDate)
+	//}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
 	if err != nil {

models/edb_data_calculate_ljzzy.go

@@ -445,10 +445,10 @@ func RefreshAllCalculateLjzzy(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCo
 		condition += " AND data_time>=? "
 		pars = append(pars, startDate)
 	}
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
+	//if endDate != "" {
+	//	condition += " AND data_time<=? "
+	//	pars = append(pars, endDate)
+	//}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 1)
 	if err != nil {

models/edb_data_calculate_tbz.go

@@ -502,10 +502,10 @@ func RefreshAllCalculateTbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode
 		condition += " AND data_time>=? "
 		pars = append(pars, startDate)
 	}
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
+	//if endDate != "" {
+	//	condition += " AND data_time<=? "
+	//	pars = append(pars, endDate)
+	//}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
 	if err != nil {

models/edb_data_calculate_tcz.go

@@ -510,10 +510,10 @@ func RefreshAllCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode
 		condition += " AND data_time>=? "
 		pars = append(pars, startDate)
 	}
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
+	//if endDate != "" {
+	//	condition += " AND data_time<=? "
+	//	pars = append(pars, endDate)
+	//}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
 	if err != nil {

models/edb_data_calculate_time_shift.go

@@ -332,10 +332,10 @@ func RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, moveType int, f
 		condition += " AND data_time>=? "
 		pars = append(pars, startDate)
 	}
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
+	//if endDate != "" {
+	//	condition += " AND data_time<=? "
+	//	pars = append(pars, endDate)
+	//}
 
 	var shiftDay int
 	switch moveFrequency {

services/base_from_pb.go

@@ -17,7 +17,7 @@ type EdbDataFromPb struct {
 
 // GetEdbDataFromPb 获取Pb数据
 func GetEdbDataFromPb(edbCode, startDate, endDate string) (item *EdbDataFromPb, err error) {
-	//edbCode = url.QueryEscape(edbCode)
+	edbCode = url.QueryEscape(edbCode)
 	bpUrl := utils.Hz_Pb_Data_Url + `edbInfo/pb?EdbCode=%s&StartDate=%s&EndDate=%s`
 	bpUrl = fmt.Sprintf(bpUrl, edbCode, startDate, endDate)
 	utils.FileLog.Info("bpUrl:" + bpUrl)