Merge branch 'fix/3d-component-3' into 'master_dev'

fix:将3d-compoent模块的json以文件形式存储

See merge request yunteng/thingskit!455

@@ -7,9 +7,10 @@ update tk_configuration_content_node set configuration_node_id = id;
 CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
 update tk_configuration_content_node set id = uuid_generate_v4();
 
+--添加3d组件的新表
+DROP TABLE IF EXISTS "public"."tk_3d_component";
 CREATE TABLE "public"."tk_3d_component" (
                                             "id" varchar(36) COLLATE "pg_catalog"."default" NOT NULL,
-                                            "content" text COLLATE "pg_catalog"."default" NOT NULL,
                                             "creator" varchar(36) COLLATE "pg_catalog"."default",
                                             "updater" varchar(36) COLLATE "pg_catalog"."default",
                                             "tenant_id" varchar(36) COLLATE "pg_catalog"."default" NOT NULL,
@@ -17,11 +18,11 @@ CREATE TABLE "public"."tk_3d_component" (
                                             "update_time" timestamp(6),
                                             "name" varchar(128) COLLATE "pg_catalog"."default",
                                             "state" int2,
-                                            "image_url" varchar(255) COLLATE "pg_catalog"."default"
+                                            "image_url" varchar(255) COLLATE "pg_catalog"."default",
+                                            "json_path" varchar(1024) COLLATE "pg_catalog"."default"
 )
 ;
 COMMENT ON COLUMN "public"."tk_3d_component"."id" IS '主建';
-COMMENT ON COLUMN "public"."tk_3d_component"."content" IS '模板内容';
 COMMENT ON COLUMN "public"."tk_3d_component"."creator" IS '创建用户';
 COMMENT ON COLUMN "public"."tk_3d_component"."updater" IS '更新用户';
 COMMENT ON COLUMN "public"."tk_3d_component"."tenant_id" IS '租户ID';

@@ -6,12 +6,18 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.FileCopyUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
@@ -23,11 +29,11 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.Tk3dComponentService;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
@@ -44,6 +50,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequestMapping("api/yt/3d_component")
 @Api(tags = {"3D模型管理"})
 @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+@Slf4j
 public class Tk3dComponentController extends BaseController {
     @Resource
     Tk3dComponentService tk3dComponentService;
@@ -82,7 +89,7 @@ public class Tk3dComponentController extends BaseController {
 
     @PostMapping
     @ApiOperation("保存")
-    public ResponseEntity<Tk3dComponentDTO> save(@ApiParam("id") @RequestParam("id") String id, @RequestParam("imageUrl") String imageUrl, @RequestBody JsonNode jsonNode) throws ThingsboardException {
+    public ResponseEntity<Tk3dComponentDTO> save(@ApiParam("id") @RequestParam("id") String id, @RequestParam("imageUrl") String imageUrl, @RequestBody JsonNode jsonNode) throws Exception {
         if (!StringUtils.hasLength(id)) {
             throw new TkDataValidationException(MessageUtils.message(ErrorMessage.INVALID_PARAMETER.getI18nCode()));
         }
@@ -90,8 +97,7 @@ public class Tk3dComponentController extends BaseController {
         dto.setId(id);
         dto.setImageUrl(imageUrl);
         dto.setTenantId(getTenantId().getId().toString());
-        dto.setContent(jsonNode);
-        return ResponseEntity.ok(tk3dComponentService.save(dto));
+        return ResponseEntity.ok(tk3dComponentService.save(dto,jsonNode));
     }
 
     @PutMapping("/{id}/{name}")
@@ -119,6 +125,7 @@ public class Tk3dComponentController extends BaseController {
 
 
     @PutMapping("/publish/{state}")
+    @ApiOperation("批量发布")
     public ResponseEntity<Boolean> publish(@PathVariable("state") Integer state, @RequestBody List<String> ids) throws ThingsboardException {
         if (!CollectionUtils.isEmpty(ids)) {
 
@@ -163,13 +170,26 @@ public class Tk3dComponentController extends BaseController {
 
     @GetMapping("/json/{id}/{key}.json")
     @ApiOperation("获取json数据")
-    public ResponseEntity<JsonNode> json(@PathVariable("id") String id, @PathVariable("key") String key)
-            throws Exception {
-        Tk3dComponentDTO dto = tk3dComponentService.get(id, getCurrentUser().getCurrentTenantId());
-        if (null == dto) {
+    public ResponseEntity<JsonNode> json(@PathVariable("id") String id, @PathVariable("key") String key) throws Exception {
+        try {
+            JsonNode jsonNode=JacksonUtil.toJsonNode(tk3dComponentService.downloadFile(id));
+            if(jsonNode==null){
+                return ResponseEntity.ok(null);
+            }
+            if(StringUtils.hasLength(key)){
+               if(key.equalsIgnoreCase("root") || key.equalsIgnoreCase("all") ){
+                   return ResponseEntity.ok(jsonNode);
+               }else {
+                   return ResponseEntity.ok(jsonNode.get(key));
+               }
+            }
+            else {
+                return ResponseEntity.ok(jsonNode);
+            }
+        }catch(Exception e) {
+            log.error(e.getMessage(),e);
             throw new TkDataValidationException(MessageUtils.message(ErrorMessage.INVALID_PARAMETER.getI18nCode()));
         }
-        return ResponseEntity.ok(dto.getContent().get(key));
     }
 
     @DeleteMapping
@@ -179,20 +199,4 @@ public class Tk3dComponentController extends BaseController {
         return ResponseEntity.ok(tk3dComponentService.delete(getCurrentUser().getCurrentTenantId(), ids));
     }
 
-    @Data
-    private static class ComponentParam {
-
-        @ApiModelProperty("ID")
-        String id;
-
-        @ApiModelProperty("名称")
-        String name;
-
-        @ApiModelProperty("是否发布：0否，1是")
-        Integer state;
-
-        @ApiModelProperty("图标地址")
-        String imageUrl;
-    }
-
 }

@@ -1867,4 +1867,6 @@ thingskit:
     date: "${THINGSKIT_RELEASE_DATE:20240930}"
 
 protocol-template:
-  path: "${PROTOCOL_TEMPLATE_PTH:./protocol-template}"
\ No newline at end of file
+  path: "${PROTOCOL_TEMPLATE_PATH:./protocol-template}"
+3d-component:
+  path: "${3D-COMPONENT_PATH:./3d-component}"
\ No newline at end of file

 package org.thingsboard.server.dao.yunteng.service;
+import com.fasterxml.jackson.databind.JsonNode;
+import io.minio.errors.*;
 import org.thingsboard.server.common.data.yunteng.dto.Tk3dComponentDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 
+import java.io.File;
+import java.io.IOException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.util.List;
 import java.util.Map;
 
@@ -15,9 +21,13 @@ import java.util.Map;
  */
 public interface Tk3dComponentService  {
     TkPageData<Tk3dComponentDTO> page(Map<String, Object> queryMap, String tenantId );
+
+    Tk3dComponentDTO save(Tk3dComponentDTO dto, JsonNode jsonNode) throws Exception;
     Tk3dComponentDTO save(Tk3dComponentDTO dto);
 
     boolean save(List<Tk3dComponentDTO> dto);
     Tk3dComponentDTO get(String id, String tenantId);
     boolean delete(String tenantId, List<String> ids);
+
+    public String downloadFile(String id) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException;
 }

 package org.thingsboard.server.common.data.yunteng.core.utils;
 
+import io.minio.errors.*;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;
 import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.io.InputStream;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 
 public interface FileStorageService {
 
@@ -24,10 +28,12 @@ public interface FileStorageService {
    * @param fileName 待下载文件名
    * @param response {@link HttpServletResponse}
    */
-  ResponseEntity<?> download(
-      String fileName, HttpServletRequest request, HttpServletResponse response);
+  ResponseEntity<?> download(String fileName, HttpServletRequest request, HttpServletResponse response);
+
+  InputStream download(String fileName) throws IOException, ServerException, InsufficientDataException, ErrorResponseException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException;
 
   String uploadFile(String fileName, String contentType, InputStream inputStream ) throws Exception;
 
   boolean deleteFile(String deleteFilePath);
+
 }

@@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -123,6 +124,13 @@ public class LocalFileStorageService implements FileStorageService {
   }
 
   @Override
+  public InputStream download(String file) throws IOException {
+    String fileName=file.substring(file.lastIndexOf("/")+1);
+    String filePath=fileStorageProperties.getUploadDir()+File.separator+ fileName;
+     return new FileInputStream(new File(filePath));
+  }
+
+  @Override
   public String uploadFile(String fileName, String contentType, InputStream inputStream )
       throws IOException {
     String name = storeFileByInputStream(fileName, inputStream);
@@ -143,6 +151,7 @@ public class LocalFileStorageService implements FileStorageService {
     return false;
   }
 
+
   private String storeFileByInputStream(String fileName, InputStream inputStream)
       throws IOException {
     // random fileName if needed

@@ -166,6 +166,17 @@ public class MinioFileStorageService implements FileStorageService {
   }
 
   @Override
+  public InputStream download(String fileName) throws IOException, ServerException, InsufficientDataException, ErrorResponseException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
+     InputStream inputStream =
+            minioClient.getObject(
+                    GetObjectArgs.builder()
+                            .bucket(fileStorageProperties.getBucketName())
+                            .object(fileName.split(fileStorageProperties.getBucketName())[1])
+                            .build());
+    return inputStream;
+  }
+
+  @Override
   public String uploadFile(String fileName, String contentType, InputStream inputStream )
       throws IOException {
     try {

@@ -23,9 +23,6 @@ public class Tk3dComponentDTO extends BaseDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("模板内容")
-    private JsonNode content;
-
     @ApiModelProperty("名称")
     String name;
 

@@ -25,7 +25,9 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 @TableName(ModelConstants.Table.TK_3D_COMPONENT_NAME)
 @ApiModel(value = "Tk3dComponentEntity对象")
 public class Tk3dComponentEntity extends TenantBaseEntity implements Serializable {
+
     private static final long serialVersionUID = -4715245103595332141L;
+
     @TableField
     String name;
 
@@ -33,11 +35,9 @@ public class Tk3dComponentEntity extends TenantBaseEntity implements Serializabl
     String imageUrl;
 
     @TableField
-    @ApiModelProperty("是否发布：0否，1是")
-    Integer state=0;
+    String jsonPath;
 
-    @ApiModelProperty("模板内容")
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private JsonNode content;
+    @TableField
+    Integer state=0;
 
 }

@@ -2,25 +2,38 @@ package org.thingsboard.server.dao.yunteng.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.commons.lang3.StringUtils;
+import com.fasterxml.jackson.databind.JsonNode;
+import io.minio.errors.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.FileCopyUtils;
+import org.springframework.util.StringUtils;
 import org.thingsboard.server.common.data.yunteng.constant.QueryConstant;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.core.utils.FileStorageService;
 import org.thingsboard.server.common.data.yunteng.dto.Tk3dComponentDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.i18n.MessageUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.Tk3dComponentEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkAlarmEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkProtocolTemplateEntity;
 import org.thingsboard.server.dao.yunteng.mapper.Tk3dComponentMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.Tk3dComponentService;
 
+import java.io.*;
+import java.net.URI;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * <p>
@@ -31,34 +44,39 @@ import java.util.Map;
  * @since 2024-10-14
  */
 @Service
+@Slf4j
 public class Tk3dComponentServiceImpl extends AbstractBaseService<Tk3dComponentMapper, Tk3dComponentEntity> implements Tk3dComponentService {
 
+    @Autowired
+    FileStorageService fileStorageService;
+
+    static final String base="/3d-component";
+
     @Override
     public TkPageData<Tk3dComponentDTO> page(Map<String, Object> queryMap, String tenantId) {
-        IPage<Tk3dComponentEntity> iPage =baseMapper.page(getPage(queryMap, queryMap.containsKey(QueryConstant.ORDER_FILED) ? queryMap.get(QueryConstant.ORDER_FILED).toString() : "create_time", queryMap.containsKey(QueryConstant.ORDER_TYPE) ? queryMap.get(QueryConstant.ORDER_TYPE).toString().equalsIgnoreCase(OrderTypeEnum.ASC.name()) : false),tenantId,queryMap);
+        IPage<Tk3dComponentEntity> iPage = baseMapper.page(getPage(queryMap, queryMap.containsKey(QueryConstant.ORDER_FILED) ? queryMap.get(QueryConstant.ORDER_FILED).toString() : "create_time", queryMap.containsKey(QueryConstant.ORDER_TYPE) ? queryMap.get(QueryConstant.ORDER_TYPE).toString().equalsIgnoreCase(OrderTypeEnum.ASC.name()) : false), tenantId, queryMap);
         return getPageData(iPage, Tk3dComponentDTO.class);
     }
 
     @Override
-    public Tk3dComponentDTO save(Tk3dComponentDTO dto) {
-
-        if (baseMapper.exists(new LambdaQueryWrapper<Tk3dComponentEntity>()
-                .eq(Tk3dComponentEntity::getTenantId, dto.getTenantId())
-                .eq(Tk3dComponentEntity::getId, dto.getId()))) {
-            baseMapper.updateById(dto.getEntity(Tk3dComponentEntity.class));
-        } else {
-            Tk3dComponentEntity entity=dto.getEntity(Tk3dComponentEntity.class);
-            entity.setState(0);
-            baseMapper.insert(entity);
-        }
+    public Tk3dComponentDTO save(Tk3dComponentDTO dto, JsonNode jsonNode) throws Exception {
+        Tk3dComponentEntity entity = dto.getEntity(Tk3dComponentEntity.class);
+        entity.setJsonPath(createFile(dto.getId(),jsonNode));
+        save(entity);
+        return entity.getDTO(Tk3dComponentDTO.class);
+    }
 
-        return dto;
+    @Override
+    public Tk3dComponentDTO save(Tk3dComponentDTO dto) {
+        Tk3dComponentEntity entity = dto.getEntity(Tk3dComponentEntity.class);
+        save(entity);
+        return entity.getDTO(Tk3dComponentDTO.class);
     }
 
     @Override
     public boolean save(List<Tk3dComponentDTO> list) {
-        if(!CollectionUtils.isEmpty(list)){
-            list.stream().forEach(e->{
+        if (!CollectionUtils.isEmpty(list)) {
+            list.stream().forEach(e -> {
                 save(e);
             });
             return true;
@@ -66,6 +84,18 @@ public class Tk3dComponentServiceImpl extends AbstractBaseService<Tk3dComponentM
         return false;
     }
 
+    private boolean save(Tk3dComponentEntity entity) {
+        if (baseMapper.exists(new LambdaQueryWrapper<Tk3dComponentEntity>()
+                .eq(Tk3dComponentEntity::getTenantId, entity.getTenantId())
+                .eq(Tk3dComponentEntity::getId, entity.getId()))) {
+            return baseMapper.updateById(entity)>0;
+        } else {
+            entity.setState(0);
+            return baseMapper.insert(entity)>0;
+        }
+    }
+
+
     @Override
     public Tk3dComponentDTO get(String id, String tenantId) {
         Tk3dComponentEntity e = baseMapper.selectById(id);
@@ -78,10 +108,48 @@ public class Tk3dComponentServiceImpl extends AbstractBaseService<Tk3dComponentM
 
     @Override
     public boolean delete(String tenantId, List<String> ids) {
-        if(null ==ids){
+        if (null == ids) {
             throw new TkDataValidationException(MessageUtils.message(ErrorMessage.INVALID_PARAMETER.getI18nCode()));
         }
-    return baseMapper.delete(new LambdaQueryWrapper<Tk3dComponentEntity>().eq(Tk3dComponentEntity::getTenantId,tenantId)
-            .in(Tk3dComponentEntity::getId,ids))>0;
+        ids.stream().forEach(id->{
+            deleteFile(id);
+        });
+        return baseMapper.delete(new LambdaQueryWrapper<Tk3dComponentEntity>().eq(Tk3dComponentEntity::getTenantId, tenantId)
+                .in(Tk3dComponentEntity::getId, ids)) >0;
+    }
+
+
+
+
+
+
+    public void deleteFile(String id) {
+        Tk3dComponentEntity e = baseMapper.selectById(id);
+        if(e!=null && StringUtils.hasLength(e.getJsonPath())) {
+            fileStorageService.deleteFile(e.getJsonPath());
+        }
+    }
+
+    public String createFile(String id, JsonNode jsonNode) throws Exception {
+        try {
+            deleteFile(id);
+            return fileStorageService.uploadFile(getJsonName(id),"json",new ByteArrayInputStream(jsonNode.toPrettyString().getBytes()));
+        } catch (Exception e) {
+            log.error(e.getMessage(),e);
+            return null;
+        }
+    }
+
+    public String downloadFile(String id) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
+        Tk3dComponentEntity e = baseMapper.selectById(id);
+        if(e!=null && StringUtils.hasLength(e.getJsonPath())) {
+            InputStream inputStream = fileStorageService.download(e.getJsonPath());
+            return FileCopyUtils.copyToString(new InputStreamReader(inputStream));
+        }
+        return null;
+    }
+
+    private static  String getJsonName(String id){
+        return id+".json";
     }
 }