Merge branch '20221202' into 'master'

20221202

See merge request huang/thingsboard3.3.2!146

@@ -59,7 +59,7 @@ public class TkRoleController extends BaseController {
   }
   }
 
 
   @DeleteMapping
   @DeleteMapping
-  @PreAuthorize("@check.checkPermissions({},{'api:yt:role:delete'})")
+  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN'},{'api:yt:role:delete'})")
   public void deleteRole(@RequestBody String[] ids) throws ThingsboardException {
   public void deleteRole(@RequestBody String[] ids) throws ThingsboardException {
     roleService.deleteRole(ids,getCurrentUser().getCurrentTenantId());
     roleService.deleteRole(ids,getCurrentUser().getCurrentTenantId());
   }
   }
@@ -77,7 +77,7 @@ public class TkRoleController extends BaseController {
   }
   }
 
 
   @PostMapping("save_with_menu")
   @PostMapping("save_with_menu")
-  @PreAuthorize("@check.checkPermissions({},{'api:yt:role:saveOrUpdateRoleInfoWithMenu:post','api:yt:role:saveOrUpdateRoleInfoWithMenu:update'})")
+  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN'},{'api:yt:role:saveOrUpdateRoleInfoWithMenu:post','api:yt:role:saveOrUpdateRoleInfoWithMenu:update'})")
   public RoleDTO saveOrUpdateRoleInfoWithMenu(@RequestBody RoleReqDTO roleReqDTO) throws ThingsboardException {
   public RoleDTO saveOrUpdateRoleInfoWithMenu(@RequestBody RoleReqDTO roleReqDTO) throws ThingsboardException {
     return roleService.saveOrUpdateRoleInfoWithMenu(
     return roleService.saveOrUpdateRoleInfoWithMenu(
         roleReqDTO,
         roleReqDTO,

@@ -16,6 +16,8 @@ public class SelectItemDTO {
 
 
   @ApiModelProperty("下拉选项名")
   @ApiModelProperty("下拉选项名")
   private String name;
   private String name;
+  @ApiModelProperty("下拉选项别名")
+  private String alias;
 
 
   @ApiModelProperty("设备类型")
   @ApiModelProperty("设备类型")
   private DeviceTypeEnum deviceType;
   private DeviceTypeEnum deviceType;

@@ -5,6 +5,7 @@
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO" id="listInform">
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO" id="listInform">
         <result property="id" column="id"/>
         <result property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="name" column="name"/>
+        <result property="alias" column="alias"/>
         <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
     </resultMap>
     </resultMap>
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.DeviceDTO" id="deviceMap">
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.DeviceDTO" id="deviceMap">
@@ -336,7 +337,7 @@
 
 
     <select id="masterDevices" resultMap="listInform">
     <select id="masterDevices" resultMap="listInform">
         SELECT
         SELECT
-        base.tb_device_id as id,base.name,base.device_type,base.device_profile_id
+        base.tb_device_id as id,base.name,base.alias,base.device_type,base.device_profile_id
         FROM  tk_device base
         FROM  tk_device base
         LEFT JOIN device tde ON tde.ID :: TEXT = base.tb_device_id
         LEFT JOIN device tde ON tde.ID :: TEXT = base.tb_device_id
         <where>
         <where>
@@ -361,7 +362,7 @@
 
 
     <select id="slaveDevices" resultMap="listInform">
     <select id="slaveDevices" resultMap="listInform">
         SELECT
         SELECT
-        ide.tb_device_id as id,ide.name,ide.device_type,ide.device_profile_id
+        ide.tb_device_id as id,ide.name,base.alias,ide.device_type,ide.device_profile_id
         FROM  (select * from relation where relation_type_group = 'COMMON' AND relation_type = 'Created' AND from_type = 'DEVICE' AND to_type = 'DEVICE'
         FROM  (select * from relation where relation_type_group = 'COMMON' AND relation_type = 'Created' AND from_type = 'DEVICE' AND to_type = 'DEVICE'
             <if test="masterId !=null and masterId !=''">
             <if test="masterId !=null and masterId !=''">
                 AND from_id :: TEXT = #{masterId}
                 AND from_id :: TEXT = #{masterId}