Browse Source

fix:钢联化工新增绑定终端

Roc 1 năm trước cách đây
mục cha
commit
3a777d319b

+ 16 - 2
controllers/base_from_mysteel_chemical.go

@@ -333,8 +333,11 @@ func (this *MySteelChemicalController) GetIndexCreate() {
 		this.ServeJSON()
 	}()
 
+	// 终端编码
+	terminalCode := this.GetString("TerminalCode")
+
 	indexObj := new(models.BaseFromMysteelChemicalIndex)
-	items, err := indexObj.GetIndexCreate()
+	items, err := indexObj.GetIndexCreate(terminalCode)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取指标失败, Err: " + err.Error()
@@ -571,6 +574,7 @@ func (this *MySteelChemicalController) MultiUpdateIndex() {
 	br.Msg = "操作成功"
 }
 
+// AddMysteelIndex
 // @Title 处理钢联指标的接口
 // @Description 处理钢联指标的接口
 // @Success 200 {object} models.AddMysteelIndexResp
@@ -659,6 +663,7 @@ func (this *MySteelChemicalController) GetIndexDetailByCode() {
 	br.Msg = "获取成功"
 }
 
+// GetIndexCountByFrequency
 // @Title 根据频度获取指标总数量
 // @Description 根据频度获取指标总数量
 // @Success 200 {object} models.HandleMysteelIndexResp
@@ -689,6 +694,10 @@ func (this *MySteelChemicalController) GetIndexCountByFrequency() {
 		pars = append(pars, req.EndDate)
 	}
 
+	// 终端编码
+	condition += ` AND terminal_code = ? `
+	pars = append(pars, req.TerminalCode)
+
 	condition += ` AND is_stop = 0 `
 
 	indexObj := new(models.BaseFromMysteelChemicalIndex)
@@ -704,7 +713,7 @@ func (this *MySteelChemicalController) GetIndexCountByFrequency() {
 	br.Msg = "处理成功"
 }
 
-// GetNoMergeIndexByFrequencyPage
+// GetIndexLimitByFrequency
 // @Title 获取未合并的指标列表
 // @Description 获取未合并的指标列表
 // @Success 200 {object} models.HandleMysteelIndexResp
@@ -736,6 +745,7 @@ func (this *MySteelChemicalController) GetIndexLimitByFrequency() {
 	br.Msg = "处理成功"
 }
 
+// GetIndexPageByFrequency
 // @Title 获取钢联指标分页数据
 // @Description 获取钢联指标分页数据
 // @Success 200 {object} models.HandleMysteelIndexResp
@@ -767,6 +777,10 @@ func (this *MySteelChemicalController) GetIndexPageByFrequency() {
 		pars = append(pars, req.EndDate)
 	}
 
+	// 终端编码
+	condition += ` AND terminal_code = ? `
+	pars = append(pars, req.TerminalCode)
+
 	condition += ` AND is_stop = 0 `
 
 	indexObj := new(models.BaseFromMysteelChemicalIndex)

+ 12 - 9
models/base_from_mysteel_chemical.go

@@ -223,6 +223,7 @@ type BaseFromMysteelChemicalIndex struct {
 	CreateTime                        time.Time `description:"创建时间"`
 	ModifyTime                        time.Time `description:"修改时间"`
 	IsStop                            int       `description:"是否停更:1:停更,0:未停更"`
+	TerminalCode                      string    `description:"终端编码"`
 }
 
 // GetIndexRefreshAllByMergeFile 根据合并文件去分组查询需要刷新的文件
@@ -240,11 +241,11 @@ func (m *BaseFromMysteelChemicalIndex) GetIndexItem(indexCode string) (item *Bas
 	return
 }
 
-func (m *BaseFromMysteelChemicalIndex) GetIndexCreate() (items []*BaseFromMysteelChemicalIndex, err error) {
+func (m *BaseFromMysteelChemicalIndex) GetIndexCreate(terminalCode string) (items []*BaseFromMysteelChemicalIndex, err error) {
 	o := orm.NewOrm()
 	endTime := time.Now().Add(-2 * time.Minute).Format(utils.FormatDateTime)
-	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_name = '' AND create_time <= ? `
-	_, err = o.Raw(sql, endTime).QueryRows(&items)
+	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_name = '' AND create_time <= ? AND terminal_code = ? `
+	_, err = o.Raw(sql, endTime, terminalCode).QueryRows(&items)
 	return
 }
 
@@ -272,8 +273,9 @@ func (m *BaseFromMysteelChemicalIndex) GetNoMergeIndexByFrequencyCount(frequency
 
 // GetMaxFileIndexReq 获取最大文件数请求
 type GetMaxFileIndexReq struct {
-	Frequency string
-	EndDate   string
+	Frequency    string
+	EndDate      string
+	TerminalCode string `description:"终端编码"`
 }
 
 // GetMaxFileIndex 获取最大文件的
@@ -475,10 +477,11 @@ func (m *BaseFromMysteelChemicalIndex) GetIndexLimitByFrequency(frequency string
 }
 
 type GetIndexPageByFrequencyPageReq struct {
-	Frequency string
-	EndDate   string
-	StartSize int
-	PageSize  int
+	Frequency    string
+	EndDate      string
+	StartSize    int
+	PageSize     int
+	TerminalCode string `description:"终端编码"`
 }
 
 // GetNoMergeIndexByFrequencyPage 获取未合并的指标列表