Merge branch '20220419' into 'master'

20220419

See merge request huang/thingsboard3.3.2!81

@@ -432,6 +432,9 @@ caffeine:
     mobileLoginSmsCode:
       timeToLiveInMinutes: 2
       maxSize: 10000
+    thingsArea:
+      timeToLiveInMinutes: 1440
+      maxSize: 500
 
 redis:
   # standalone or cluster

@@ -82,4 +82,9 @@ public interface FastIotConstants {
     int PUBLISHED = 1;
     int DRAFT = 0;
   }
+
+  interface CacheKey {
+    String area = "thingsArea";
+    int DRAFT = 0;
+  }
 }

@@ -10,7 +10,7 @@ import javax.validation.constraints.NotEmpty;
 @EqualsAndHashCode(callSuper = true)
 public class YtVideoDTO extends TenantDTO {
     @ApiModelProperty(value = "摄像头附加信息，json格式", required = false)
-    private String deviceInfo;
+    private String additionalJson;
 
     @ApiModelProperty(value = "封面图", required = false)
     private String avatar;

@@ -19,7 +19,7 @@ public class YtVideoEntity extends TenantBaseEntity {
 
     private static final long serialVersionUID = 1498859811403607497L;
     private String name;
-    private String deviceInfo;
+    private String additionalJson;
     private String avatar;
     private String videoUrl;
     private String brand;

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.dao.yunteng.entities.SysArea;
@@ -23,23 +25,32 @@ import java.util.List;
 public class SysAreaServiceImpl implements SysAreaService {
 
   private final SysAreaMapper sysAreaMapper;
+  private final CacheManager cacheManager;
 
   @Override
   public List<SysAreaDTO> list(SysAreaDTO sysAreaDTO) {
-    return ReflectUtils.sourceToTarget(
-        sysAreaMapper.selectList(
-            new LambdaQueryWrapper<SysArea>()
-                .eq(sysAreaDTO.getLevel() != null, SysArea::getLevel, sysAreaDTO.getLevel())
-                .eq(
-                    sysAreaDTO.getParentId() != null,
-                    SysArea::getParentId,
-                    sysAreaDTO.getParentId())
-                .eq(sysAreaDTO.getCode() != null, SysArea::getCode, sysAreaDTO.getCode())
-                .like(
-                    StringUtils.isNotEmpty(sysAreaDTO.getName()),
-                    SysArea::getName,
-                    sysAreaDTO.getName())),
-        SysAreaDTO.class);
+    cacheManager.getCache(FastIotConstants.CacheKey.area).get(sysAreaDTO.getParentId());
+    List<SysAreaDTO> result = cacheManager.getCache(FastIotConstants.CacheKey.area).get(sysAreaDTO.getParentId(),List.class);
+    if(result == null || result.isEmpty()){
+      result = ReflectUtils.sourceToTarget(
+              sysAreaMapper.selectList(
+                      new LambdaQueryWrapper<SysArea>()
+                              .eq(sysAreaDTO.getLevel() != null, SysArea::getLevel, sysAreaDTO.getLevel())
+                              .eq(
+                                      sysAreaDTO.getParentId() != null,
+                                      SysArea::getParentId,
+                                      sysAreaDTO.getParentId())
+                              .eq(sysAreaDTO.getCode() != null, SysArea::getCode, sysAreaDTO.getCode())
+                              .like(
+                                      StringUtils.isNotEmpty(sysAreaDTO.getName()),
+                                      SysArea::getName,
+                                      sysAreaDTO.getName())),
+              SysAreaDTO.class);
+      cacheManager.getCache(FastIotConstants.CacheKey.area).put(sysAreaDTO.getParentId(),result);
+    }
+
+
+    return result;
   }
 
   @Override

@@ -49,8 +49,8 @@ public class YtVideoServiceImpl extends AbstractBaseService<YtVideoMapper, YtVid
             .in(organizationIds!=null&& !organizationIds.isEmpty(),YtVideoEntity::getOrganizationId,organizationIds)
             .eq(status!=null,YtVideoEntity::getStatus,status)
             .like(StringUtils.isNotEmpty(name),YtVideoEntity::getName,name);
-    IPage<YtVideoEntity> page =
-        baseMapper.selectPage(pageInfrom, pageFilter);
+    IPage<YtVideoDTO> page =
+        baseMapper.getVideoPage(pageInfrom, tenantId,name,status,organizationIds);
     return getPageData(page, YtVideoDTO.class);
   }
 

@@ -5,9 +5,12 @@ 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.AlarmProfileDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.YtVideoDTO;
 import org.thingsboard.server.dao.yunteng.entities.AlarmProfile;
 import org.thingsboard.server.dao.yunteng.entities.YtVideoEntity;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -15,4 +18,14 @@ import java.util.Map;
  */
 @Mapper
 public interface YtVideoMapper extends BaseMapper<YtVideoEntity> {
+    /**
+     *
+     * @param page
+     * @param tenantId
+     * @param name
+     * @param status
+     * @param organizationId
+     * @return
+     */
+    IPage<YtVideoDTO> getVideoPage(IPage<?> page, @Param("tenantId") String tenantId, @Param("name") String name,  @Param("status") Boolean status, @Param("organization") List<String> organizationId);
 }

@@ -18,7 +18,7 @@
         <result property="endTs" column="end_ts"/>
         <result property="ackTs" column="ack_ts"/>
         <result property="clearTs" column="clear_ts"/>
-        <result property="details" column="details" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+        <result property="details" column="additional_info" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="propagate" column="propagate"/>
     </resultMap>
 

+<?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.YtVideoMapper">
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.YtVideoDTO" id="videoMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="avatar" column="avatar"/>
+        <result property="videoUrl" column="video_url"/>
+        <result property="brand" column="brand"/>
+        <result property="deviceType" column="device_type" />
+        <result property="sn" column="sn"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="creator" column="creator"/>
+        <result property="updater" column="updater"/>
+        <result property="description" column="description"/>
+        <result property="status" column="status"/>
+        <result property="additionalJson" column="additional_json"/>
+        <result property="organizationId" column="organization_id"/>
+        <result property="organizationName" column="organization_name"/>
+    </resultMap>
+
+
+
+    <sql id="basicColumns">
+        base.id,base.sn,base.name,base.avatar,base.video_url,base.description,base.status,base.additional_json,base.device_type,base.organization_id
+        ,base.tenant_id,base.create_time,base.update_time,base.creator, base.updater
+    </sql>
+
+    <sql id="detailColumns">
+        <include refid="basicColumns"/>
+        ,org.name AS organization_name
+    </sql>
+    <select id="getVideoPage" resultMap="videoMap">
+        SELECT
+        <include refid="detailColumns"/>
+        FROM iotfs_device_camera base
+        LEFT JOIN iotfs_organization org ON org.id = base.organization_id
+        <where>
+            <if test="tenantId !=null and tenantId !=''">
+                AND base.tenant_id = #{tenantId}
+            </if>
+            <if test="name !=null and name !=''">
+                AND  base.name LIKE concat('%',#{name}::TEXT,'%')
+            </if>
+            <if test="status !=null">
+                AND base.status = #{status}
+            </if>
+            <if test="organization !=null">
+                AND base.organization_id IN
+                <foreach collection="organization" item="organizationId" open="(" separator="," close=")">
+                    #{organizationId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectDetail" resultMap="videoMap">
+        SELECT
+        <include refid="detailColumns"/>,d.customer_id::TEXT AS customer_id
+        FROM iotfs_device_camera base
+        LEFT JOIN iotfs_organization org ON org.id = base.organization_id
+        <where>
+            <if test="tenantId !=null and tenantId !=''">
+                AND base.tenant_id = #{tenantId}
+            </if>
+            <if test="id !=null and id !=''">
+                AND base.id = #{id}
+            </if>
+
+        </where>
+    </select>
+
+
+
+
+</mapper>

@@ -284,7 +284,7 @@ class ReactState {
         for (String id : devices) {
             TbMsg newMsg = ctx.newMsg(lastMsgQueueName != null ? lastMsgQueueName : ServiceQueue.MAIN
                     , msg.getType()
-                    , msg.getOriginator()
+                    , new DeviceId(UUID.fromString(id))
                     , msg != null ? msg.getCustomerId() : null
                     , metaData
                     , JacksonUtil.toString(context));