fix bug

models/data_manage/base_from_smm.go

@@ -0,0 +1,151 @@
+package data_manage
+
+import (
+	"rdluck_tools/orm"
+	"time"
+)
+
+type BaseFromSmm struct {
+	BaseFromSmmId int `orm:"column(base_from_smm_id);pk"`
+	Aid           int
+	Name          string
+	Interface     string
+	ApiUpdate     int
+	ApiUpdateType string
+	ApiType       int
+	ApiTypeAll    string
+	Type1         string `orm:"column(type_1)"`
+	Type2         string `orm:"column(type_2)"`
+	Type3         string `orm:"column(type_3)"`
+	ApiStartTime  string
+	ApiUpdateTime string
+	StartTime     string
+	FinishTime    string
+	AuthModule    string
+	AuthLang      string
+	ApiLabel      string
+	Enable        string
+	EditPerson    string
+	EditTime      string
+	AuthDur       int
+	AuthDurType   string
+	StartDate     string
+	EndDate       string
+}
+
+func AddBaseFromSmm(item *BaseFromSmm) (lastId int64, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	lastId, err = o.Insert(item)
+	return
+}
+
+func GetBaseFromSmmList() (list []*BaseFromSmm, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := `SELECT * FROM base_from_smm `
+	_, err = o.Raw(sql).QueryRows(&list)
+	return
+}
+
+type BaseFromSmmIndex struct {
+	BaseFromSmmIndexId int `orm:"column(base_from_smm_index_id);pk"`
+	Interface          string
+	Name               string
+	IndexCode          string
+	IndexName          string
+	Type1              string `orm:"column(type_1)"`
+	Type2              string `orm:"column(type_2)"`
+	Type3              string `orm:"column(type_3)"`
+	Frequency          string
+	Unit               string
+	ApiStartTime       string
+	ApiUpdateTime      string
+	StartTime          string
+	FinishTime         string
+	CreateTime         time.Time
+	ModifyTime         time.Time
+}
+
+func AddBaseFromSmmIndex(item *BaseFromSmmIndex) (lastId int64, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	lastId, err = o.Insert(item)
+	return
+}
+
+func GetBaseFromSmmIndex() (list []*BaseFromSmmIndex, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := `SELECT * FROM base_from_smm_index `
+	_, err = o.Raw(sql).QueryRows(&list)
+	return
+}
+
+type BaseFromSmmData struct {
+	SmmDataId          int `orm:"column(smm_data_id);pk"`
+	BaseFromSmmIndexId int
+	IndexCode          string
+	DataTime           string
+	Value              string
+	CreateTime         time.Time
+	ModifyTime         time.Time
+	DataTimestamp      int64
+}
+
+func AddBaseFromSmmData(item *BaseFromSmmData) (lastId int64, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	lastId, err = o.Insert(item)
+	return
+}
+
+func GetBaseFromSmmDataAll(indexCode string) (list []*BaseFromSmmData, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := `SELECT * FROM base_from_smm_data WHERE index_code=?`
+	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	return
+}
+
+func ModifyBaseFromSmmData(smmDataId int, value string) (err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := `UPDATE base_from_smm_data SET value=?,modify_time=NOW() WHERE smm_data_id=? `
+	_, err = o.Raw(sql, value, smmDataId).Exec()
+	return
+}
+
+func GetBaseFromSmmIndexByCode(smmCode string) (list []*BaseFromSmmIndex, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := ` SELECT * FROM base_from_smm_index WHERE interface=? `
+	_, err = o.Raw(sql, smmCode).QueryRows(&list)
+	return
+}
+
+func GetBaseFromSmmMaxOrMinDate(indexCode string) (min_date, max_date string, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM base_from_smm_data WHERE index_code=? `
+	err = o.Raw(sql, indexCode).QueryRow(&min_date, &max_date)
+	return
+}
+
+func ModifyBaseFromSmmMinDateAndMaxDate(baseFromSmmIndexId, baseFromSmmId int, minDate, maxDate string) (err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := ` UPDATE base_from_smm_index SET start_date=?,end_date=?,modify_time=NOW() WHERE base_from_smm_index_id=? `
+	_, err = o.Raw(sql, minDate, maxDate, baseFromSmmIndexId).Exec()
+	sql = ` UPDATE base_from_smm SET start_date=?,end_date=?,modify_time=NOW() WHERE base_from_smm_id=? `
+	_, err = o.Raw(sql, minDate, maxDate, baseFromSmmId).Exec()
+	return
+}
+
+func ModifyBaseFromSmmSmmType(baseFromSmmId int, smmType string) (err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := ` UPDATE base_from_smm SET smm_type=? WHERE base_from_smm_id=? `
+	_, err = o.Raw(sql, smmType, baseFromSmmId).Exec()
+	return
+}

models/data_source_longzhong.go

@@ -660,4 +660,12 @@ func GetLongzhongSurveyProductItem(quotaSampleId int64) (item *LongzhongSurveyPr
 	sql := `SELECT * FROM longzhong_survey_product WHERE quota_sample_id=? `
 	err = o.Raw(sql, quotaSampleId).QueryRow(&item)
 	return
-}
+}
+
+func ModifyLzSurveyData(inputValue string, surveyDataId int) (err error) {
+	o := orm.NewOrm()
+	o.Using("edb")
+	sql := ` UPDATE longzhong_survey_data SET input_value=? WHERE survey_data_id=? `
+	_, err = o.Raw(sql, inputValue, surveyDataId).Exec()
+	return
+}

models/db.go

@@ -76,5 +76,8 @@ func init() {
 		new(ReportSendThsDetail),
 		new(Report),
 		new(CompanyEndDate),
+		new(data_manage.BaseFromSmm),
+		new(data_manage.BaseFromSmmIndex),
+		new(data_manage.BaseFromSmmData),
 	)
 }

services/data_source_longzhong.go

@@ -1080,15 +1080,15 @@ func GetLzSurveyProductData(cont context.Context) (err error) {
 	paramMap["pageSize"] = 100
 
 	//startDate := time.Now().AddDate(-4, 0, 0).UnixNano() / 1e6
-	startDateTime,_ := time.Parse(utils.FormatDate,"2018-01-01")
-	startDate := startDateTime.UnixNano()/1e6
+	startDateTime, _ := time.Parse(utils.FormatDate, "2018-01-01")
+	startDate := startDateTime.UnixNano() / 1e6
 	endDate := time.Now().UnixNano() / 1e6
 
 	for k, v := range priceInfoList {
 		existList, err := data_manage.GetLzSurveyDataExistByTradeCode(v.SurveyProductId)
-		existMap := make(map[string]string)
+		existMap := make(map[string]*data_manage.LongzhongSurveyData)
 		for _, v := range existList {
-			existMap[v.DataTime] = v.InputValue
+			existMap[v.DataTime] = v
 		}
 		fmt.Println(existMap)
 		pageIndex := 1
@@ -1147,7 +1147,7 @@ func GetLzSurveyProductData(cont context.Context) (err error) {
 					//	msg = "获取隆众调研指标数据失败:err " + err.Error()
 					//	return err
 					//}
-					if _, ok := existMap[shouldDateTimeStr]; !ok {
+					if findItem, ok := existMap[shouldDateTimeStr]; !ok {
 						item := new(models.LongzhongSurveyData)
 						item.SurveyProductId = v.SurveyProductId
 						item.ProjectQuotaId = n.ProjectQuotaID
@@ -1185,6 +1185,9 @@ func GetLzSurveyProductData(cont context.Context) (err error) {
 							return err
 						}
 					} else {
+						if findItem.InputValue != n.InputValue {
+							models.ModifyLzSurveyData(n.InputValue,findItem.SurveyDataId)
+						}
 						fmt.Println("exist:", shouldDateTimeStr)
 					}
 				}

services/task.go

@@ -59,6 +59,12 @@ func Task() {
 	fmt.Println("task end")
 }
 
+func Task123() {
+	fmt.Println("ys start")
+	data.SyncSmmIndexData()
+	fmt.Println("ys end")
+}
+
 //生产环境需要走的任务
 func releaseTask() {