Merge branch 'fix/configure' into 'master_dev'

Fix/configure

See merge request yunteng/thingskit!451

@@ -7,7 +7,6 @@ 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组件的新表
 CREATE TABLE "public"."tk_3d_component" (
                                             "id" varchar(36) COLLATE "pg_catalog"."default" NOT NULL,
                                             "content" text COLLATE "pg_catalog"."default" NOT NULL,
@@ -17,7 +16,8 @@ CREATE TABLE "public"."tk_3d_component" (
                                             "create_time" timestamp(6),
                                             "update_time" timestamp(6),
                                             "name" varchar(128) COLLATE "pg_catalog"."default",
-                                            "state" int2
+                                            "state" int2,
+                                            "image_url" varchar(255) COLLATE "pg_catalog"."default"
 )
 ;
 COMMENT ON COLUMN "public"."tk_3d_component"."id" IS '主建';
@@ -28,9 +28,10 @@ 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已发布';
+COMMENT ON COLUMN "public"."tk_3d_component"."state" IS '状态:0创建，1发布';
+COMMENT ON COLUMN "public"."tk_3d_component"."image_url" IS '图标';
 
 -- ----------------------------
 -- 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
+ALTER TABLE "public"."tk_3d_component" ADD CONSTRAINT "tk_3d_component_pkey" PRIMARY KEY ("id");

@@ -2,8 +2,11 @@ package org.thingsboard.server.controller.yunteng;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.StringUtils;
@@ -73,14 +76,15 @@ public class Tk3dComponentController extends BaseController {
     }
 
 
-    @PostMapping("/{id}")
+    @PostMapping
     @ApiOperation("保存")
-    public ResponseEntity<Tk3dComponentDTO> save(@ApiParam("id")@PathVariable("id") String id, @RequestBody JsonNode jsonNode) throws ThingsboardException {
+    public ResponseEntity<Tk3dComponentDTO> save(@ApiParam("id")@RequestParam("id") String id, @RequestParam("imageUrl") String imageUrl,@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.setImageUrl(imageUrl);
         dto.setTenantId(getTenantId().getId().toString());
         dto.setContent(jsonNode);
         return ResponseEntity.ok(tk3dComponentService.save(dto));
@@ -97,6 +101,7 @@ public class Tk3dComponentController extends BaseController {
         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 {
@@ -138,4 +143,20 @@ 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;
+    }
+
 }

@@ -86,6 +86,9 @@ import org.thingsboard.server.service.edge.rpc.yunteng.sys_tenant.SysTenantRepos
 import org.thingsboard.server.service.edge.rpc.yunteng.sys_user.SysUserRepository;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_alarm_contact.TkAlarmContactRepository;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_alarm_profile.TkAlarmProfileRepository;
+import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_center.TkConfigurationCenterRepository;
+import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content.TkConfigurationContentRepository;
+import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content_node.TkConfigurationContentNodeRepository;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_device_profile_category.TkDeviceProfileCategoryRepository;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_device_state_log.TkDeviceStateLogRepository;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_event_kv.TkEventKvRepository;
@@ -321,5 +324,11 @@ public class EdgeContextComponent {
     private final TkThingsModelRepository tkThingsModelRepository;
     @Autowired
     private final SysTenantRepository sysTenantRepository;
+    @Autowired
+    private final TkConfigurationCenterRepository tkConfigurationCenterRepository;
+    @Autowired
+    private final TkConfigurationContentRepository tkConfigurationContentRepository;
+    @Autowired
+    private final TkConfigurationContentNodeRepository tkConfigurationContentNodeRepository;
     //thingskit  end
 }

@@ -45,6 +45,9 @@ import org.thingsboard.server.service.edge.rpc.yunteng.sys_tenant.SysTenantEdgeE
 import org.thingsboard.server.service.edge.rpc.yunteng.sys_user.SysUserEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_alarm_contact.TkAlarmContactEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_alarm_profile.TkAlarmProfileEdgeEventFetcher;
+import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_center.TkConfigurationCenterEdgeEventFetcher;
+import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content.TkConfigurationContentEdgeEventFetcher;
+import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content_node.TkConfigurationContentNodeEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_device_profile_category.TkDeviceProfileCategoryEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_device_state_log.TkDeviceStateLogEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_java_script.TkJavaScriptEdgeEventFetcher;
@@ -96,6 +99,10 @@ public class EdgeSyncCursor {
         fetchers.add(new MessageConfigEdgeEventFetcher(ctx.getMessageConfigRepository()));//消息字典
         fetchers.add(new TkMessageTemplateEdgeEventFetcher(ctx.getTkMessageTemplateRepository()));//消息模板
         fetchers.add(new TkOrganizationEdgeEventFetcher(ctx.getTkOrganizationRepository()));//组织
+
+        fetchers.add(new TkConfigurationCenterEdgeEventFetcher(ctx.getTkConfigurationCenterRepository()));
+        fetchers.add(new TkConfigurationContentEdgeEventFetcher(ctx.getTkConfigurationContentRepository()));
+        fetchers.add(new TkConfigurationContentNodeEdgeEventFetcher(ctx.getTkConfigurationContentNodeRepository()));
         //thingsKit  end
 
         fetchers.add(new DashboardsEdgeEventFetcher(ctx.getDashboardService()));

+package org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_center;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationCenter;
+import org.thingsboard.server.common.data.yunteng.sync.TkDeviceProfileCategory;
+import org.thingsboard.server.service.edge.rpc.fetch.BasePageableEdgeEventFetcher;
+@AllArgsConstructor
+@Slf4j
+public class TkConfigurationCenterEdgeEventFetcher extends BasePageableEdgeEventFetcher<TkConfigurationCenter> {
+    private TkConfigurationCenterRepository tkConfigurationCenterRepository;
+    @Override
+    protected PageData<TkConfigurationCenter> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+        return tkConfigurationCenterRepository.selectToEdge(tenantId,edge.getId(),pageLink);
+    }
+
+    @Override
+    protected EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, TkConfigurationCenter entity) {
+        return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.TK_CONFIGURATION_CENTER,EdgeEventActionType.UPDATED, entity.getId(), null);
+    }
+}

@@ -43,7 +43,7 @@ public class TkConfigurationCenterRepository implements TkEdgeProcessorRepositor
     }
 
     @Override
