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

feat: 添加3d组件编辑器数据存储

See merge request yunteng/thingskit!448

@@ -5,4 +5,32 @@ COMMENT ON COLUMN "public"."tk_configuration_content_node"."configuration_node_i
 update tk_configuration_content_node set configuration_node_id = id;
 --更新组态内容节点表的主键ID为uuid
 CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
-update tk_configuration_content_node set id = uuid_generate_v4();
\ No newline at end of file
+update tk_configuration_content_node set id = uuid_generate_v4();
+
+--添加3d组件的新表
+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,
+                                            "create_time" timestamp(6),
+                                            "update_time" timestamp(6),
+                                            "name" varchar(128) COLLATE "pg_catalog"."default",
+                                            "state" int2
+)
+;
+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';
+COMMENT ON COLUMN "public"."tk_3d_component"."create_time" IS '创建时间';
+COMMENT ON COLUMN "public"."tk_3d_component"."update_time" IS '更新时间';
+COMMENT ON COLUMN "public"."tk_3d_component"."name" IS '名称';
+COMMENT ON COLUMN "public"."tk_3d_component"."state" IS '状态:0未发布，1已发布';
+
+-- ----------------------------
+-- Primary Key structure for table tk_3d_component
+-- ----------------------------
+ALTER TABLE "public"."tk_3d_component" ADD CONSTRAINT "tk_3d_component_pkey" PRIMARY KEY ("id");
\ No newline at end of file

