Merge branch 'fix_webcam' into 'master_dev'

Fix webcam

See merge request yunteng/thingskit!398

@@ -3,6 +3,9 @@ package org.thingsboard.server.controller.yunteng;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
+import org.thingsboard.server.common.data.StringUtils;
+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.core.utils.FileStorageService;
 import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
 import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
 
 
@@ -29,4 +32,11 @@ public class TkOssFileController {
       @PathVariable String fileName, HttpServletRequest request, HttpServletResponse response) {
       @PathVariable String fileName, HttpServletRequest request, HttpServletResponse response) {
     return fileStorageService.download(fileName, request, response);
     return fileStorageService.download(fileName, request, response);
   }
   }
+  @DeleteMapping
+  public ResponseEntity<Boolean> deleteFile(@RequestParam("deleteFilePath") String deleteFilePath){
+    if(StringUtils.isEmpty(deleteFilePath)){
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseEntity.ok(fileStorageService.deleteFile(deleteFilePath));
+  }
 }
 }

@@ -28,4 +28,6 @@ public interface FileStorageService {
       String fileName, HttpServletRequest request, HttpServletResponse response);
       String fileName, HttpServletRequest request, HttpServletResponse response);
 
 
   String uploadFile(String fileName, String contentType, InputStream inputStream) throws Exception;
   String uploadFile(String fileName, String contentType, InputStream inputStream) throws Exception;
+
+  boolean deleteFile(String deleteFilePath);
 }
 }

@@ -131,6 +131,12 @@ public class LocalFileStorageService implements FileStorageService {
     return ossStaticPath;
     return ossStaticPath;
   }
   }
 
 
+  @Override
+  public boolean deleteFile(String deleteFilePath) {
+    //TODO delete local file or delete datafile
+    return false;
+  }
+
   private String storeFileByInputStream(String fileName, InputStream inputStream)
   private String storeFileByInputStream(String fileName, InputStream inputStream)
       throws IOException {
       throws IOException {
     // random fileName if needed
     // random fileName if needed

@@ -16,6 +16,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.FileStorageException;
 import org.thingsboard.server.common.data.yunteng.core.exception.FileStorageException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 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.message.ErrorMessage;
@@ -173,6 +174,25 @@ public class MinioFileStorageService implements FileStorageService {
     }
     }
   }
   }
 
 
+  @Override
+  public boolean deleteFile(String deleteFilePath) {
+    boolean result =false;
+    try{
+      String bucketName = fileStorageProperties.getBucketName();
+      int one = FastIotConstants.MagicNumber.ONE;
+      String[]  split = deleteFilePath.split(bucketName + "/");
+      if(split.length>one){
+        deleteFilePath = split[one];
+      }
+      minioClient.removeObject(RemoveObjectArgs.builder().bucket(bucketName)
+              .object(deleteFilePath).build());
+      result = true;
+    }catch (Exception e){
+      log.error("文件删除失败：{}",deleteFilePath);
+    }
+    return result;
+  }
+
   private void checkBucket()
   private void checkBucket()
       throws ServerException, InsufficientDataException, ErrorResponseException, IOException,
       throws ServerException, InsufficientDataException, ErrorResponseException, IOException,
           NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException,
           NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException,

@@ -16,7 +16,8 @@ public class TkDataViewContentInfoDTO {
     private Integer state;
     private Integer state;
     @ApiModelProperty(value = "组织ID")
     @ApiModelProperty(value = "组织ID")
     private String organizationId;
     private String organizationId;
-
+    @ApiModelProperty(value = "缩略图")
+    private String thumbnail;
     @ApiModelProperty(value = "大屏内容",required = true)
     @ApiModelProperty(value = "大屏内容",required = true)
     private TkDataViewContentDTO dataViewContent;
     private TkDataViewContentDTO dataViewContent;
 }
 }

 package org.thingsboard.server.common.data.yunteng.utils;
 package org.thingsboard.server.common.data.yunteng.utils;
 
 
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.enums.AttributeSourceDataTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.AttributeSourceDataTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.HexByteOrderEnum;
 import org.thingsboard.server.common.data.yunteng.enums.HexByteOrderEnum;
 import java.nio.ByteOrder;
 import java.nio.ByteOrder;
