Browse Source

组态设计器,bug 修复,需求优化

thing_master
xiachao 1 year ago
parent
commit
ccb8da7e2d
  1. 10
      modules/visual-design/src/main/java/com/thing/visual/board/dto/IotVisualManageDTO.java
  2. 4
      modules/visual-design/src/main/java/com/thing/visual/board/entity/IotVisualManageEntity.java
  3. 1
      modules/visual-design/src/main/java/com/thing/visual/configuration/dto/IotVisualDesignDTO.java
  4. 6
      modules/visual-design/src/main/java/com/thing/visual/configuration/entity/IotVisualDesignEntity.java
  5. 6
      modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java

10
modules/visual-design/src/main/java/com/thing/visual/board/dto/IotVisualManageDTO.java

@ -32,16 +32,6 @@ public class IotVisualManageDTO implements Serializable {
private String type; private String type;
@Schema(description = "缩略图url") @Schema(description = "缩略图url")
private String thumbnailUrl; private String thumbnailUrl;
@Schema(description = "看板详情的背景图片")
private String backgroundImage;
@Schema(description = "看板详情的颜色")
private String backgroundColor;
@Schema(description = "看板详情的对比度")
private String backgroundRepeat;
@Schema(description = "看板详情的尺寸")
private String backgroundSize;
@Schema(description = "是否默认背景")
private Boolean isDefaultBackImg;
@Schema(description = "是否为模板") @Schema(description = "是否为模板")
private Object isTemplate; private Object isTemplate;
@Schema(description = "备注") @Schema(description = "备注")

4
modules/visual-design/src/main/java/com/thing/visual/board/entity/IotVisualManageEntity.java

@ -35,10 +35,6 @@ public class IotVisualManageEntity extends BaseInfoEntity {
* 缩略图url * 缩略图url
*/ */
private String thumbnailUrl; private String thumbnailUrl;
/**
* 看板详情的背景图片
*/
private String backgroundImage;
/** /**
* 是否为模板 * 是否为模板
*/ */

1
modules/visual-design/src/main/java/com/thing/visual/configuration/dto/IotVisualDesignDTO.java

@ -36,6 +36,7 @@ public class IotVisualDesignDTO implements Serializable {
private String apiSetIds; private String apiSetIds;
@Schema(description = "超级api详细信息集合,用于组态设计编辑/查看,回显使用") @Schema(description = "超级api详细信息集合,用于组态设计编辑/查看,回显使用")
private List<IotThingApiDTO> iotThingApiDTOList; private List<IotThingApiDTO> iotThingApiDTOList;
public String previewUrl; public String previewUrl;
@Schema(description = "boardType") @Schema(description = "boardType")

6
modules/visual-design/src/main/java/com/thing/visual/configuration/entity/IotVisualDesignEntity.java

@ -28,12 +28,6 @@ public class IotVisualDesignEntity {
* 组态看板id * 组态看板id
*/ */
private Long boardManageId; private Long boardManageId;
/**
* 页面名称
*/
private String pageName;
/** /**
* 图数据 * 图数据
*/ */

6
modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java

@ -113,6 +113,11 @@ public class IotVisualDesignServiceImpl extends BaseServiceImpl<IotVisualDesignM
QueryWrapper wrapper = new QueryWrapper(); QueryWrapper wrapper = new QueryWrapper();
wrapper.eq("board_manage_id",id); wrapper.eq("board_manage_id",id);
IotVisualDesignDTO data = this.getOneAs(wrapper, IotVisualDesignDTO.class); IotVisualDesignDTO data = this.getOneAs(wrapper, IotVisualDesignDTO.class);
IotVisualManageEntity manageEntity = iotVisualManageService.getById(id);
data.setThumbnailUrl(manageEntity.getThumbnailUrl());
data.setPageName(manageEntity.getName());
data.setPreviewUrl(manageEntity.getPreviewUrl());
if(ObjectUtil.isNotEmpty(data)){ if(ObjectUtil.isNotEmpty(data)){
if(StringUtils.isNotBlank(data.getApiSetIds())){ if(StringUtils.isNotBlank(data.getApiSetIds())){
List<String> apiIds = Arrays.asList(data.getApiSetIds().split(",")); List<String> apiIds = Arrays.asList(data.getApiSetIds().split(","));
@ -135,6 +140,7 @@ public class IotVisualDesignServiceImpl extends BaseServiceImpl<IotVisualDesignM
iotVisualManageDTO.setId(dto.getBoardManageId()); iotVisualManageDTO.setId(dto.getBoardManageId());
iotVisualManageDTO.setThumbnailUrl(dto.getThumbnailUrl()); iotVisualManageDTO.setThumbnailUrl(dto.getThumbnailUrl());
iotVisualManageDTO.setPreviewUrl(dto.getPreviewUrl()); iotVisualManageDTO.setPreviewUrl(dto.getPreviewUrl());
iotVisualManageDTO.setName(dto.getPageName());
iotVisualManageService.updateDto(iotVisualManageDTO); iotVisualManageService.updateDto(iotVisualManageDTO);
} }
} }
Loading…
Cancel
Save