Merge branch 'master' into 后端权限控制

# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/yunteng/YtDataComponentController.java

@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DataBoardDTO;
@@ -37,7 +38,8 @@ public class YtDataComponentController extends BaseController {
 
   @GetMapping("/{boardId}")
   @ApiOperation(value = "查询看板下的所有组件信息")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_component:list'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_component:list'})")
   public ResponseResult<MoreDataComponentInfoDTO> getDataComponentsByBoardId(
       @PathVariable("boardId") String boardId) throws ThingsboardException {
     DataBoardDTO dataBoardDTO = checkDataBoardInfo(boardId);
@@ -52,7 +54,8 @@ public class YtDataComponentController extends BaseController {
 
   @PostMapping("/{boardId}/add")
   @ApiOperation(value = "新增组件")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_component:add:post'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_component:add:post'})")
   public ResponseResult<DataComponentDTO> save(
       @PathVariable("boardId") String boardId,
       @RequestBody @Validated(AddGroup.class) DataComponentDTO dataComponent)
@@ -75,7 +78,8 @@ public class YtDataComponentController extends BaseController {
 
   @PostMapping("/{boardId}/update")
   @ApiOperation(value = "编辑组件")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_component:update:update'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_component:update:update'})")
   public ResponseResult<DataComponentDTO> update(
       @PathVariable("boardId") String boardId,
       @RequestBody @Validated(UpdateGroup.class) DataComponentDTO dataComponent)
@@ -89,13 +93,33 @@ public class YtDataComponentController extends BaseController {
     return saveOrUpdate(dataComponent);
   }
 
-  @DeleteMapping
+  @DeleteMapping("/{dataBoardId}")
   @ApiOperation(value = "删除数据组件")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_component:delete'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_component:delete'})")
   public ResponseResult<Boolean> deleteDataBoard(
-      @Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
-    deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
-    return ResponseResult.success(ytDataComponentService.deleteDataComponent(deleteDTO));
+      @PathVariable("dataBoardId") String dataBoardId,
+      @Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
+      throws ThingsboardException {
+    String tenantId = getCurrentUser().getCurrentTenantId();
+    deleteDTO.setTenantId(tenantId);
+    int deleteNum = ytDataComponentService.deleteDataComponent(deleteDTO);
+
+    int zero = FastIotConstants.MagicNumber.ZERO;
+    boolean result = deleteNum > zero;
+    if (result) {
+      DataBoardDTO dataBoardDTO = ytDataBoardService.findDataBoardInfoById(dataBoardId, tenantId);
+      if (null != dataBoardDTO) {
+        int count =
+            dataBoardDTO.getComponentNum() != null
+                ? dataBoardDTO.getComponentNum() - deleteNum < zero
+                    ? zero
+                    : dataBoardDTO.getComponentNum() - deleteNum
+                : zero;
+        ytDataBoardService.updateDataBoardComponentNum(dataBoardId, tenantId, count);
+      }
+    }
+    return ResponseResult.success(result);
   }
 
   private ResponseResult<DataComponentDTO> saveOrUpdate(DataComponentDTO dataComponent)

@@ -123,4 +123,9 @@ public class YtDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
             })
         .orElse(null);
   }
+
+  @Override
+  public boolean updateDataBoardComponentNum(String id, String tenantId, int count) {
+    return baseMapper.updateDataBoardComponentNum(id, tenantId, count);
+ }
 }

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DataComponentDTO;
@@ -80,11 +79,10 @@ public class YtDataComponentServiceImpl
 
   @Override
   @Transactional
-  public boolean deleteDataComponent(DeleteDTO deleteDTO) {
+  public int deleteDataComponent(DeleteDTO deleteDTO) {
     return baseMapper.delete(
             new LambdaQueryWrapper<DataComponent>()
                 .eq(DataComponent::getTenantId, deleteDTO.getTenantId())
-                .in(DataComponent::getId, deleteDTO.getIds()))
-        > FastIotConstants.MagicNumber.ZERO;
+                .in(DataComponent::getId, deleteDTO.getIds()));
   }
 }

@@ -2,8 +2,11 @@ package org.thingsboard.server.dao.yunteng.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.dao.yunteng.entities.DataBoard;
 
 @Mapper
 public interface DataBoardMapper extends BaseMapper<DataBoard> {
+  boolean updateDataBoardComponentNum(
+      @Param("id") String id, @Param("tenantId") String tenantId, @Param("count") int count);
 }

@@ -47,4 +47,13 @@ public interface YtDataBoardService {
    * @return 看板信息
    */
   DataBoardDTO findDataBoardInfoById(String id,String tenantId);
+
+  /**
+   * 跟新数据看板的组件数量
+   * @param id 看板id
+   * @param tenantId 租户ID
+   * @param count 更新值
+   * @return false失败 true成功
+   */
+  boolean updateDataBoardComponentNum(String id,String tenantId,int count);
 }

@@ -26,5 +26,5 @@ public interface YtDataComponentService {
    *
    * @param deleteDTO 删除IDS
    */
-  boolean deleteDataComponent(DeleteDTO deleteDTO);
+  int deleteDataComponent(DeleteDTO deleteDTO);
 }

+<?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.DataBoardMapper">
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.DataBoardDTO" id="boardMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="componentNum" column="component_num"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="creator" column="creator"/>
+        <result property="updater" column="updater"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+    <update id="updateDataBoardComponentNum">
+        UPDATE iotfs_data_board
+        SET component_num =#{count}
+        <where>
+            id = #{id}
+            AND tenant_id = #{tenantId}
+        </where>
+    </update>
+</mapper>