@@ -252,7 +253,11 @@ public class HexConvertUtils {
       case INT16_BA:
       case INT16_BA:
       case UINT16_BA:
       case UINT16_BA:
         hex = convertHexOrder(hex, dataTypeEnum);
         hex = convertHexOrder(hex, dataTypeEnum);
-        value = intFormat.format(int16OrUint16ToShort(hex) * scaleFactor);
+        if((int16OrUint16ToShort(hex) * scaleFactor) % 1 == FastIotConstants.MagicNumber.ZERO){
+          value = int16OrUint16ToShort(hex);
+        }else{
+          value = intFormat.format(int16OrUint16ToShort(hex) * scaleFactor);
+        }
         break;
         break;
       case INT32_AB_CD:
       case INT32_AB_CD:
       case UINT32_AB_CD:
       case UINT32_AB_CD:

@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.adaptor.AdaptorException;
 import org.thingsboard.server.common.adaptor.AdaptorException;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.device.profile.TkTcpDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.TkTcpDeviceProfileTransportConfiguration;
@@ -138,7 +139,6 @@ public class TcpUdpDataHandler implements SessionMsgListener {
     }
     }
     deviceSessionCtx.tryProcessQueuedMsgs(msg -> processDeviceSessionMsg(ctx, msg));
     deviceSessionCtx.tryProcessQueuedMsgs(msg -> processDeviceSessionMsg(ctx, msg));
   }
   }
-
   private void processAuthTokenConnect(ChannelHandlerContext ctx, TcpAuthEntry accessToken) {
   private void processAuthTokenConnect(ChannelHandlerContext ctx, TcpAuthEntry accessToken) {
 
 
     log.debug(
     log.debug(
@@ -519,6 +519,20 @@ public class TcpUdpDataHandler implements SessionMsgListener {
   }
   }
 
 
   @Override
   @Override
+  public void onDeviceProfileUpdate(
+          TransportProtos.SessionInfoProto sessionInfo, DeviceProfile deviceProfile) {
+    deviceSessionCtx.onDeviceProfileUpdate(sessionInfo, deviceProfile);
+  }
+
+  @Override
+  public void onDeviceUpdate(
+          TransportProtos.SessionInfoProto sessionInfo,
+          Device device,
+          Optional<DeviceProfile> deviceProfileOpt) {
+    deviceSessionCtx.onDeviceUpdate(sessionInfo, device, deviceProfileOpt);
+    deviceSessionCtx.setDeviceCode(JacksonUtil.toString(device.getAdditionalInfo()));
+  }
+  @Override
   public void onDeviceDeleted(DeviceId deviceId) {
   public void onDeviceDeleted(DeviceId deviceId) {
     context.onAuthFailure(address);
     context.onAuthFailure(address);
     if (isTcp) {
     if (isTcp) {

@@ -24,6 +24,7 @@
 
 
     <resultMap id="dataViewInfoMap"
     <resultMap id="dataViewInfoMap"
                type="org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO">
                type="org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO">
+        <result property="thumbnail" column="thumbnail"/>
         <result property="dataViewId" column="id"/>
         <result property="dataViewId" column="id"/>
         <result property="dataViewName" column="name"/>
         <result property="dataViewName" column="name"/>
         <result property="state" column="state"/>
         <result property="state" column="state"/>
@@ -61,7 +62,7 @@
     </select>
     </select>
 
 
     <select id="getDataViewInfoById" resultMap="dataViewInfoMap">
     <select id="getDataViewInfoById" resultMap="dataViewInfoMap">
-        SELECT icc.id,icc.name,icc.state,icc.organization_id,icc.thumbnail,icct.id AS content_id,icct.content FROM tk_data_view icc LEFT JOIN
+        SELECT icc.id,icc.thumbnail,icc.name,icc.state,icc.organization_id,icc.thumbnail,icct.id AS content_id,icct.content FROM tk_data_view icc LEFT JOIN
         tk_data_view_content icct ON icc.id = icct.view_id
         tk_data_view_content icct ON icc.id = icct.view_id
         WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId}
         WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId}
     </select>
     </select>