@@ -249,7 +249,7 @@ public class ThingsboardSecurityConfiguration {
                 .exceptionHandling().accessDeniedHandler(restAccessDeniedHandler)
                 .and()
                 .addFilterBefore(buildRestLoginProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
-				//thingskit
+                //thingskit
                 .addFilterBefore(buildSmsCodeLoginProcessingFilter(),UsernamePasswordAuthenticationFilter.class)
                 .addFilterBefore(buildRestPublicLoginProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
                 .addFilterBefore(buildJwtTokenAuthenticationProcessingFilter(), UsernamePasswordAuthenticationFilter.class)

+package org.thingsboard.server.controller.yunteng;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+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;
+import org.thingsboard.server.common.data.yunteng.dto.*;
+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.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 static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 黎剑发
+ * @since 2024-10-14
+ */
+@RestController
+@RequestMapping("api/yt/3d_component")
+@Api(tags = {"3D模型管理"})
+@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+public class Tk3dComponentController extends BaseController {
+    @Resource
+    Tk3dComponentService tk3dComponentService;
+    @GetMapping(path = "/page")
+    @ApiOperation(value = "分页")
+    public TkPageData<Tk3dComponentDTO> page(
+            @RequestParam(value ="id", required = false) String id,
+            @RequestParam(value ="name", required = false) String name,
+            @RequestParam(value ="state", required = false) Integer state,
+            @RequestParam(PAGE_SIZE) int pageSize,
+            @RequestParam(PAGE) int page,
+            @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+            @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+            throws ThingsboardException {
+
+        HashMap<String, Object> queryMap = new HashMap<>();
+        queryMap.put(PAGE, page);
+        queryMap.put(PAGE_SIZE, pageSize);
+        queryMap.put(ORDER_FILED, orderBy!=null?orderBy:"create_time");
+        queryMap.put(ORDER_TYPE, orderType!=null?orderType.name():OrderTypeEnum.DESC.name());
+        queryMap.put(TENANT_ID,getTenantId().getId().toString());
+        if(StringUtils.hasLength(id)){
+            queryMap.put("id",id);
+        }
+        if(StringUtils.hasLength(name)){
+            queryMap.put("name",name);
+        }
+        if(state!=null){
+            queryMap.put("state",state);
+        }
+
+        return tk3dComponentService.page(queryMap,getTenantId().getId().toString());
+    }
+
+
+    @PostMapping("/{id}")
+    @ApiOperation("保存")
+    public ResponseEntity<Tk3dComponentDTO> save(@ApiParam("id")@PathVariable("id") String id, @RequestBody JsonNode jsonNode) throws ThingsboardException {
+        if(!StringUtils.hasLength(id)){
+            throw new TkDataValidationException(MessageUtils.message(ErrorMessage.INVALID_PARAMETER.getI18nCode()));
+        }
+        Tk3dComponentDTO dto=new Tk3dComponentDTO();
+        dto.setId(id);
+        dto.setTenantId(getTenantId().getId().toString());
+        dto.setContent(jsonNode);
+        return ResponseEntity.ok(tk3dComponentService.save(dto));
+    }
+
+    @PutMapping("/{id}/{name}")
+    @ApiOperation("修改名称")
+    public ResponseEntity<Tk3dComponentDTO> put(@PathVariable("id") String id,@PathVariable("name") String name) throws ThingsboardException {
+        if(!StringUtils.hasLength(id)){
+            throw new TkDataValidationException(MessageUtils.message(ErrorMessage.INVALID_PARAMETER.getI18nCode()));
+        }
+        Tk3dComponentDTO dto=tk3dComponentService.get(id, getCurrentUser().getCurrentTenantId());
+        dto.setName(name);
+        return ResponseEntity.ok(tk3dComponentService.save(dto));
+    }
+
+    @PutMapping("/publish/{id}/{state}")
+    @ApiOperation("发布")
+    public ResponseEntity<Tk3dComponentDTO> publish(@PathVariable("id") String id,@PathVariable("state") Integer state) throws ThingsboardException {
+        if(!StringUtils.hasLength(id)){
+            throw new TkDataValidationException(MessageUtils.message(ErrorMessage.INVALID_PARAMETER.getI18nCode()));
+        }
+        Tk3dComponentDTO dto=tk3dComponentService.get(id,getCurrentUser().getCurrentTenantId());
+        dto.setState(state);
+        return ResponseEntity.ok(tk3dComponentService.save(dto));
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation("获取详情信息")
+    public ResponseEntity<Tk3dComponentDTO> get(@PathVariable("id") String id)
+            throws Exception {
+        Tk3dComponentDTO dto = tk3dComponentService.get(id, getCurrentUser().getCurrentTenantId());
+        if (null == dto) {
+            throw new TkDataValidationException(MessageUtils.message(ErrorMessage.INVALID_PARAMETER.getI18nCode()));
+        }
+        return ResponseEntity.ok(dto);
+    }
+
+
+    @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) {
+            throw new TkDataValidationException(MessageUtils.message(ErrorMessage.INVALID_PARAMETER.getI18nCode()));
+        }
+        return ResponseEntity.ok(dto.getContent().get(key));
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    public ResponseEntity<Boolean> del(DeleteDTO deleteDTO) throws ThingsboardException {
+        List<String> ids = deleteDTO.getIds()==null?null:new ArrayList<>(deleteDTO.getIds());
+        return ResponseEntity.ok(tk3dComponentService.delete(getCurrentUser().getCurrentTenantId(),ids));
+    }
+
+}

+package org.thingsboard.server.dao.yunteng.service;
+import org.thingsboard.server.common.data.yunteng.dto.Tk3dComponentDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 黎剑发
+ * @since 2024-10-14
+ */
+public interface Tk3dComponentService  {
+    TkPageData<Tk3dComponentDTO> page(Map<String, Object> queryMap, String tenantId );
+    Tk3dComponentDTO save(Tk3dComponentDTO dto);
+    Tk3dComponentDTO get(String id, String tenantId);
+    boolean delete(String tenantId, List<String> ids);
+}

@@ -153,7 +153,8 @@ public final class ModelConstants {
     /** api调用记录表 */
     public static final String TK_OPEN_API_RECORD = "tk_open_api_record";
 
-
+    /** 3d组件表 */
+    public static final String TK_3D_COMPONENT_NAME = "tk_3d_component";
   }
 
   public static class TableFields {

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 黎剑发
+ * @since 2024-10-14
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+public class Tk3dComponentDTO extends TenantDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("模板内容")
+    private JsonNode content;
+
+    @ApiModelProperty("是否发布：0否，1是")
+    Integer state;
+
+
+}

@@ -297,6 +297,7 @@
             <artifactId>data-ext</artifactId>
             <scope>compile</scope>
         </dependency>
+
     </dependencies>
     <build>
         <plugins>

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 黎剑发
+ * @since 2024-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@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;
+
+    @TableField
+    @ApiModelProperty("是否发布：0否，1是")
+    Integer state;
+
+    @ApiModelProperty("模板内容")
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JsonNode content;
+
+}

+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 org.springframework.stereotype.Service;
+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.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.mapper.Tk3dComponentMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.Tk3dComponentService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author 黎剑发
+ * @since 2024-10-14
+ */
+@Service
+public class Tk3dComponentServiceImpl extends AbstractBaseService<Tk3dComponentMapper, Tk3dComponentEntity> implements Tk3dComponentService {
+
+    @Override
+    public TkPageData<Tk3dComponentDTO> page(Map<String, Object> queryMap, String tenantId) {
+        String id = queryMap.containsKey("id") ? queryMap.get("id").toString() : null;
+        String name = queryMap.containsKey("name") ? queryMap.get("name").toString() : null;
+        Integer state = queryMap.containsKey("state") ? Integer.parseInt(queryMap.get("state").toString()) : null;
+
+        IPage<Tk3dComponentEntity> iPage =
+                baseMapper.selectPage(
+                        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),
+                        new LambdaQueryWrapper<Tk3dComponentEntity>()
+                                .eq(StringUtils.isNotEmpty(tenantId), Tk3dComponentEntity::getTenantId, tenantId)
+                                .eq(StringUtils.isNotEmpty(id), Tk3dComponentEntity::getId, id)
+                                .like(StringUtils.isNotEmpty(name), Tk3dComponentEntity::getName, name)
+                                .eq(state!=null, Tk3dComponentEntity::getState, state)
+                );
+        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 {
+            baseMapper.insert(dto.getEntity(Tk3dComponentEntity.class));
+        }
+
+        return dto;
+    }
+
+    @Override
+    public Tk3dComponentDTO get(String id, String tenantId) {
+        Tk3dComponentEntity e = baseMapper.selectById(id);
+        if (e != null) {
+            return e.getDTO(Tk3dComponentDTO.class);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public boolean delete(String tenantId, List<String> 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;
+    }
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import org.thingsboard.server.dao.yunteng.entities.Tk3dComponentEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 黎剑发
+ * @since 2024-10-14
+ */
+@Mapper
+public interface Tk3dComponentMapper extends BaseMapper<Tk3dComponentEntity> {
+
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.thingsboard.server.dao.yunteng.mapper.Tk3dComponentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="org.thingsboard.server.dao.yunteng.entities.Tk3dComponentEntity">
+        <id column="id" property="id" />
+        <result column="content" property="content" />
+        <result column="created_time" property="createdTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="creator" property="creator" />
+        <result column="updater" property="updater" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, content, created_time, update_time, creator, updater, tenant_id
+    </sql>
+
+</mapper>