新增测点配置

service/common.go

@@ -0,0 +1,17 @@
+package service
+
+const (
+	WATER       = iota + 1 // WATER 水
+	ELECTRICITY            // ELECTRICITY 电
+)
+
+var EnergyTypeStrMap = map[int]string{
+	WATER:       "水",
+	ELECTRICITY: "电",
+}
+
+type Common struct{}
+
+func (r *Common) GetEnergyTypeMap() map[int]string {
+	return EnergyTypeStrMap
+}

service/enter.go

@@ -1,6 +1,7 @@
 package service
 
 type groupService struct {
+	Common
 	PeakValley
 }
 

service/peak_valley.go

@@ -112,8 +112,8 @@ func (r *PeakValley) CreatePeakValleyRule(req *form.CreatePeakValleyRuleReq) {
 	var total, start, end, blockTotal = 0, 0, 0, 0
 
 	// 每个时间段的时间区块ID
-	var timeBlockIds []uint
-	var timeBlockIdsMap = make(map[string][]uint)
+	var timeBlockIds []int
+	var timeBlockIdsMap = make(map[string][]int)
 
 	var timeGroup [][]int
 	for _, item := range req.RuleItem {
@@ -207,8 +207,8 @@ func (r *PeakValley) UpdatePeakValleyRule(req *form.UpdatePeakValleyRuleReq) {
 	var total, start, end, blockTotal = 0, 0, 0, 0
 
 	// 每个时间段的时间区块ID
-	var timeBlockIds []uint
-	var timeBlockIdsMap = make(map[string][]uint)
+	var timeBlockIds []int
+	var timeBlockIdsMap = make(map[string][]int)
 
 	var timeGroup [][]int
 	for _, item := range req.RuleItem {