简柏林 / thingskit · Commits

Commit a9ea949cb8307608de26a9f0d903316326529d0c

Authored by xp.Huang
2 parents d5328b28 d7e6d6c3

Merge branch '20230724' into 'master_dev' 

refactor: modbus指令对象字段调整

See merge request yunteng/thingskit!218
Inline Side-by-side
Showing 5 changed files with 119 additions and 85 deletions
@@ -11,7 +11,6 @@ import lombok.extern.slf4j.Slf4j; @@ -11,7 +11,6 @@ import lombok.extern.slf4j.Slf4j;
11 import org.apache.commons.lang3.StringUtils; 11 import org.apache.commons.lang3.StringUtils;
12 import org.springframework.http.ResponseEntity; 12 import org.springframework.http.ResponseEntity;
13 import org.springframework.security.access.prepost.PreAuthorize; 13 import org.springframework.security.access.prepost.PreAuthorize;
14 -import org.springframework.transaction.annotation.Transactional;  
15 import org.springframework.validation.annotation.Validated; 14 import org.springframework.validation.annotation.Validated;
16 import org.springframework.web.bind.annotation.*; 15 import org.springframework.web.bind.annotation.*;
17 import org.thingsboard.rule.engine.api.msg.DeviceCredentialsUpdateNotificationMsg; 16 import org.thingsboard.rule.engine.api.msg.DeviceCredentialsUpdateNotificationMsg;
@@ -64,7 +63,6 @@ public class TkDeviceController extends BaseController { @@ -64,7 +63,6 @@ public class TkDeviceController extends BaseController {
64 private final GatewayNotificationsService gatewayNotificationsService; 63 private final GatewayNotificationsService gatewayNotificationsService;
65 64
66 @PostMapping 65 @PostMapping
67 - @Transactional  
68 @ApiOperation("创建|编辑") 66 @ApiOperation("创建|编辑")
69 @PreAuthorize( 67 @PreAuthorize(
70 "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:device:post','api:yt:device:update'})") 68 "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:device:post','api:yt:device:update'})")
@@ -78,51 +76,68 @@ public class TkDeviceController extends BaseController { @@ -78,51 +76,68 @@ public class TkDeviceController extends BaseController {
78 String gatewayId = deviceDTO.getGatewayId(); 76 String gatewayId = deviceDTO.getGatewayId();
79 DeviceDTO gateWay = null; 77 DeviceDTO gateWay = null;
80 if (StringUtils.isNotEmpty(gatewayId)) { 78 if (StringUtils.isNotEmpty(gatewayId)) {
81 - gateWay =  
82 - tkdeviceService.checkDeviceByTenantIdAndDeviceId(currentTenantId, gatewayId); 79 + gateWay = tkdeviceService.checkDeviceByTenantIdAndDeviceId(currentTenantId, gatewayId);
83 if (null == gateWay) { 80 if (null == gateWay) {
84 throw new TkDataValidationException( 81 throw new TkDataValidationException(
85 ErrorMessage.DEVICE_NOT_EXISTENCE_IN_TENANT.getMessage()); 82 ErrorMessage.DEVICE_NOT_EXISTENCE_IN_TENANT.getMessage());
86 } 83 }
87 } 84 }
88 - /**  
89 - * 子设备编辑业务逻辑： 设备地址码必须同时设置到附加信息字段内。 1、新增或编辑网关和直连设备 2、新增网关子设备 3、编辑网关子设备时，关联关系已存在(未切换网关)  
90 - * 4、编辑网关子设备时，关联关系不存在(切换网关) 5、编辑网关子设备时，修改其它设备信息，例如：设备名称等。  
91 - */  
92 - Device tbDevice = buildTbDeviceFromDeviceDTO(getCurrentUser().getTenantId(), deviceDTO);  
93 - DeviceId selfTbId = updateTbDevice(tbDevice, deviceDTO.getDeviceToken());  
94 - String selfTbIdStr = selfTbId.getId().toString();  
95 - deviceDTO.setTbDeviceId(selfTbIdStr);  
96 -  
97 - if (selfTbIdStr != null  
98 - && deviceDTO.getDeviceType().equals(DeviceTypeEnum.SENSOR)  
99 - && StringUtils.isNotEmpty(gatewayId)) {  
100 - boolean relationNotMatched = true;  
101 -  
102 - EntityId slaveId = EntityIdFactory.getByTypeAndId("DEVICE", selfTbIdStr);  
103 - List<EntityRelationInfo> relations =  
104 - relationService.findInfoByTo(getTenantId(), slaveId, RelationTypeGroup.COMMON).get();  
105 -  
106 - for (EntityRelationInfo relationInfo : relations) {  
107 - if (!FastIotConstants.Relation.relationType.equals(relationInfo.getType())) {  
108 - continue; 85 + DeviceDTO newDeviceDTO = null;
  86 + boolean created = StringUtils.isBlank(deviceDTO.getId());
  87 + Device savedDevice = null;
  88 + String selfTbIdStr = null;
  89 + try {
  90 + /**
  91 + * 子设备编辑业务逻辑： 设备地址码必须同时设置到附加信息字段内。 1、新增或编辑网关和直连设备 2、新增网关子设备 3、编辑网关子设备时，关联关系已存在(未切换网关)
  92 + * 4、编辑网关子设备时，关联关系不存在(切换网关) 5、编辑网关子设备时，修改其它设备信息，例如：设备名称等。
  93 + */
  94 + Device tbDevice = buildTbDeviceFromDeviceDTO(getCurrentUser().getTenantId(), deviceDTO);
  95 + savedDevice = updateTbDevice(tbDevice, deviceDTO.getDeviceToken(), created);
  96 + selfTbIdStr = savedDevice.getId().getId().toString();
  97 + deviceDTO.setTbDeviceId(selfTbIdStr);
  98 +
  99 + if (selfTbIdStr != null
  100 + && deviceDTO.getDeviceType().equals(DeviceTypeEnum.SENSOR)
  101 + && StringUtils.isNotEmpty(gatewayId)) {
  102 + boolean relationNotMatched = true;
  103 +
  104 + EntityId slaveId = EntityIdFactory.getByTypeAndId("DEVICE", selfTbIdStr);
  105 + List<EntityRelationInfo> relations =
  106 + relationService.findInfoByTo(getTenantId(), slaveId, RelationTypeGroup.COMMON).get();
  107 +
  108 + for (EntityRelationInfo relationInfo : relations) {
  109 + if (!FastIotConstants.Relation.relationType.equals(relationInfo.getType())) {
  110 + continue;
  111 + }
  112 + if (relationInfo.getFrom().getId().toString().equals(gateWay.getTbDeviceId())) {
  113 + relationNotMatched = false;
  114 + } else {
  115 + relationService.deleteRelation(getTenantId(), relationInfo);
  116 + sendRelationNotificationMsg(
  117 + getTenantId(), relationInfo, EdgeEventActionType.RELATION_DELETED);
  118 + }
109 } 119 }
110 - if (relationInfo.getFrom().getId().toString().equals(gateWay.getTbDeviceId())) {  
111 - relationNotMatched = false;  
112 - } else {  
113 - relationService.deleteRelation(getTenantId(), relationInfo);  
114 - sendRelationNotificationMsg(  
115 - getTenantId(), relationInfo, EdgeEventActionType.RELATION_DELETED); 120 +
  121 + if (relationNotMatched) {
  122 + addRelation(getTenantId(), gateWay.getTbDeviceId(), selfTbIdStr);
116 } 123 }
117 } 124 }
118 125
119 - if (relationNotMatched) {  
120 - addRelation(getTenantId(), gateWay.getTbDeviceId(), selfTbIdStr); 126 + newDeviceDTO =
  127 + tkdeviceService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceDTO);
  128 + } catch (Exception e) {
  129 + if (created) {
  130 + logEntityAction(
  131 + getCurrentUser(),
  132 + savedDevice.getId(),
  133 + savedDevice,
  134 + savedDevice.getCustomerId(),
  135 + created ? ActionType.ADDED : ActionType.UPDATED,
  136 + e);
  137 + deleteTbDevice(selfTbIdStr);
  138 + throw handleException(e);
121 } 139 }
122 } 140 }
123 -  
124 - DeviceDTO newDeviceDTO =  
125 - tkdeviceService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceDTO);  
126 return ResponseEntity.ok(newDeviceDTO); 141 return ResponseEntity.ok(newDeviceDTO);
127 } 142 }
128 143
@@ -133,10 +148,10 @@ public class TkDeviceController extends BaseController { @@ -133,10 +148,10 @@ public class TkDeviceController extends BaseController {
133 return ResponseEntity.ok(result); 148 return ResponseEntity.ok(result);
134 } 149 }
135 150
136 - private DeviceId updateTbDevice(Device tbDevice, TkCredentialsDto formCredentials) 151 + private Device updateTbDevice(
  152 + Device tbDevice, TkCredentialsDto formCredentials, boolean created)
