完善季度

repository/peak-valley/peak_valley_quarter.go

@@ -0,0 +1,43 @@
+package peak_valley
+
+import (
+	"energy-management-system/form"
+	"energy-management-system/global"
+	peak_valley_model "energy-management-system/model/peak-valley"
+)
+
+// 季度谷峰规则
+
+// 开始时间
+// 结束时间
+// 谷峰规则ID
+
+func (r *PeakValley) GetPeakValleyQuarterPage(req *form.PeakValleyQuarterListReq) (count int64, list []*peak_valley_model.PeakValleyQuarter, err error) {
+	db := global.Db.Model(&peak_valley_model.PeakValleyQuarter{})
+
+	//for key, value := range qr {
+	//	db = db.Where(key, value)
+	//}
+	err = db.Count(&count).Error
+	if err != nil {
+		return
+	}
+	err = db.Offset((req.Page.GetPageIndex() - 1) * req.Page.GetPageSize()).Limit(req.Page.GetPageSize()).Order("id desc").Preload("Rule").Find(&list).Error
+	return
+}
+
+func (r *PeakValley) CreatePeakValleyQuarter(d *peak_valley_model.PeakValleyQuarter) error {
+	return global.Db.Create(d).Error
+}
+func (r *PeakValley) UpdatePeakValleyQuarter(d *peak_valley_model.PeakValleyQuarter) error {
+	return global.Db.Save(d).Error
+}
+
+func (r *PeakValley) GetOnePeakValleyQuarter(qr map[string]interface{}) (d *peak_valley_model.PeakValleyQuarter, err error) {
+	db := global.Db
+	for key, value := range qr {
+		db = db.Where(key, value)
+	}
+	err = db.First(&d).Error
+	return
+}

repository/peak-valley/peak_valley_rule.go

@@ -19,11 +19,11 @@ type PeakValley struct {
 //选择时间段 设置电价
 //(将时间段 转化为十分钟区块 查找到对应十分钟区块 创建该规则的电价)
 
-func (r *PeakValley) CreatePeakValleyRule(tx *gorm.DB, d *peak_valley_model.PeakValleyRule) error {
+func (r *PeakValley) CreatePeakValleyRuleTx(tx *gorm.DB, d *peak_valley_model.PeakValleyRule) error {
 	return tx.Create(d).Error
 }
 
-func (r *PeakValley) UpdatePeakValleyRule(tx *gorm.DB, d *peak_valley_model.PeakValleyRule) error {
+func (r *PeakValley) UpdatePeakValleyRuleTx(tx *gorm.DB, d *peak_valley_model.PeakValleyRule) error {
 	return tx.Save(d).Error
 }
 

repository/peak-valley/peak_valley_time_block_price.go

@@ -75,13 +75,3 @@ func (r *PeakValley) GetPeakValleyRuleCustomName(ruleId int) (list []*peak_valle
 		Find(&list).Error
 	return
 }
-
-//type ByCustomNameNumber []*peak_valley_model.PeakValleyRuleCustomName
-//
-//func (a ByCustomNameNumber) Len() int      { return len(a) }
-//func (a ByCustomNameNumber) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-//func (a ByCustomNameNumber) Less(i, j int) bool {
-//	numI, _ := utils.ExtractNumber(a[i].CustomName)
-//	numJ, _ := utils.ExtractNumber(a[j].CustomName)
-//	return numI < numJ // 升序排序
-//}