From 37a1ccaadcd8cf72cc6e8551c615927eafc54900 Mon Sep 17 00:00:00 2001
From: douxu <douxu@clea.com.cn>
Date: Fri, 29 Aug 2025 15:24:21 +0800
Subject: [PATCH] modify the query conditions to tagname and fix building bug

---
 database/query_grid.go    |  6 +++---
 database/query_station.go |  6 +++---
 database/query_zone.go    |  6 +++---
 router/attr.go            | 18 ++++++++++++++++++
 router/diagram.go         |  3 ++-
 router/router.go          |  3 +++
 6 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 router/attr.go

diff --git a/database/query_grid.go b/database/query_grid.go
index 8038327..233ac2e 100644
--- a/database/query_grid.go
+++ b/database/query_grid.go
@@ -11,14 +11,14 @@ import (
 	"gorm.io/gorm/clause"
 )
 
-// QueryGridByName return the result of query circuit diagram grid info by name from postgresDB
-func QueryGridByName(ctx context.Context, tx *gorm.DB, name string) (orm.Grid, error) {
+// QueryGridByName return the result of query circuit diagram grid info by tagName from postgresDB
+func QueryGridByName(ctx context.Context, tx *gorm.DB, tagName string) (orm.Grid, error) {
 	var grid orm.Grid
 	// ctx超时判断
 	cancelCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
 	defer cancel()
 
-	result := tx.WithContext(cancelCtx).Where("NAME = ? ", name).Clauses(clause.Locking{Strength: "UPDATE"}).Find(&grid)
+	result := tx.WithContext(cancelCtx).Where("TAGNAME = ? ", tagName).Clauses(clause.Locking{Strength: "UPDATE"}).Find(&grid)
 	if result.Error != nil {
 		return orm.Grid{}, result.Error
 	}
diff --git a/database/query_station.go b/database/query_station.go
index f7a2e63..79dc6ec 100644
--- a/database/query_station.go
+++ b/database/query_station.go
@@ -11,14 +11,14 @@ import (
 	"gorm.io/gorm/clause"
 )
 
-// QueryStationByName return the result of query circuit diagram Station info by name from postgresDB
-func QueryStationByName(ctx context.Context, tx *gorm.DB, name string) (orm.Station, error) {
+// QueryStationByName return the result of query circuit diagram Station info by tagName from postgresDB
+func QueryStationByName(ctx context.Context, tx *gorm.DB, tagName string) (orm.Station, error) {
 	var station orm.Station
 	// ctx超时判断
 	cancelCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
 	defer cancel()
 
-	result := tx.WithContext(cancelCtx).Where("NAME = ? ", name).Clauses(clause.Locking{Strength: "UPDATE"}).Find(&station)
+	result := tx.WithContext(cancelCtx).Where("TAGNAME = ? ", tagName).Clauses(clause.Locking{Strength: "UPDATE"}).Find(&station)
 	if result.Error != nil {
 		return orm.Station{}, result.Error
 	}
diff --git a/database/query_zone.go b/database/query_zone.go
index 7779273..4c0a67f 100644
--- a/database/query_zone.go
+++ b/database/query_zone.go
@@ -11,14 +11,14 @@ import (
 	"gorm.io/gorm/clause"
 )
 
-// QueryZoneByName return the result of query circuit diagram Zone info by name from postgresDB
-func QueryZoneByName(ctx context.Context, tx *gorm.DB, name string) (orm.Zone, error) {
+// QueryZoneByName return the result of query circuit diagram Zone info by tagName from postgresDB
+func QueryZoneByName(ctx context.Context, tx *gorm.DB, tagName string) (orm.Zone, error) {
 	var zone orm.Zone
 	// ctx超时判断
 	cancelCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
 	defer cancel()
 
-	result := tx.WithContext(cancelCtx).Where("NAME = ? ", name).Clauses(clause.Locking{Strength: "UPDATE"}).Find(&zone)
+	result := tx.WithContext(cancelCtx).Where("TAGNAME = ? ", tagName).Clauses(clause.Locking{Strength: "UPDATE"}).Find(&zone)
 	if result.Error != nil {
 		return orm.Zone{}, result.Error
 	}
diff --git a/router/attr.go b/router/attr.go
new file mode 100644
index 0000000..8669500
--- /dev/null
+++ b/router/attr.go
@@ -0,0 +1,18 @@
+// Package router provides router config
+package router
+
+import (
+	"modelRT/handler"
+
+	"github.com/gin-gonic/gin"
+)
+
+// registerAttrRoutes define func of register attr routes
+func registerAttrRoutes(rg *gin.RouterGroup) {
+	g := rg.Group("/attr/")
+	// TODO add attr middleware
+	g.GET("load", handler.AttrGetHandler)
+	g.POST("create", handler.AttrGetHandler)
+	g.POST("update", handler.AttrSetHandler)
+	g.POST("delete", handler.AttrDeleteHandler)
+}
diff --git a/router/diagram.go b/router/diagram.go
index 6bf9451..93d2d98 100644
--- a/router/diagram.go
+++ b/router/diagram.go
@@ -1,3 +1,4 @@
+// Package router provides router config
 package router
 
 import (
@@ -6,7 +7,7 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-// RegisterRoutes define func of register diagram routes
+// registerDiagramRoutes define func of register diagram routes
 func registerDiagramRoutes(rg *gin.RouterGroup) {
 	g := rg.Group("/diagram/")
 	// TODO add diagram middleware
diff --git a/router/router.go b/router/router.go
index 3e9b3dc..094571d 100644
--- a/router/router.go
+++ b/router/router.go
@@ -1,3 +1,4 @@
+// Package router provides router config
 package router
 
 import (
@@ -14,9 +15,11 @@ func init() {
 	limiter = middleware.NewLimiter(10, 1*time.Minute) // 设置限流器，允许每分钟最多请求10次
 }
 
+// RegisterRoutes define func of register all routes
 func RegisterRoutes(engine *gin.Engine) {
 	// use global middlewares
 	engine.Use(middleware.StartTrace(), limiter.Middleware)
 	routeGroup := engine.Group("")
 	registerDiagramRoutes(routeGroup)
+	registerAttrRoutes(routeGroup)
 }