新增测点配置

api/v1/common.go

@@ -0,0 +1,14 @@
+package v1
+
+import (
+	"energy-management-system/response"
+	"energy-management-system/service"
+	"github.com/gin-gonic/gin"
+)
+
+type Common struct{}
+
+func (r *Common) GetEnergyTypeMap(c *gin.Context) {
+	respData := service.GroupServices.Common.GetEnergyTypeMap()
+	response.SuccessData(respData, c)
+}

api/v1/device_point.go

@@ -0,0 +1,22 @@
+package v1
+
+import (
+	"energy-management-system/form"
+	"energy-management-system/request"
+	"github.com/gin-gonic/gin"
+)
+
+type DevicePoint struct{}
+
+// 获取测点名称select
+// PointNameSelect 季度列表
+func (r *DevicePoint) PointNameSelect(c *gin.Context) {
+	var req form.PointNameSelectReq
+	request.BindParam(c, &req)
+	//respData := service.GroupServices.PeakValley.PeakValleyQuarterPage(&req)
+	//response.SuccessData(respData, c)
+
+}
+
+// 创建设备测点
+// 修改设备测点

api/v1/enter.go

@@ -1,8 +1,10 @@
 package v1
 
 type Controller struct {
+	Common
 	TestApi
-	PeakValley // 谷峰规则
+	PeakValley  // 谷峰规则
+	DevicePoint //
 	//UserApi                       // 用户管理
 	//DictApi                       // 字典管理
 	//ProductApi                    // 产品管理

api/v1/peak_valley.go

@@ -5,9 +5,7 @@ import (
 	"energy-management-system/request"
 	"energy-management-system/response"
 	"energy-management-system/service"
-	"energy-management-system/utils/exception"
 	"github.com/gin-gonic/gin"
-	"strconv"
 )
 
 type PeakValley struct{}
@@ -40,9 +38,10 @@ func (r *PeakValley) UpdatePeakValleyQuarter(c *gin.Context) {
 // PeakValleyQuarterEditDetail 查看季度
 func (r *PeakValley) PeakValleyQuarterEditDetail(c *gin.Context) {
 	var req form.PeakValleyQuarterEditDetailReq
-	id, err := strconv.Atoi(c.Param("id"))
-	exception.PBM(err != nil, "参数有误")
-	req.Id = id
+	request.BindParam(c, &req)
+	//id, err := strconv.Atoi(c.Param("id"))
+	//exception.PBM(err != nil, "参数有误")
+	//req.Id = id
 	respData := service.GroupServices.PeakValley.PeakValleyQuarterEditDetail(&req)
 	response.SuccessData(respData, c)
 }
@@ -80,18 +79,21 @@ func (r *PeakValley) UpdatePeakValleyRule(c *gin.Context) {
 // PeakValleyRuleDetail 谷峰规则详情
 func (r *PeakValley) PeakValleyRuleDetail(c *gin.Context) {
 	var req form.PeakValleyRuleDetailReq
-	id, err := strconv.Atoi(c.Param("id"))
-	exception.PBM(err != nil, "参数有误")
-	req.RuleId = id
+	request.BindParam(c, &req)
+
+	//id, err := strconv.Atoi(c.Param("id"))
+	//exception.PBM(err != nil, "参数有误")
+	//req.RuleId = id
 	respData := service.GroupServices.PeakValley.PeakValleyRuleDetail(&req)
 	response.SuccessData(respData, c)
 }
 
 func (r *PeakValley) PeakValleyRuleEditDetail(c *gin.Context) {
 	var req form.PeakValleyRuleEditDetailReq
-	id, err := strconv.Atoi(c.Param("id"))
-	exception.PBM(err != nil, "参数有误")
-	req.RuleId = id
+	request.BindParam(c, &req)
+	//id, err := strconv.Atoi(c.Param("id"))
+	//exception.PBM(err != nil, "参数有误")
+	//req.RuleId = id
 	respData := service.GroupServices.PeakValley.PeakValleyRuleEditDetail(&req)
 	response.SuccessData(respData, c)
 }