设备台账完善

@@ -465,5 +465,5 @@ COMMENT ON COLUMN "public"."qg_brain_device"."service_dep" IS '维保部门id';
 COMMENT ON COLUMN "public"."qg_brain_device"."contact_info" IS '联系方式';
 COMMENT ON COLUMN "public"."qg_brain_device"."enable_time" IS '启用日期';
 COMMENT ON COLUMN "public"."qg_brain_device"."pictures" IS '图片ids';
-COMMENT ON COLUMN "public"."qg_brain_device"."pictures" IS '文件ids';
+COMMENT ON COLUMN "public"."qg_brain_device"."files" IS '文件ids';
 

-package org.thingsboard.server.controller;
+package org.thingsboard.server.controller.yunteng;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.dto.BrainDeviceDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.BrainDeviceService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 

@@ -26,12 +26,20 @@ public class BrainDeviceDTO extends TenantDTO {
     private String model;
     @ApiModelProperty(value = "备注")
     private String notes;
+    @ApiModelProperty(value = "设备类型id")
+    private String categoryId;
     @ApiModelProperty(value = "设备类型")
     private String categoryName;
+    @ApiModelProperty(value = "存放位置id")
+    private String positionId;
     @ApiModelProperty(value = "存放位置")
     private String positionName;
+    @ApiModelProperty(value = "使用部门id")
+    private String useDep;
     @ApiModelProperty(value = "使用部门")
     private String useDepName;
+    @ApiModelProperty(value = "维保部门id")
+    private String serviceDep;
     @ApiModelProperty(value = "维保部门")
     private String serviceDepName;
     @ApiModelProperty(value = "联系方式")
@@ -40,6 +48,10 @@ public class BrainDeviceDTO extends TenantDTO {
     @ApiModelProperty(value = "启用时间")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     private String enableTime;
+    @ApiModelProperty(value = "图片")
+    private String pictures;
+    @ApiModelProperty(value = "文件")
+    private String files;
     @ApiModelProperty(value = "创建人")
     private String creatorName;
 

@@ -700,7 +700,7 @@ public class ModelConstants {
      */
     public static final String BRAINDEVICECAGEGORY_TABLE_NAME = "qg_brain_device_category";//设备类型
     public static final String BRAINDEVICEPOSITION_TABLE_NAME = "qg_brain_device_position";//存放位置
-    public static final String BRAINDEVICE_TABLE_NAME = "qg_brain_device_position";//设备台账
+    public static final String BRAINDEVICE_TABLE_NAME = "qg_brain_device";//设备台账
 
     protected static final String[] NONE_AGGREGATION_COLUMNS = new String[]{LONG_VALUE_COLUMN, DOUBLE_VALUE_COLUMN, BOOLEAN_VALUE_COLUMN, STRING_VALUE_COLUMN, JSON_VALUE_COLUMN, KEY_COLUMN, TS_COLUMN};
 

@@ -23,11 +23,11 @@
     </resultMap>
     <select id="getDataPage" resultMap="brainDeviceMap">
         SELECT
-        o.id,o.name,o.code,o.model,o.status,o.notes,o.contact_info,o.enable_time,o.create_time,o.updater,o.update_time,o.creator,c.name as categoryName,p.name as positionName,u.name as useDepName,s.name as serviceDepName
+        o.id,o.name,o.code,o.model,o.status,o.notes,o.contact_info,o.enable_time,o.create_time,o.updater,o.update_time,o.creator,c.name as categoryName,p.position as positionName,u.name as useDepName,s.name as serviceDepName
         from qg_brain_device o
-        left join qg_barin_device_category c on o.category_id = c.id
+        left join qg_brain_device_category c on o.category_id = c.id
         left join qg_brain_device_position p on o.position_id = p.id
-        left join tk_organization u on o.use_dep = t.id
+        left join tk_organization u on o.use_dep = u.id
         left join tk_organization s on o.service_dep = s.id
         <where>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">