Merge branch 'fix/teambition/2024-10-29-B' into 'master_dev'

Fix/teambition/2024 10 29 b

See merge request yunteng/thingskit!459

@@ -46,6 +46,7 @@ public class TkConfigurationCenterRepository implements TkEdgeProcessorRepositor
     public PageData<TkConfigurationCenter> selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink)  {
         LambdaQueryWrapper<TkConfigurationCenterEntity> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(TkConfigurationCenterEntity::getTenantId, tenantId.getId().toString());
+        queryWrapper.eq(TkConfigurationCenterEntity::getIsTemplate, 1);
         Page<TkConfigurationCenterEntity> queryPage = new Page<>(pageLink.getPage(), pageLink.getPageSize());
         IPage<TkConfigurationCenterEntity> resultPage = tkConfigurationCenterMapper.selectPage(queryPage, queryWrapper);
         return new PageData(resultPage.getRecords().stream().map(this::toData).collect(Collectors.toList()), (int) resultPage.getPages(), resultPage.getTotal(), resultPage.getCurrent()<resultPage.getPages());

@@ -18,7 +18,9 @@ import org.thingsboard.server.dao.yunteng.entities.TkConfigurationContentEntity;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationContentMapper;
 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessorRepository;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -40,10 +42,11 @@ public class TkConfigurationContentRepository implements TkEdgeProcessorReposito
 
     @Override
     public PageData<TkConfigurationContent> selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink)  {
-        LambdaQueryWrapper<TkConfigurationContentEntity> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(TkConfigurationContentEntity::getTenantId, tenantId.getId().toString());
+        Map<String,Object> queryMap=new HashMap<>();
+        queryMap.put("tenantId",tenantId.getId().toString());
+        queryMap.put("isTemplate",1);
         Page<TkConfigurationContentEntity> queryPage = new Page<>(pageLink.getPage(), pageLink.getPageSize());
-        IPage<TkConfigurationContentEntity> resultPage = TkConfigurationContentMapper.selectPage(queryPage, queryWrapper);
+        IPage<TkConfigurationContentEntity> resultPage = TkConfigurationContentMapper.getPage(queryPage, queryMap);
         return new PageData(resultPage.getRecords().stream().map(this::toData).collect(Collectors.toList()),
                 (int) resultPage.getPages(), resultPage.getTotal(), resultPage.getCurrent()<resultPage.getPages());
     }

