简柏林 / thingskit · Commits

Commit e456de06fd7824902c28e51a4131da61d5d49eb7

Authored by xp.Huang
1 parent 6615cdb9

fix: 移除controller增加的事务注解

Inline Side-by-side
Showing 2 changed files with 0 additions and 6 deletions
@@ -6,7 +6,6 @@ import lombok.RequiredArgsConstructor; @@ -6,7 +6,6 @@ import lombok.RequiredArgsConstructor;
6 import org.apache.commons.lang3.StringUtils; 6 import org.apache.commons.lang3.StringUtils;
7 import org.springframework.http.ResponseEntity; 7 import org.springframework.http.ResponseEntity;
8 import org.springframework.security.access.prepost.PreAuthorize; 8 import org.springframework.security.access.prepost.PreAuthorize;
9 -import org.springframework.transaction.annotation.Transactional;  
10 import org.springframework.util.Assert; 9 import org.springframework.util.Assert;
11 import org.springframework.validation.annotation.Validated; 10 import org.springframework.validation.annotation.Validated;
12 import org.springframework.web.bind.annotation.*; 11 import org.springframework.web.bind.annotation.*;
@@ -161,7 +160,6 @@ public class TkAdminController extends BaseController { @@ -161,7 +160,6 @@ public class TkAdminController extends BaseController {
161 } 160 }
162 161
163 @PostMapping("/tenant/adminUser") 162 @PostMapping("/tenant/adminUser")
164 - @Transactional  
165 @PreAuthorize( 163 @PreAuthorize(
166 "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:adminUser:post'})") 164 "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:adminUser:post'})")
167 public ResponseEntity<UserDTO> createTenantAdmin( 165 public ResponseEntity<UserDTO> createTenantAdmin(
@@ -7,12 +7,10 @@ import lombok.RequiredArgsConstructor; @@ -7,12 +7,10 @@ import lombok.RequiredArgsConstructor;
7 import org.apache.commons.lang3.StringUtils; 7 import org.apache.commons.lang3.StringUtils;
8 import org.springframework.http.ResponseEntity; 8 import org.springframework.http.ResponseEntity;
9 import org.springframework.security.access.prepost.PreAuthorize; 9 import org.springframework.security.access.prepost.PreAuthorize;
10 -import org.springframework.transaction.annotation.Transactional;  
11 import org.springframework.validation.annotation.Validated; 10 import org.springframework.validation.annotation.Validated;
12 import org.springframework.web.bind.annotation.*; 11 import org.springframework.web.bind.annotation.*;
13 import org.thingsboard.server.common.data.*; 12 import org.thingsboard.server.common.data.*;
14 import org.thingsboard.server.common.data.audit.ActionType; 13 import org.thingsboard.server.common.data.audit.ActionType;
15 -import org.thingsboard.server.common.data.device.profile.*;  
16 import org.thingsboard.server.common.data.edge.EdgeEventActionType; 14 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
17 import org.thingsboard.server.common.data.exception.ThingsboardException; 15 import org.thingsboard.server.common.data.exception.ThingsboardException;
18 import org.thingsboard.server.common.data.id.DeviceProfileId; 16 import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -21,7 +19,6 @@ import org.thingsboard.server.common.data.id.TenantId; @@ -21,7 +19,6 @@ import org.thingsboard.server.common.data.id.TenantId;
21 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; 19 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
22 import org.thingsboard.server.common.data.rule.RuleChain; 20 import org.thingsboard.server.common.data.rule.RuleChain;
23 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup; 21 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
24 -import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;  
25 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException; 22 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
26 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage; 23 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
27 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO; 24 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
@@ -48,7 +45,6 @@ public class TkDeviceProfileController extends BaseController { @@ -48,7 +45,6 @@ public class TkDeviceProfileController extends BaseController {
48 private final TkDeviceProfileService tkDeviceProfileService; 45 private final TkDeviceProfileService tkDeviceProfileService;
49 46
50 @PostMapping() 47 @PostMapping()
51 - @Transactional  
52 @PreAuthorize( 48 @PreAuthorize(
53 "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:post','api:yt:deviceProfile:update'})") 49 "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:post','api:yt:deviceProfile:update'})")
54 @ApiOperation("创建 | 编辑") 50 @ApiOperation("创建 | 编辑")