Merge branch 'master_dev' into 20230509

@@ -1174,6 +1174,10 @@ UPDATE "public"."sys_dict_item" SET "dict_id" = '4377b96b-07dd-4fa3-a743-78ba8be
 ---------【新增菜单和角色权限】---------------------------------------------------------------
 ---------【新增菜单和角色权限】---------------------------------------------------------------
 ------------------------------------------------------------------------------------
 ------------------------------------------------------------------------------------
 DELETE FROM "public"."sys_menu" WHERE "id" = '52f66fc2-94f9-419b-bb73-43dd4ed04e4e';
 DELETE FROM "public"."sys_menu" WHERE "id" = '52f66fc2-94f9-419b-bb73-43dd4ed04e4e';
+delete from sys_menu where id in ('c9d250d7-ff55-4686-be55-32a0192a6a39','94208bb8-50b4-4eb3-95fc-472174d918f3','54124230-d618-4876-9c71-18bb4ce8c223');
+delete from sys_role_menu where menu_id in (SELECT test1.menu_id from (SELECT srm.menu_id,sm.id as source_menu_id FROM (select DISTINCT(menu_id) from sys_role_menu) srm LEFT JOIN sys_menu sm ON srm.menu_id = sm.id) test1
+                                            where test1.source_menu_id is null);
+INSERT INTO "public"."sys_menu"("id", "parent_id", "path", "type", "permission", "creator", "create_time", "updater", "update_time", "name", "tenant_id", "component", "redirect", "alias", "case_sensitive", "meta", "sort") VALUES ('8abc0f43-6284-456e-9bb7-4d912525ab89', '6beed0bb-df31-43c4-ae38-66c1a24de993', '/dataview', 'SYSADMIN', 'dataview:center:view', '80808080-8080-8080-8080-808080808080', '2023-02-28 09:34:28.486475', '80808080-8080-8080-8080-808080808080', '2023-02-28 10:16:15.279581', '大屏设计器', '13814000-1dd2-11b2-8080-808080808080', '/dataview/index', NULL, NULL, NULL, '{"icon":"ant-design:fund-view-outlined","title":"大屏设计器","isLink":true,"menuType":"1","ignoreKeepAlive":false,"hideMenu":false,"status":"0"}', 1);
 
 
 INSERT INTO "public"."sys_menu"("id", "parent_id", "path", "type", "permission", "creator", "create_time", "updater", "update_time", "name", "tenant_id", "component", "redirect", "alias", "case_sensitive", "meta", "sort") VALUES ('003936fa-da27-45ff-b8d2-0c05976a7622', '86e55906-32d4-47ac-89ea-a41280861c42', NULL, 'SYSADMIN', 'api:yt:task_center:delete', '80808080-8080-8080-8080-808080808080', '2023-04-14 09:17:52.756746', NULL, NULL, '删除', '13814000-1dd2-11b2-8080-808080808080', NULL, NULL, NULL, NULL, '{"title":"删除","menuType":"2","status":"0"}', 4);
 INSERT INTO "public"."sys_menu"("id", "parent_id", "path", "type", "permission", "creator", "create_time", "updater", "update_time", "name", "tenant_id", "component", "redirect", "alias", "case_sensitive", "meta", "sort") VALUES ('003936fa-da27-45ff-b8d2-0c05976a7622', '86e55906-32d4-47ac-89ea-a41280861c42', NULL, 'SYSADMIN', 'api:yt:task_center:delete', '80808080-8080-8080-8080-808080808080', '2023-04-14 09:17:52.756746', NULL, NULL, '删除', '13814000-1dd2-11b2-8080-808080808080', NULL, NULL, NULL, NULL, '{"title":"删除","menuType":"2","status":"0"}', 4);
 
 

@@ -42,6 +42,9 @@ public class TkDataViewInterfaceDTO extends TenantDTO {
   @ApiModelProperty(value = "状态:0待发布 1已发布")
   @ApiModelProperty(value = "状态:0待发布 1已发布")
   private Integer state;
   private Integer state;
 
 
+  @ApiModelProperty(value = "过滤脚本")
+  private String filter;
+
   @ApiModelProperty(value = "接口描述")
   @ApiModelProperty(value = "接口描述")
   private String remark;
   private String remark;
 }
 }

 package org.thingsboard.server.dao.yunteng.entities;
 package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.Data;
@@ -27,4 +29,7 @@ public class TkDataViewInterfaceEntity extends TenantBaseEntity {
 
 
   @TableField(typeHandler = EnumTypeHandler.class)
   @TableField(typeHandler = EnumTypeHandler.class)
   private TkSystemTypeEnum interfaceType;
   private TkSystemTypeEnum interfaceType;
+
+  @TableField(updateStrategy = FieldStrategy.IGNORED)
+  private String filter;
 }
 }