diff --git a/modules/visual-design/src/main/java/com/thing/visual/board/controller/IotVisualManageController.java b/modules/visual-design/src/main/java/com/thing/visual/board/controller/IotVisualManageController.java index 9a6dc49..f10689f 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/board/controller/IotVisualManageController.java +++ b/modules/visual-design/src/main/java/com/thing/visual/board/controller/IotVisualManageController.java @@ -13,6 +13,7 @@ import com.thing.common.core.validator.group.DefaultGroup; import com.thing.common.core.validator.group.UpdateGroup; import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; +import com.thing.sys.oss.cloud.OSSFactory; import com.thing.sys.security.context.UserContext; import com.thing.visual.board.dto.IotVisualManageDTO; import com.thing.visual.board.service.IotVisualManageService; @@ -64,6 +65,7 @@ public class IotVisualManageController { @Operation(summary="信息") public Result get(@PathVariable("id") Long id){ IotVisualManageDTO data = iotVisualManageService.getIotBoardManageDTO(id); + data.setThumbnailUrl(OSSFactory.splice(data.getThumbnailUrl())); checkParam(data); return new Result().ok(data); } diff --git a/modules/visual-design/src/main/java/com/thing/visual/board/dto/IotVisualManageDTO.java b/modules/visual-design/src/main/java/com/thing/visual/board/dto/IotVisualManageDTO.java index 5fb2589..5c56316 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/board/dto/IotVisualManageDTO.java +++ b/modules/visual-design/src/main/java/com/thing/visual/board/dto/IotVisualManageDTO.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; /** * 组态大屏管理 diff --git a/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java b/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java index 9553b92..9bf039b 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java +++ b/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java @@ -29,6 +29,7 @@ import com.thing.sys.biz.service.SysLanguageService; import com.thing.sys.biz.service.SysMenuService; import com.thing.sys.biz.service.SysRoleMenuService; import com.thing.sys.biz.service.SysRoleService; +import com.thing.sys.oss.cloud.OSSFactory; import com.thing.sys.security.context.TenantContext; import com.thing.sys.security.context.UserContext; import com.thing.sys.security.domain.SecurityUser; @@ -48,18 +49,15 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; import static com.mybatisflex.core.query.QueryMethods.column; import static com.thing.visual.board.entity.table.IotVisualManageEntityTableDef.IOT_VISUAL_MANAGE_ENTITY; -import static com.thing.visual.component.entity.table.IotVisualComponentEntityTableDef.IOT_VISUAL_COMPONENT_ENTITY; /** * 组态大屏管理 @@ -183,6 +181,7 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl pageIotBoardManageDTO(Map params) { PageData pageData = this.getPageData(params, IotVisualManageDTO.class); pageData.getList().forEach(temp->{ + temp.setThumbnailUrl(OSSFactory.splice(temp.getThumbnailUrl())); SysMenuDTO sysMenuDTO = sysMenuService.getByUrl("visual/preview?id=" + temp.getId()); if (ObjectUtil.isNotNull(sysMenuDTO)) { temp.setSysMenuDTO(sysMenuDTO); diff --git a/modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java b/modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java index 4642dcb..a240a95 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java +++ b/modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil; import com.mybatisflex.core.query.QueryWrapper; import com.thing.common.core.utils.ConvertUtils; import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.sys.oss.cloud.OSSFactory; import com.thing.thing.api.dto.IotThingApiDTO; import com.thing.thing.api.mapper.IotThingApiMapper; import com.thing.visual.board.dto.IotVisualManageDTO; @@ -84,11 +85,11 @@ public class IotVisualDesignServiceImpl extends BaseServiceImpl