@@ -18,7 +18,9 @@ import org.thingsboard.server.dao.yunteng.entities.TkConfigurationContentNodeEnt
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationContentNodeMapper;
 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessorRepository;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -40,20 +42,17 @@ public class TkConfigurationContentNodeRepository implements TkEdgeProcessorRepo
 
     @Override
     public PageData<TkConfigurationContentNode> selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink)  {
-        System.out.println(" 全量下行查询 TkConfigurationContentNode");
-
-        LambdaQueryWrapper<TkConfigurationContentNodeEntity> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(TkConfigurationContentNodeEntity::getTenantId, tenantId.getId().toString());
+        Map<String,Object> queryMap=new HashMap<>();
+        queryMap.put("tenantId",tenantId.getId().toString());
+        queryMap.put("isTemplate",1);
         Page<TkConfigurationContentNodeEntity> queryPage = new Page<>(pageLink.getPage(), pageLink.getPageSize());
-        IPage<TkConfigurationContentNodeEntity> resultPage = tkConfigurationContentNodeMapper.selectPage(queryPage, queryWrapper);
+        IPage<TkConfigurationContentNodeEntity> resultPage = tkConfigurationContentNodeMapper.getPage(queryPage, queryMap);
         return new PageData(resultPage.getRecords().stream().map(this::toData).collect(Collectors.toList()),
                 (int) resultPage.getPages(), resultPage.getTotal(), resultPage.getCurrent()<resultPage.getPages());
     }
 
     @Override
     public List<TkConfigurationContentNode> selectToEdge(TenantId tenantId, EdgeId edgeId, EntityId entityId)   {
-        System.out.println(" 下行转换 TkConfigurationContentNode");
-
         LambdaQueryWrapper<TkConfigurationContentNodeEntity> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(TkConfigurationContentNodeEntity::getTenantId, tenantId.getId().toString());
         queryWrapper.eq(TkConfigurationContentNodeEntity::getId, entityId.getId().toString());

 package org.thingsboard.server.dao.yunteng.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkConfigurationContentEntity;
 
+import java.util.Map;
+
 @Mapper
 public interface ConfigurationContentMapper extends BaseMapper<TkConfigurationContentEntity> {
+
+    IPage<TkConfigurationContentEntity> getPage(
+            IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
 }

 package org.thingsboard.server.dao.yunteng.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.dao.yunteng.entities.TkConfigurationContentEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkConfigurationContentNodeEntity;
 
+import java.util.Map;
+
 /**
  * @author Administrator
  */
 @Mapper
 public interface ConfigurationContentNodeMapper extends BaseMapper<TkConfigurationContentNodeEntity> {
+    IPage<TkConfigurationContentNodeEntity> getPage(
+            IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
 }

+<?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.ConfigurationContentMapper">
+
+
+    <resultMap id="entity" type="org.thingsboard.server.dao.yunteng.entities.TkConfigurationContentEntity">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="configurationId" column="configuration_id"/>
+         <result property="type" column="type"/>
+        <result property="remark" column="remark"/>
+        <result property="content" column="content"/>
+        <result property="createTime" column="create_time"/>
+        <result property="creator" column="creator"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="updater" column="updater"/>
+    </resultMap>
+
+    <sql id="columns">
+        id,	configuration_id,	name,	type,	content	,tenant_id	,create_time,	creator,	updater	,update_time,	remark
+    </sql>
+
+
+    <select id="getPage" resultMap="entity">
+        SELECT tk_configuration_content.*
+        FROM tk_configuration_content
+        INNER JOIN tk_configuration_center on (tk_configuration_center.id=tk_configuration_content.configuration_id)
+        <where>
+            <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
+                AND tk_configuration_content.tenant_id = #{queryMap.tenantId}
+            </if>
+            <if test="queryMap.isTemplate !=null">
+                AND tk_configuration_center.is_template = #{queryMap.isTemplate}
+            </if>
+        </where>
+    </select>
+
+</mapper>
\ No newline at end of file

+<?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.ConfigurationContentNodeMapper">
+
+
+    <resultMap id="entity" type="org.thingsboard.server.dao.yunteng.entities.TkConfigurationContentNodeEntity">
+        <result property="id" column="id"/>
+        <result property="configurationId" column="configuration_id"/>
+        <result property="contentId" column="content_id"/>
+        <result property="actJson" column="act_json"/>
+        <result property="dataSourceJson" column="data_source_json"/>
+        <result property="eventJson" column="event_json"/>
+        <result property="remark" column="remark"/>
+        <result property="createTime" column="create_time"/>
+        <result property="creator" column="creator"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="updater" column="updater"/>
+    </resultMap>
+
+    <sql id="columns">
+        id,	configuration_id	,content_id,	act_json,	data_source_json	,event_json	,tenant_id	,create_time,	creator	,updater,	update_time	,remark,	configuration_node_id
+    </sql>
+
+
+    <select id="getPage" resultMap="entity">
+        SELECT tk_configuration_content_node.*
+        FROM tk_configuration_content_node
+        INNER JOIN tk_configuration_center on (tk_configuration_center.id=tk_configuration_content_node.configuration_id)
+        <where>
+            <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
+                AND tk_configuration_content_node.tenant_id = #{queryMap.tenantId}
+            </if>
+            <if test="queryMap.isTemplate !=null">
+                AND tk_configuration_center.is_template = #{queryMap.isTemplate}
+            </if>
+        </where>
+    </select>
+
+</mapper>
\ No newline at end of file

@@ -30,6 +30,9 @@
         FROM tk_device_profile_category tkdpc
         LEFT JOIN sys_dict_item ON (sys_dict_item.item_value=tkdpc.dict_item_id)
         WHERE 1=1
+        <if test="isSysAdmin == true">
+            AND tkdpc.tenant_id='13814000-1dd2-11b2-8080-808080808080'
+        </if>
         <if test="isSysAdmin == false">
             AND tkdpc.tenant_id = #{tenantId}
             <if test="status !=null">
@@ -60,6 +63,9 @@
         FROM tk_device_profile_category tkdpc
         LEFT JOIN sys_dict_item ON (sys_dict_item.item_value=tkdpc.dict_item_id)
         WHERE 1=1
+        <if test="isSysAdmin == true">
+            AND tkdpc.tenant_id='13814000-1dd2-11b2-8080-808080808080'
+        </if>
         <if test="isSysAdmin == false">
             AND tkdpc.tenant_id = #{tenantId}
             <if test="status !=null">

@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="org.thingsboard.server.dao.yunteng.entities.Tk3dComponentEntity">
         <id column="id" property="id" />
         <result column="name" property="name" />
-        <result column="imageUrl" property="imageUrl" />
+        <result column="image_url" property="imageUrl" />
         <result column="state" property="state" />
         <result column="created_time" property="createdTime" />
         <result column="update_time" property="updateTime" />
@@ -31,7 +31,7 @@
                 AND id = #{queryMap.id}
             </if>
             <if test="queryMap.name !=null">
-                AND name = #{queryMap.name}
+                AND name LIKE concat('%',#{queryMap.name},'%')
             </if>
             <if test="queryMap.state !=null">
                 AND state = #{queryMap.state}