组态bug 迭代修复

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<IotVisualManageDTO> get(@PathVariable("id") Long id){
         IotVisualManageDTO data = iotVisualManageService.getIotBoardManageDTO(id);
+        data.setThumbnailUrl(OSSFactory.splice(data.getThumbnailUrl()));
         checkParam(data);
         return new Result<IotVisualManageDTO>().ok(data);
     }

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;
 
 /**
  * 组态大屏管理

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<IotVisualManageM
     public PageData<IotVisualManageDTO> pageIotBoardManageDTO(Map<String, Object> params) {
         PageData<IotVisualManageDTO> 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);

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<IotVisualDesignM
         IotVisualDesignEntity entity = mapper.selectOneByQuery(wrapper);
         if(ObjectUtil.isNotNull(entity)){
             dto.setId(entity.getId());
-            this.updateDto(dto);
+            this.updateIotBoardManageDTO(dto);
         }else {
+            dto.setThumbnailUrl(OSSFactory.cutOut(dto.getThumbnailUrl()));
             this.saveDto(dto);
         }
-        this.updateIotBoardManageDTO(dto);
     }
 
     @Override
@@ -140,7 +141,7 @@ public class IotVisualDesignServiceImpl extends BaseServiceImpl<IotVisualDesignM
     public void updateIotBoardManageDTO(IotVisualDesignDTO dto){
         IotVisualManageDTO iotVisualManageDTO = new IotVisualManageDTO();
         iotVisualManageDTO.setId(dto.getBoardManageId());
-        iotVisualManageDTO.setThumbnailUrl(dto.getThumbnailUrl());
+        iotVisualManageDTO.setThumbnailUrl(OSSFactory.cutOut(dto.getThumbnailUrl()));
         iotVisualManageDTO.setPreviewUrl(dto.getPreviewUrl());
         iotVisualManageDTO.setName(dto.getPageName());
         iotVisualManageService.updateDto(iotVisualManageDTO);