feat:看板改版

@@ -44,7 +44,8 @@ public class TkDataBoardController extends BaseController {
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType,
       @RequestParam(value = "organizationId", required = false) String organizationId,
       @RequestParam(value = "organizationId", required = false) String organizationId,
-      @RequestParam(value = "name", required = false) String name)
+      @RequestParam(value = "name", required = false) String name,
+      @RequestParam(value = "platform", required = false) String platform)
       throws ThingsboardException {
       throws ThingsboardException {
     Map<String, Object> queryMap = new HashMap<>();
     Map<String, Object> queryMap = new HashMap<>();
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE_SIZE, pageSize);
@@ -58,6 +59,9 @@ public class TkDataBoardController extends BaseController {
     if (StringUtils.isNotBlank(name)) {
     if (StringUtils.isNotBlank(name)) {
       queryMap.put("name", name);
       queryMap.put("name", name);
     }
     }
+    if (StringUtils.isNotBlank(platform)) {
+      queryMap.put("platform", platform);
+    }
     queryMap.put("userId", getCurrentUser().getCurrentUserId());
     queryMap.put("userId", getCurrentUser().getCurrentUserId());
     TkPageData<DataBoardDTO> pageData =
     TkPageData<DataBoardDTO> pageData =
         tkDataBoardService.dataBoardPage(queryMap, getCurrentUser().isTenantAdmin());
         tkDataBoardService.dataBoardPage(queryMap, getCurrentUser().isTenantAdmin());

@@ -37,6 +37,7 @@ public class TkDataComponentController extends BaseController {
   private final TkDataComponentService ytDataComponentService;
   private final TkDataComponentService ytDataComponentService;
   private final TkDataBoardService ytDataBoardService;
   private final TkDataBoardService ytDataBoardService;
 
 
+
   @GetMapping("/{boardId}")
   @GetMapping("/{boardId}")
   @ApiOperation(value = "查询看板下的所有组件信息")
   @ApiOperation(value = "查询看板下的所有组件信息")
   @PreAuthorize(
   @PreAuthorize(
@@ -50,6 +51,8 @@ public class TkDataComponentController extends BaseController {
             getCurrentUser().getCurrentTenantId(), boardId);
             getCurrentUser().getCurrentTenantId(), boardId);
     moreDataComponentInfoDTO.setComponentLayout(dataBoardDTO.getLayout());
     moreDataComponentInfoDTO.setComponentLayout(dataBoardDTO.getLayout());
     moreDataComponentInfoDTO.setComponentData(data);
     moreDataComponentInfoDTO.setComponentData(data);
+    DataBoardDTO dataDto = ytDataBoardService.findDataBoardInfoById(boardId,getCurrentUser().getCurrentTenantId());
+    moreDataComponentInfoDTO.setPhoneModel(StringUtils.isEmpty(dataDto.getPhoneModel())?null:dataDto.getPhoneModel());
     return ResponseResult.success(moreDataComponentInfoDTO);
     return ResponseResult.success(moreDataComponentInfoDTO);
   }
   }
 
 

@@ -28,4 +28,10 @@ public class DataBoardDTO extends PublicCustomerDTO {
 
 
   @ApiModelProperty(value = "组件数")
   @ApiModelProperty(value = "组件数")
   private Integer componentNum;
   private Integer componentNum;
+
+  @ApiModelProperty(value = "适用终端")
+  private String platform;
+  @ApiModelProperty(value = "手机型号")
+  private String phoneModel;
+
 }
 }

@@ -17,4 +17,8 @@ public class MoreDataComponentInfoDTO implements Serializable {
 
 
   @ApiModelProperty("组件布局信息")
   @ApiModelProperty("组件布局信息")
   private List<ComponentLayoutDTO> componentLayout;
   private List<ComponentLayoutDTO> componentLayout;
+
+  @ApiModelProperty("设备型号")
+  private  String phoneModel;
+
 }
 }

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.EnumTypeHandler;
 import org.apache.ibatis.type.EnumTypeHandler;
@@ -34,4 +35,8 @@ public class TkDataBoardEntity extends TenantBaseEntity {
 
 
   @TableField(updateStrategy = FieldStrategy.IGNORED)
   @TableField(updateStrategy = FieldStrategy.IGNORED)
   private String accessCredentials;
   private String accessCredentials;
+
+  private String platform;
+
+  private String phoneModel;
 }
 }

@@ -39,6 +39,7 @@ public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
   public TkPageData<DataBoardDTO> dataBoardPage(Map<String, Object> queryMap, boolean tenantAdmin) {
   public TkPageData<DataBoardDTO> dataBoardPage(Map<String, Object> queryMap, boolean tenantAdmin) {
     int zero = FastIotConstants.MagicNumber.ZERO;
     int zero = FastIotConstants.MagicNumber.ZERO;
     String name = null != queryMap.get("name") ? queryMap.get("name").toString() : null;
     String name = null != queryMap.get("name") ? queryMap.get("name").toString() : null;
+    String platform = null != queryMap.get("platform") ? queryMap.get("platform").toString() : null;
     String tenantId =
     String tenantId =
         Optional.ofNullable(queryMap.get("tenantId"))
         Optional.ofNullable(queryMap.get("tenantId"))
             .map(Object::toString)
             .map(Object::toString)
@@ -69,6 +70,7 @@ public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
             getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false),
             getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false),
             new LambdaQueryWrapper<TkDataBoardEntity>()
             new LambdaQueryWrapper<TkDataBoardEntity>()
                 .eq(TkDataBoardEntity::getTenantId, tenantId)
                 .eq(TkDataBoardEntity::getTenantId, tenantId)
+                .eq(StringUtils.isNotEmpty(platform), TkDataBoardEntity::getPlatform, platform)
                 .like(StringUtils.isNotEmpty(name), TkDataBoardEntity::getName, name)
                 .like(StringUtils.isNotEmpty(name), TkDataBoardEntity::getName, name)
                 .in(
                 .in(
                     null != organizationIds && organizationIds.size() > zero,
                     null != organizationIds && organizationIds.size() > zero,