-    public PageData selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink)  {
+    public PageData<TkConfigurationCenter> selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink)  {
         LambdaQueryWrapper<TkConfigurationCenterEntity> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(TkConfigurationCenterEntity::getTenantId, tenantId.getId().toString());
         Page<TkConfigurationCenterEntity> queryPage = new Page<>(pageLink.getPage(), pageLink.getPageSize());

+package org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationCenter;
+import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationContent;
+import org.thingsboard.server.service.edge.rpc.fetch.BasePageableEdgeEventFetcher;
+
+@AllArgsConstructor
+@Slf4j
+public class TkConfigurationContentEdgeEventFetcher extends BasePageableEdgeEventFetcher<TkConfigurationContent> {
+    TkConfigurationContentRepository TkConfigurationContentRepository;
+    @Override
+    protected PageData<TkConfigurationContent> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+        return TkConfigurationContentRepository.selectToEdge(tenantId,edge.getId(),pageLink);
+    }
+
+    @Override
+    protected EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, TkConfigurationContent entity) {
+        return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.TK_CONFIGURATION_CONTENT, EdgeEventActionType.UPDATED, entity.getId(), null);
+    }
+}

@@ -39,7 +39,7 @@ public class TkConfigurationContentRepository implements TkEdgeProcessorReposito
     }
 
     @Override