137 throws ThingsboardException { 153 throws ThingsboardException {
138 Device oldDevice = null; 154 Device oldDevice = null;
139 - boolean created = tbDevice.getId() == null;  
140 if (!created) { 155 if (!created) {
141 oldDevice = checkDeviceId(tbDevice.getId(), Operation.WRITE); 156 oldDevice = checkDeviceId(tbDevice.getId(), Operation.WRITE);
142 } else { 157 } else {
@@ -147,6 +162,7 @@ public class TkDeviceController extends BaseController { @@ -147,6 +162,7 @@ public class TkDeviceController extends BaseController {
147 tbClusterService.onDeviceUpdated(savedDevice, oldDevice); 162 tbClusterService.onDeviceUpdated(savedDevice, oldDevice);
148 DeviceId tbDeviceId = savedDevice.getId(); 163 DeviceId tbDeviceId = savedDevice.getId();
149 DeviceCredentials deviceCredentials = null; 164 DeviceCredentials deviceCredentials = null;
  165 + try {
150 logEntityAction( 166 logEntityAction(
151 getCurrentUser(), 167 getCurrentUser(),
152 savedDevice.getId(), 168 savedDevice.getId(),
@@ -184,7 +200,18 @@ public class TkDeviceController extends BaseController { @@ -184,7 +200,18 @@ public class TkDeviceController extends BaseController {
184 null, 200 null,
185 deviceCredentials); 201 deviceCredentials);
186 } 202 }
187 - return tbDeviceId; 203 + } catch (Exception e) {
  204 + logEntityAction(
  205 + emptyId(EntityType.DEVICE),
  206 + null,
  207 + null,
  208 + ActionType.CREDENTIALS_UPDATED,
  209 + e,
  210 + deviceCredentials);
  211 + deleteTbDevice(tbDeviceId.getId().toString());
  212 + throw handleException(e);
  213 + }
  214 + return savedDevice;
188 } 215 }
189 216
190 @GetMapping("{id}") 217 @GetMapping("{id}")
@@ -482,6 +509,7 @@ public class TkDeviceController extends BaseController { @@ -482,6 +509,7 @@ public class TkDeviceController extends BaseController {
482 result.setMessage(str); 509 result.setMessage(str);
483 return result; 510 return result;
484 } 511 }
  512 +
485 @GetMapping({"/attributes/{deviceProfileId}"}) 513 @GetMapping({"/attributes/{deviceProfileId}"})
486 @ApiOperation("获取设备的属性") 514 @ApiOperation("获取设备的属性")
487 public ResponseEntity<JsonNode> getDeviceAttributes( 515 public ResponseEntity<JsonNode> getDeviceAttributes(
@@ -7,13 +7,9 @@ import lombok.RequiredArgsConstructor; @@ -7,13 +7,9 @@ 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.DeviceProfile;  
14 -import org.thingsboard.server.common.data.DeviceProfileProvisionType;  
15 -import org.thingsboard.server.common.data.DeviceProfileType;  
16 -import org.thingsboard.server.common.data.DeviceTransportType; 12 +import org.thingsboard.server.common.data.*;
17 import org.thingsboard.server.common.data.audit.ActionType; 13 import org.thingsboard.server.common.data.audit.ActionType;
18 import org.thingsboard.server.common.data.device.profile.*; 14 import org.thingsboard.server.common.data.device.profile.*;
19 import org.thingsboard.server.common.data.edge.EdgeEventActionType; 15 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
@@ -51,12 +47,11 @@ public class TkDeviceProfileController extends BaseController { @@ -51,12 +47,11 @@ public class TkDeviceProfileController extends BaseController {
51 private final TkDeviceProfileService tkDeviceProfileService; 47 private final TkDeviceProfileService tkDeviceProfileService;
52 48
53 @PostMapping() 49 @PostMapping()
54 - @Transactional  
55 @PreAuthorize( 50 @PreAuthorize(
56 - "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:post','api:yt:deviceProfile:update'})") 51 + "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:post','api:yt:deviceProfile:update'})")
57 @ApiOperation("创建 | 编辑") 52 @ApiOperation("创建 | 编辑")
58 public ResponseEntity<DeviceProfileDTO> saveDeviceProfile( 53 public ResponseEntity<DeviceProfileDTO> saveDeviceProfile(
59 - @RequestBody DeviceProfileDTO deviceProfileDTO) throws ThingsboardException { 54 + @RequestBody DeviceProfileDTO deviceProfileDTO) throws ThingsboardException {
60 55
61 boolean created = deviceProfileDTO.getId() == null; 56 boolean created = deviceProfileDTO.getId() == null;
62 57
@@ -64,10 +59,22 @@ public class TkDeviceProfileController extends BaseController { @@ -64,10 +59,22 @@ public class TkDeviceProfileController extends BaseController {
64 String tenantId = getCurrentUser().getCurrentTenantId(); 59 String tenantId = getCurrentUser().getCurrentTenantId();
65 deviceProfileDTO.setTenantId(tenantId); 60 deviceProfileDTO.setTenantId(tenantId);
66 DeviceProfile tbDeviceProfile = buildTbDeviceProfileFromDeviceProfileDTO(deviceProfileDTO); 61 DeviceProfile tbDeviceProfile = buildTbDeviceProfileFromDeviceProfileDTO(deviceProfileDTO);
  62 + DeviceProfile saveDeviceProfile = null;
  63 + try{
  64 + saveDeviceProfile = updateTbDeviceProfile(tbDeviceProfile);
  65 + deviceProfileDTO.setTbProfileId(saveDeviceProfile.getId().toString());
  66 + tkDeviceProfileService.insertOrUpdate(deviceProfileDTO);
  67 + }catch (Exception e){
  68 + if (created) {
  69 + logEntityAction(emptyId(EntityType.DEVICE_PROFILE), saveDeviceProfile,
  70 + null, created ? ActionType.ADDED : ActionType.UPDATED, e);
  71 + deviceProfileService.deleteDeviceProfile(getTenantId(), saveDeviceProfile.getId());
  72 + tbClusterService.onDeviceProfileDelete(saveDeviceProfile, null);
  73 + tbClusterService.broadcastEntityStateChangeEvent(saveDeviceProfile.getTenantId(), saveDeviceProfile.getId(), ComponentLifecycleEvent.DELETED);
  74 + throw handleException(e);
  75 + }
  76 + }
67 77
68 - DeviceProfile saveDeviceProfile = updateTbDeviceProfile(tbDeviceProfile);  
69 - deviceProfileDTO.setTbProfileId(saveDeviceProfile.getId().toString());  
70 - tkDeviceProfileService.insertOrUpdate(deviceProfileDTO);  
71 78
72 return ResponseEntity.ok(deviceProfileDTO); 79 return ResponseEntity.ok(deviceProfileDTO);
73 } 80 }
@@ -75,24 +82,24 @@ public class TkDeviceProfileController extends BaseController { @@ -75,24 +82,24 @@ public class TkDeviceProfileController extends BaseController {
75 @GetMapping("{id}") 82 @GetMapping("{id}")
76 @ApiOperation("详情") 83 @ApiOperation("详情")
77 @PreAuthorize( 84 @PreAuthorize(
78 - "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:deviceProfile:get'})") 85 + "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:deviceProfile:get'})")
79 public ResponseEntity<DeviceProfileDTO> getDevice(@PathVariable("id") String id) 86 public ResponseEntity<DeviceProfileDTO> getDevice(@PathVariable("id") String id)
80 - throws ThingsboardException { 87 + throws ThingsboardException {
81 return ResponseEntity.ok( 88 return ResponseEntity.ok(
82 - tkDeviceProfileService.getDeviceProfile(getCurrentUser().getCurrentTenantId(), id)); 89 + tkDeviceProfileService.getDeviceProfile(getCurrentUser().getCurrentTenantId(), id));
83 } 90 }
84 91
85 @GetMapping(params = {PAGE_SIZE, PAGE}) 92 @GetMapping(params = {PAGE_SIZE, PAGE})
86 @ApiOperation("查询") 93 @ApiOperation("查询")
87 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})") 94 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
88 public TkPageData<DeviceProfileDTO> pageDeviceProfile( 95 public TkPageData<DeviceProfileDTO> pageDeviceProfile(
89 - @RequestParam(PAGE_SIZE) int pageSize,  
90 - @RequestParam(PAGE) int page,  
91 - @RequestParam(value = "name", required = false) String name,  
92 - @RequestParam(value = "transportType", required = false) String transportType,  
93 - @RequestParam(value = ORDER_FILED, required = false) String orderBy,  
94 - @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)  
95 - throws ThingsboardException { 96 + @RequestParam(PAGE_SIZE) int pageSize,
  97 + @RequestParam(PAGE) int page,
  98 + @RequestParam(value = "name", required = false) String name,
  99 + @RequestParam(value = "transportType", required = false) String transportType,
  100 + @RequestParam(value = ORDER_FILED, required = false) String orderBy,
  101 + @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
  102 + throws ThingsboardException {
96 Map<String, Object> queryMap = new HashMap<>(); 103 Map<String, Object> queryMap = new HashMap<>();
97 queryMap.put(PAGE, page); 104 queryMap.put(PAGE, page);
98 queryMap.put(PAGE_SIZE, pageSize); 105 queryMap.put(PAGE_SIZE, pageSize);
@@ -109,17 +116,17 @@ public class TkDeviceProfileController extends BaseController { @@ -109,17 +116,17 @@ public class TkDeviceProfileController extends BaseController {
109 @ApiOperation("选项列表") 116 @ApiOperation("选项列表")
110 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})") 117 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
111 public ResponseEntity listDeviceProfile( 118 public ResponseEntity listDeviceProfile(
112 - @ApiParam(value = "设备类型") @RequestParam(value = "deviceType", required = false) 119 + @ApiParam(value = "设备类型") @RequestParam(value = "deviceType", required = false)
113 DeviceTypeEnum deviceType) 120 DeviceTypeEnum deviceType)
114 - throws ThingsboardException { 121 + throws ThingsboardException {
115 List<DeviceProfileDTO> results; 122 List<DeviceProfileDTO> results;
116 String tenantId = getCurrentUser().getCurrentTenantId(); 123 String tenantId = getCurrentUser().getCurrentTenantId();
117 if (getCurrentUser().isTenantAdmin()) { 124 if (getCurrentUser().isTenantAdmin()) {
118 results = tkDeviceProfileService.findDeviceProfile(tenantId, null,deviceType); 125 results = tkDeviceProfileService.findDeviceProfile(tenantId, null,deviceType);
119 } else { 126 } else {
120 results = 127 results =
121 - tkDeviceProfileService.findCustomerDeviceProfiles(  
122 - tenantId, getCurrentUser().getCustomerId(),deviceType); 128 + tkDeviceProfileService.findCustomerDeviceProfiles(
  129 + tenantId, getCurrentUser().getCustomerId(),deviceType);
123 } 130 }
124 131
125 return ResponseEntity.ok(results); 132 return ResponseEntity.ok(results);
@@ -129,7 +136,7 @@ public class TkDeviceProfileController extends BaseController { @@ -129,7 +136,7 @@ public class TkDeviceProfileController extends BaseController {
129 @ApiOperation("删除") 136 @ApiOperation("删除")
130 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:delete'})") 137 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:delete'})")
131 public void deleteDeviceProfiles(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) 138 public void deleteDeviceProfiles(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
132 - throws ThingsboardException { 139 + throws ThingsboardException {
133 String tenantId = getCurrentUser().getCurrentTenantId(); 140 String tenantId = getCurrentUser().getCurrentTenantId();
134 tkDeviceProfileService.checkDeviceProfiles(tenantId, deleteDTO.getIds()); 141 tkDeviceProfileService.checkDeviceProfiles(tenantId, deleteDTO.getIds());
135 142
@@ -142,8 +149,8 @@ public class TkDeviceProfileController extends BaseController { @@ -142,8 +149,8 @@ public class TkDeviceProfileController extends BaseController {
142 149
143 private void deleteTbDeviceProfile(String profileId) throws ThingsboardException { 150 private void deleteTbDeviceProfile(String profileId) throws ThingsboardException {
144 DeviceProfileDTO dto = 151 DeviceProfileDTO dto =
145 - tkDeviceProfileService.findDeviceProfileById(  
146 - getCurrentUser().getCurrentTenantId(), profileId); 152 + tkDeviceProfileService.findDeviceProfileById(
  153 + getCurrentUser().getCurrentTenantId(), profileId);
147 if (null != dto) { 154 if (null != dto) {
148 DeviceProfileId deviceProfileId = new DeviceProfileId(toUUID(dto.getTbProfileId())); 155 DeviceProfileId deviceProfileId = new DeviceProfileId(toUUID(dto.getTbProfileId()));
149 DeviceProfile deviceProfile = checkDeviceProfileId(deviceProfileId, Operation.DELETE); 156 DeviceProfile deviceProfile = checkDeviceProfileId(deviceProfileId, Operation.DELETE);
@@ -151,10 +158,10 @@ public class TkDeviceProfileController extends BaseController { @@ -151,10 +158,10 @@ public class TkDeviceProfileController extends BaseController {
151 158
152 tbClusterService.onDeviceProfileDelete(deviceProfile, null); 159 tbClusterService.onDeviceProfileDelete(deviceProfile, null);
153 tbClusterService.broadcastEntityStateChangeEvent( 160 tbClusterService.broadcastEntityStateChangeEvent(
154 - deviceProfile.getTenantId(), deviceProfile.getId(), ComponentLifecycleEvent.DELETED); 161 + deviceProfile.getTenantId(), deviceProfile.getId(), ComponentLifecycleEvent.DELETED);
155 162
156 logEntityAction( 163 logEntityAction(
157 - deviceProfileId, deviceProfile, null, ActionType.DELETED, null, deviceProfileId); 164 + deviceProfileId, deviceProfile, null, ActionType.DELETED, null, deviceProfileId);
158 165
159 sendEntityNotificationMsg(getTenantId(), deviceProfile.getId(), EdgeEventActionType.DELETED); 166 sendEntityNotificationMsg(getTenantId(), deviceProfile.getId(), EdgeEventActionType.DELETED);
160 } 167 }
@@ -163,9 +170,9 @@ public class TkDeviceProfileController extends BaseController { @@ -163,9 +170,9 @@ public class TkDeviceProfileController extends BaseController {
163 @GetMapping("/me/default") 170 @GetMapping("/me/default")
164 @ApiOperation("默认设备配置") 171 @ApiOperation("默认设备配置")
165 public ResponseEntity<DeviceProfile> findCurrentTenantDeviceProfiles() 172 public ResponseEntity<DeviceProfile> findCurrentTenantDeviceProfiles()
166 - throws ThingsboardException { 173 + throws ThingsboardException {
167 DeviceProfile result = 174 DeviceProfile result =
168 - deviceProfileService.findDefaultDeviceProfile(getCurrentUser().getTenantId()); 175 + deviceProfileService.findDefaultDeviceProfile(getCurrentUser().getTenantId());
169 return ResponseEntity.ok(result); 176 return ResponseEntity.ok(result);
170 } 177 }
171 178
@@ -192,21 +199,21 @@ public class TkDeviceProfileController extends BaseController { @@ -192,21 +199,21 @@ public class TkDeviceProfileController extends BaseController {
192 * @return 封装好的TBDeviceProfile 199 * @return 封装好的TBDeviceProfile
193 */ 200 */
194 private DeviceProfile buildTbDeviceProfileFromDeviceProfileDTO(DeviceProfileDTO deviceProfileDTO) 201 private DeviceProfile buildTbDeviceProfileFromDeviceProfileDTO(DeviceProfileDTO deviceProfileDTO)
195 - throws ThingsboardException { 202 + throws ThingsboardException {
196 DeviceProfile tbDeviceProfile = new DeviceProfile(); 203 DeviceProfile tbDeviceProfile = new DeviceProfile();
197 if (StringUtils.isNotBlank(deviceProfileDTO.getId())) { 204 if (StringUtils.isNotBlank(deviceProfileDTO.getId())) {
198 DeviceProfileDTO findDeviceProfile = 205 DeviceProfileDTO findDeviceProfile =
199 - tkDeviceProfileService.findDeviceProfileById(  
200 - getCurrentUser().getCurrentTenantId(), deviceProfileDTO.getId()); 206 + tkDeviceProfileService.findDeviceProfileById(
  207 + getCurrentUser().getCurrentTenantId(), deviceProfileDTO.getId());
201 if (StringUtils.isNotEmpty(findDeviceProfile.getTbProfileId())) { 208 if (StringUtils.isNotEmpty(findDeviceProfile.getTbProfileId())) {
202 UUID profileId = UUID.fromString(findDeviceProfile.getTbProfileId()); 209 UUID profileId = UUID.fromString(findDeviceProfile.getTbProfileId());
203 tbDeviceProfile.setId(new DeviceProfileId(profileId)); 210 tbDeviceProfile.setId(new DeviceProfileId(profileId));
204 tbDeviceProfile.setCreatedTime( 211 tbDeviceProfile.setCreatedTime(
205 - deviceProfileDTO.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli()); 212 + deviceProfileDTO.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli());
206 } 213 }
207 } else { 214 } else {
208 tbDeviceProfile.setCreatedTime( 215 tbDeviceProfile.setCreatedTime(
209 - LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()); 216 + LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
210 } 217 }
211 tbDeviceProfile.setName(deviceProfileDTO.getName()); 218 tbDeviceProfile.setName(deviceProfileDTO.getName());
212 tbDeviceProfile.setImage(deviceProfileDTO.getImage()); 219 tbDeviceProfile.setImage(deviceProfileDTO.getImage());
@@ -221,9 +228,9 @@ public class TkDeviceProfileController extends BaseController { @@ -221,9 +228,9 @@ public class TkDeviceProfileController extends BaseController {
221 if (StringUtils.isNotBlank(chainStr)) { 228 if (StringUtils.isNotBlank(chainStr)) {
222 UUID chainId = UUID.fromString(chainStr); 229 UUID chainId = UUID.fromString(chainStr);
223 RuleChain chain = 230 RuleChain chain =
224 - ruleChainService.findRuleChainById(TenantId.SYS_TENANT_ID, new RuleChainId(chainId)); 231 + ruleChainService.findRuleChainById(TenantId.SYS_TENANT_ID, new RuleChainId(chainId));
225 if (chain == null 232 if (chain == null
226 - || !deviceProfileDTO.getTenantId().equals(chain.getTenantId().getId().toString())) { 233 + || !deviceProfileDTO.getTenantId().equals(chain.getTenantId().getId().toString())) {
227 throw new TkDataValidationException(ErrorMessage.RULE_CHAIN_NOT_ENABLE.getMessage()); 234 throw new TkDataValidationException(ErrorMessage.RULE_CHAIN_NOT_ENABLE.getMessage());
228 } 235 }
229 tbDeviceProfile.setDefaultRuleChainId(new RuleChainId(chainId)); 236 tbDeviceProfile.setDefaultRuleChainId(new RuleChainId(chainId));
@@ -242,7 +249,7 @@ public class TkDeviceProfileController extends BaseController { @@ -242,7 +249,7 @@ public class TkDeviceProfileController extends BaseController {
242 } 249 }
243 250
244 tbDeviceProfile.setProfileData( 251 tbDeviceProfile.setProfileData(
245 - buildDeviceProfileData(transportType, deviceProfileDTO.getProfileData())); 252 + buildDeviceProfileData(transportType, deviceProfileDTO.getProfileData()));
246 return tbDeviceProfile; 253 return tbDeviceProfile;
247 } 254 }
248 } 255 }
@@ -23,9 +23,9 @@ public class TkDeviceRpcDTO implements Serializable { @@ -23,9 +23,9 @@ public class TkDeviceRpcDTO implements Serializable {
23 private TkModBusCheckType crc; 23 private TkModBusCheckType crc;
24 24
25 @ApiModelProperty(value = "寄存器地址",required = true) 25 @ApiModelProperty(value = "寄存器地址",required = true)
26 - private Integer registerAddr; 26 + private Integer registerAddress;
27 @ApiModelProperty(value = "寄存器数量") 27 @ApiModelProperty(value = "寄存器数量")
28 - private Integer registerNum; 28 + private Integer registerNumber;
29 29
30 30
31 31
@@ -36,7 +36,7 @@ public class CrcUtils { @@ -36,7 +36,7 @@ public class CrcUtils {
36 ri=ByteUtils.revert(ri); 36 ri=ByteUtils.revert(ri);
37 } 37 }
38 byte[] crc = ByteUtils.getBytes((short)ri); 38 byte[] crc = ByteUtils.getBytes((short)ri);
39 - return ByteUtils.bytesToStr(crc); 39 + return ByteUtils.bytesToHex(crc);
40 } 40 }
41 41
42 } 42 }
@@ -23,7 +23,6 @@ import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum; @@ -23,7 +23,6 @@ import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
23 import org.thingsboard.server.common.data.yunteng.utils.ByteUtils; 23 import org.thingsboard.server.common.data.yunteng.utils.ByteUtils;
24 import org.thingsboard.server.common.data.yunteng.utils.CrcUtils; 24 import org.thingsboard.server.common.data.yunteng.utils.CrcUtils;
25 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 25 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
26 -import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity;  
27 import org.thingsboard.server.dao.yunteng.entities.TkDeviceScriptEntity; 26 import org.thingsboard.server.dao.yunteng.entities.TkDeviceScriptEntity;
28 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceProfileMapper; 27 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceProfileMapper;
29 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceScriptMapper; 28 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceScriptMapper;
@@ -301,11 +300,11 @@ public class TkDeviceScriptServiceImpl @@ -301,11 +300,11 @@ public class TkDeviceScriptServiceImpl
301 StringBuilder result = new StringBuilder(config.getDeviceCode()); 300 StringBuilder result = new StringBuilder(config.getDeviceCode());
302 String functionCode = config.getMethod(); 301 String functionCode = config.getMethod();
303 result.append(functionCode); 302 result.append(functionCode);
304 - String addrStr = ByteUtils.integerToHex(config.getRegisterAddr()); 303 + String addrStr = ByteUtils.integerToHex(config.getRegisterAddress());
305 result.append(addrStr.substring(addrStr.length()-4)); 304 result.append(addrStr.substring(addrStr.length()-4));
306 305
307 List<Integer> values = config.getRegisterValues(); 306 List<Integer> values = config.getRegisterValues();
308 - Integer registerNum = config.getRegisterNum()==null?1:config.getRegisterNum(); 307 + Integer registerNum = config.getRegisterNumber()==null?1:config.getRegisterNumber();
309 if(values ==null || values.isEmpty()){ 308 if(values ==null || values.isEmpty()){
310 //读寄存器数据 309 //读寄存器数据
311 result.append(modelHex(registerNum)); 310 result.append(modelHex(registerNum));