feat: 调整配置

unitedrhino · Nov 17, 2024 · 6183f55 · 6183f55
1 parent a1a11fd
commit 6183f55
Show file tree

Hide file tree

Showing 6 changed files with 1,253 additions and 1,226 deletions.
diff --git a/service/apisvr/http/swagger.json b/service/apisvr/http/swagger.json
@@ -6644,6 +6644,10 @@
             "format": "int64"
           }
         },
+        "projectID": {
+          "type": "string",
+          "description": "过滤项目下共有的物模型"
+        },
         "areaID": {
           "type": "string"
         },

diff --git a/service/apisvr/http/things/schema/common.api b/service/apisvr/http/things/schema/common.api
@@ -74,6 +74,7 @@ type (
         UserPerm int64 `json:"userPerm,optional"`//用户权限操作: 1:r(只读) 3:rw(可读可写)
         GroupID int64 `json:"groupID,optional"`
         GroupIDs []int64 `json:"groupIDs,optional"`
+        ProjectID int64 `json:"projectID,optional,string"`//过滤项目下共有的物模型
         AreaID int64 `json:"areaID,optional,string"`
         AreaIDPath string `json:"areaIDPath,optional"` //过滤区域id路径下有设备的产品
         PropertyMode string  `json:"propertyMode,optional"`//属性类型可用 读写类型: r(只读) rw(可读可写)

diff --git a/service/apisvr/internal/types/types.go b/service/apisvr/internal/types/types.go
diff --git a/service/dmsvr/internal/logic/schemamanage/commonSchemaIndexLogic.go b/service/dmsvr/internal/logic/schemamanage/commonSchemaIndexLogic.go
@@ -77,6 +77,16 @@ func (l *CommonSchemaIndexLogic) CommonSchemaIndex(in *dm.CommonSchemaIndexReq)
 		}
 		in.ProductIDs = append(in.ProductIDs, cols...)
 	}
+	if in.ProjectID != 0 {
+		cols, err := relationDB.NewDeviceInfoRepo(l.ctx).FindProductIDsByFilter(l.ctx, relationDB.DeviceFilter{ProjectIDs: []int64{in.ProjectID}})
+		if err != nil {
+			return nil, err
+		}
+		if len(cols) == 0 {
+			return &dm.CommonSchemaIndexResp{}, nil
+		}
+		in.ProductIDs = append(in.ProductIDs, cols...)
+	}
 
 	if in.GroupID != 0 {
 		cols, err := relationDB.NewDeviceInfoRepo(l.ctx).FindProductIDsByFilter(l.ctx, relationDB.DeviceFilter{GroupID: in.GroupID})