设备管理类型功能调整

@@ -394,6 +394,7 @@ CREATE TABLE "public"."qg_brain_device_category" (
 "name" varchar(100),
 "name" varchar(100),
 "code" varchar(100),
 "code" varchar(100),
 "status" varchar(50),
 "status" varchar(50),
+"tenant_id" varchar(36),
 "notes" varchar(500),
 "notes" varchar(500),
 "create_time" timestamp(6),
 "create_time" timestamp(6),
 "creator" varchar(36),
 "creator" varchar(36),

@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
 
 
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Data
-public class BrainDeviceCategoryDTO extends BaseDTO {
+public class BrainDeviceCategoryDTO extends TenantDTO {
 
 
     @ApiModelProperty(value = "设备类型名称")
     @ApiModelProperty(value = "设备类型名称")
     private String name;
     private String name;
@@ -16,4 +16,6 @@ public class BrainDeviceCategoryDTO extends BaseDTO {
     private String status;
     private String status;
     @ApiModelProperty(value = "备注")
     @ApiModelProperty(value = "备注")
     private String notes;
     private String notes;
+    @ApiModelProperty(value = "创建用户名称")
+    private String creatorName;
 }
 }

-package org.thingsboard.server.dao.yunteng.entities;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.time.LocalDateTime;
-
-@Getter
-@Setter
-public class BrainBaseEntity extends BaseEntity {
-
-    private static final long serialVersionUID = -4315734960161684909L;
-
-    @TableField(fill = FieldFill.INSERT)
-    private String creator;
-
-    @TableField(fill = FieldFill.UPDATE)
-    private String updater;
-
-    @TableField(fill = FieldFill.INSERT)
-    private LocalDateTime createTime;
-
-    @TableField(fill = FieldFill.UPDATE)
-    private LocalDateTime updateTime;
-
-}

@@ -11,7 +11,7 @@ import org.thingsboard.server.dao.model.ModelConstants;
 @Data
 @Data
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = ModelConstants.BRAINDEVICECAGEGORY_TABLE_NAME, autoResultMap = true)
 @TableName(value = ModelConstants.BRAINDEVICECAGEGORY_TABLE_NAME, autoResultMap = true)
-public class BrainDeviceCategoryEntity extends BrainBaseEntity {
+public class BrainDeviceCategoryEntity extends TenantBaseEntity {
     /**
     /**
      * 设备类型名称
      * 设备类型名称
      */
      */

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.dto.BrainDeviceCategoryDTO;
 import org.thingsboard.server.common.data.yunteng.dto.BrainDeviceCategoryDTO;
+import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.BrainDeviceCategoryEntity;
 import org.thingsboard.server.dao.yunteng.entities.BrainDeviceCategoryEntity;
 import org.thingsboard.server.dao.yunteng.mapper.BrainDeviceCategoryMapper;
 import org.thingsboard.server.dao.yunteng.mapper.BrainDeviceCategoryMapper;
@@ -29,6 +30,7 @@ public class BrainDeviceCategoryServiceImpl extends AbstractBaseService<BrainDev
 
 
     @Override
     @Override
     public TkPageData<BrainDeviceCategoryDTO> page(Map<String, Object> params) throws ThingsboardException {
     public TkPageData<BrainDeviceCategoryDTO> page(Map<String, Object> params) throws ThingsboardException {
+        params.put("tenantId", SpringBeanUtils.getTenantId().getId().toString());
         TkPageData<BrainDeviceCategoryDTO> result = new TkPageData<>();
         TkPageData<BrainDeviceCategoryDTO> result = new TkPageData<>();
         IPage<BrainDeviceCategoryEntity> page =
         IPage<BrainDeviceCategoryEntity> page =
                 getPage(params, "create_time", false);
                 getPage(params, "create_time", false);

@@ -8,6 +8,7 @@
         <result property="code" column="code"/>
         <result property="code" column="code"/>
         <result property="status" column="status"/>
         <result property="status" column="status"/>
         <result property="notes" column="notes"/>
         <result property="notes" column="notes"/>
+        <result property="tenantId" column="tenant_id"/>
         <result property="createTime" column="create_time"/>
         <result property="createTime" column="create_time"/>
         <result property="updater" column="updater"/>
         <result property="updater" column="updater"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateTime" column="update_time"/>
@@ -18,6 +19,9 @@
         o.id,o.name,o.code,o.status,o.notes,o.create_time,o.updater,o.update_time,o.creator
         o.id,o.name,o.code,o.status,o.notes,o.create_time,o.updater,o.update_time,o.creator
         from qg_brain_device_category o
         from qg_brain_device_category o
         <where>
         <where>
+            <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
+                AND o.tenant_id = #{queryMap.tenantId}
+            </if>
             <if test="queryMap.code !=null and queryMap.code !=''">
             <if test="queryMap.code !=null and queryMap.code !=''">
                 AND o.code ILIKE concat('%',#{queryMap.code}::TEXT,'%')
                 AND o.code ILIKE concat('%',#{queryMap.code}::TEXT,'%')
             </if>
             </if>