-    public PageData selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink)  {
+    public PageData<TkConfigurationContent> selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink)  {
         LambdaQueryWrapper<TkConfigurationContentEntity> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(TkConfigurationContentEntity::getTenantId, tenantId.getId().toString());
         Page<TkConfigurationContentEntity> queryPage = new Page<>(pageLink.getPage(), pageLink.getPageSize());

+package org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content_node;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationContent;
+import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationContentNode;
+import org.thingsboard.server.service.edge.rpc.fetch.BasePageableEdgeEventFetcher;
+@AllArgsConstructor
+@Slf4j
+public class TkConfigurationContentNodeEdgeEventFetcher extends BasePageableEdgeEventFetcher<TkConfigurationContentNode> {
+    TkConfigurationContentNodeRepository tkConfigurationContentNodeRepository;
+    @Override
+    protected PageData<TkConfigurationContentNode> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+        return tkConfigurationContentNodeRepository.selectToEdge(tenantId,edge.getId(),pageLink);
+    }
+
+    @Override
+    protected EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, TkConfigurationContentNode entity) {
+        return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.TK_CONFIGURATION_CONTENT_NODE, EdgeEventActionType.UPDATED, entity.getId(), null);
+
+    }
+}

@@ -39,7 +39,7 @@ public class TkConfigurationContentNodeRepository implements TkEdgeProcessorRepo
     }
 
     @Override
-    public PageData selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink)  {
+    public PageData<TkConfigurationContentNode> selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink)  {
         System.out.println(" 全量下行查询 TkConfigurationContentNode");
 
         LambdaQueryWrapper<TkConfigurationContentNodeEntity> queryWrapper = Wrappers.lambdaQuery();

@@ -754,9 +754,9 @@ spring:
   datasource:
     # Database driver for Spring JPA - org.postgresql.Driver
     driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
-    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/postgres}"
+    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://222.180.200.114:20638/z_tk_fatest_cloud_001}"
     username: "${SPRING_DATASOURCE_USERNAME:postgres}"
-    password: "${SPRING_DATASOURCE_PASSWORD:postgres}"
+    password: "${SPRING_DATASOURCE_PASSWORD:Thw770!!uriq}"
     hikari:
       # This property controls the amount of time that a connection can be out of the pool before a message is logged indicating a possible connection leak. A value of 0 means leak detection is disabled
       leakDetectionThreshold: "${SPRING_DATASOURCE_HIKARI_LEAK_DETECTION_THRESHOLD:0}"

@@ -19,15 +19,24 @@ import java.io.Serializable;
 @Getter
 @Setter
 @Accessors(chain = true)
-public class Tk3dComponentDTO extends TenantDTO implements Serializable {
+public class Tk3dComponentDTO extends BaseDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("模板内容")
     private JsonNode content;
 
+    @ApiModelProperty("名称")
+    String name;
+
     @ApiModelProperty("是否发布：0否，1是")
     Integer state;
 
+    @ApiModelProperty("图标地址")
+    String imageUrl;
+
+    @ApiModelProperty(value = "租户ID")
+    private String tenantId;
+
 
 }

@@ -30,8 +30,11 @@ public class Tk3dComponentEntity extends TenantBaseEntity implements Serializabl
     String name;
 
     @TableField
+    String imageUrl;
+
+    @TableField
     @ApiModelProperty("是否发布：0否，1是")
-    Integer state;
+    Integer state=0;
 
     @ApiModelProperty("模板内容")
     @TableField(typeHandler = JacksonTypeHandler.class)

@@ -56,7 +56,9 @@ public class Tk3dComponentServiceImpl extends AbstractBaseService<Tk3dComponentM
                 .eq(Tk3dComponentEntity::getId, dto.getId()))) {
             baseMapper.updateById(dto.getEntity(Tk3dComponentEntity.class));
         } else {
-            baseMapper.insert(dto.getEntity(Tk3dComponentEntity.class));
+            Tk3dComponentEntity entity=dto.getEntity(Tk3dComponentEntity.class);
+            entity.setState(0);
+            baseMapper.insert(entity);
         }
 
         return dto;