fix: 修改使用中的TCP脚本，不能被禁用的提示信息

xp.Huang
1 parent d91759bd
Showing 4 changed files with 66 additions and 12 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceProfileController.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceProfileServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceProfileService.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceProfileController.java
View file @da9d981
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceProfileController.java
View file @da9d981
@@ -33,7 +33,6 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.msg.queue.ServiceQueue;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -48,8 +47,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequestMapping("api/yt/device_profile")
 @Api(tags = {"设备配置管理"})
 public class TkDeviceProfileController extends BaseController {
-  private final TkDeviceProfileService ytDeviceProfileService;
-  private final TkDeviceScriptService javaScriptService;
+  private final TkDeviceProfileService tkDeviceProfileService;
   @PostMapping()
   @PreAuthorize(
@@ -67,7 +65,7 @@ public class TkDeviceProfileController extends BaseController {
     DeviceProfile saveDeviceProfile = updateTbDeviceProfile(tbDeviceProfile, created);
     deviceProfileDTO.setTbProfileId(saveDeviceProfile.getId().toString());
-    ytDeviceProfileService.insertOrUpdate(deviceProfileDTO);
+    tkDeviceProfileService.insertOrUpdate(deviceProfileDTO);
     return ResponseEntity.ok(deviceProfileDTO);
   }
@@ -131,7 +129,7 @@ public class TkDeviceProfileController extends BaseController {
   public ResponseEntity<DeviceProfileDTO> getDevice(@PathVariable("id") String id)
       throws ThingsboardException {
     return ResponseEntity.ok(
-        ytDeviceProfileService.getDeviceProfile(getCurrentUser().getCurrentTenantId(), id));
+        tkDeviceProfileService.getDeviceProfile(getCurrentUser().getCurrentTenantId(), id));
   }
   @GetMapping(params = {PAGE_SIZE, PAGE})
@@ -154,7 +152,7 @@ public class TkDeviceProfileController extends BaseController {
     queryMap.put("transportType", transportType);
     queryMap.put(TENANT_ID, getCurrentUser().getCurrentTenantId());
     queryMap.put(CUSTOMER_ID, getCurrentUser().getCustomerId().toString());
-    return ytDeviceProfileService.page(queryMap, getCurrentUser().isTenantAdmin());
+    return tkDeviceProfileService.page(queryMap, getCurrentUser().isTenantAdmin());
   }
   @GetMapping("/me/list")
@@ -167,10 +165,10 @@ public class TkDeviceProfileController extends BaseController {
     List<DeviceProfileDTO> results;
     String tenantId = getCurrentUser().getCurrentTenantId();
     if (getCurrentUser().isTenantAdmin()) {
-      results = ytDeviceProfileService.findDeviceProfile(tenantId, null,deviceType);
+      results = tkDeviceProfileService.findDeviceProfile(tenantId, null,deviceType);
     } else {
       results =
-          ytDeviceProfileService.findCustomerDeviceProfiles(
+          tkDeviceProfileService.findCustomerDeviceProfiles(
               tenantId, getCurrentUser().getCustomerId(),deviceType);
     }
@@ -183,18 +181,18 @@ public class TkDeviceProfileController extends BaseController {
   public void deleteDeviceProfiles(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
     String tenantId = getCurrentUser().getCurrentTenantId();
-    ytDeviceProfileService.checkDeviceProfiles(tenantId, deleteDTO.getIds());
+    tkDeviceProfileService.checkDeviceProfiles(tenantId, deleteDTO.getIds());
     for (String id : deleteDTO.getIds()) {
       deleteTbDeviceProfile(id);
     }
-    ytDeviceProfileService.deleteDeviceProfiles(tenantId, deleteDTO.getIds());
+    tkDeviceProfileService.deleteDeviceProfiles(tenantId, deleteDTO.getIds());
   }
   private void deleteTbDeviceProfile(String profileId) throws ThingsboardException {
     DeviceProfileDTO dto =
-        ytDeviceProfileService.findDeviceProfileById(
+        tkDeviceProfileService.findDeviceProfileById(
             getCurrentUser().getCurrentTenantId(), profileId);
     if (null != dto) {
       DeviceProfileId deviceProfileId = new DeviceProfileId(toUUID(dto.getTbProfileId()));
@@ -248,7 +246,7 @@ public class TkDeviceProfileController extends BaseController {
     DeviceProfile tbDeviceProfile = new DeviceProfile();
     if (StringUtils.isNotBlank(deviceProfileDTO.getId())) {
       DeviceProfileDTO findDeviceProfile =
-          ytDeviceProfileService.findDeviceProfileById(
+          tkDeviceProfileService.findDeviceProfileById(
               getCurrentUser().getCurrentTenantId(), deviceProfileDTO.getId());
       if (StringUtils.isNotEmpty(findDeviceProfile.getTbProfileId())) {
         UUID profileId = UUID.fromString(findDeviceProfile.getTbProfileId());
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceProfileServiceImpl.java
View file @da9d981
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceProfileServiceImpl.java
View file @da9d981
@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.DeviceTransportType;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
@@ -20,6 +23,7 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.jpa.dao.TkJpaDeviceProfileDao;
@@ -85,6 +89,19 @@ public class TkDeviceProfileServiceImpl
   }
   @Override
+  public List<DeviceProfileDTO> findDeviceProfileByScriptId(String tenantId, String scriptId) {
+    if(StringUtils.isEmpty(tenantId) || StringUtils.isEmpty(scriptId)){
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    List<TkDeviceProfileEntity> entities = baseMapper.selectList(new LambdaQueryWrapper<TkDeviceProfileEntity>()
+            .eq(TkDeviceProfileEntity::getTenantId,tenantId).like(TkDeviceProfileEntity::getScriptId,scriptId));
+    if(null != entities && !entities.isEmpty()){
+      return entities.stream().map(entity->entity.getDTO(DeviceProfileDTO.class)).collect(Collectors.toList());
+    }
+    return null;
+  }
+
+  @Override
   @Transactional
   public DeviceProfileDTO insertOrUpdate(DeviceProfileDTO deviceDTO) {
     if (StringUtils.isBlank(deviceDTO.getId())) {
@@ -97,6 +114,9 @@ public class TkDeviceProfileServiceImpl
   private DeviceProfileDTO insert(DeviceProfileDTO deviceDTO) {
     TkDeviceProfileEntity profile = new TkDeviceProfileEntity();
+    if (Objects.equals(deviceDTO.getTransportType(), DeviceTransportType.TCP.name())) {
+      setDeviceScriptId(profile,deviceDTO.getProfileData().getTransportConfiguration());
+    }
     deviceDTO.copyToEntity(
         profile,
         ModelConstants.TablePropertyMapping.ACTIVE_TIME,
@@ -113,6 +133,9 @@ public class TkDeviceProfileServiceImpl
   private DeviceProfileDTO update(DeviceProfileDTO deviceDTO) {
     TkDeviceProfileEntity device = new TkDeviceProfileEntity();
+    if (Objects.equals(deviceDTO.getTransportType(), DeviceTransportType.TCP.name())) {
+      setDeviceScriptId(device,deviceDTO.getProfileData().getTransportConfiguration());
+    }
     deviceDTO.copyToEntity(
         device,
         ModelConstants.TablePropertyMapping.ACTIVE_TIME,
@@ -127,6 +150,23 @@ public class TkDeviceProfileServiceImpl
     baseMapper.updateById(device);
     return device.getDTO(DeviceProfileDTO.class);
   }
+  private void setDeviceScriptId(TkDeviceProfileEntity profile, DeviceProfileTransportConfiguration transportConfiguration)
+  {
+    JsonNode jsonNode = JacksonUtil.convertValue(transportConfiguration, JsonNode.class);
+    if(null != jsonNode)
+    {
+      String authScriptId = String.valueOf(jsonNode.get("authScriptId"));
+      String upScriptId = String.valueOf(jsonNode.get("upScriptId"));
+      List<String> list = List.of(authScriptId,upScriptId);
+      if(null != list && !list.isEmpty()){
+        String scriptId = list.get(FastIotConstants.MagicNumber.ZERO);
+        if(list.size()>FastIotConstants.MagicNumber.ONE){
+          scriptId = StringUtils.join(list,",");
+        }
+        profile.setScriptId(scriptId);
+      }
+    }
+  }
   @Override
   @Transactional
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @da9d981
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @da9d981
@@ -97,6 +97,14 @@ public class TkDeviceScriptServiceImpl
     if (!entity.getTenantId().equals(tenantId)) {
       throw new TkDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
     }
+    if(Objects.equals(status,StatusEnum.DISABLE.getIndex())){
+      List<DeviceProfileDTO> profileList = tkDeviceProfileService.findDeviceProfileByScriptId(tenantId,id);
+      if(null != profileList && !profileList.isEmpty()){
+
+        throw new TkDataValidationException(String.format(ErrorMessage.CURRENT_DATA_IN_USE.getMessage(),
+                profileList.get(0).getName()));
+      }
+    }
     entity.setStatus(status);
     return baseMapper.updateById(entity) > FastIotConstants.MagicNumber.ZERO;
   }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceProfileService.java
View file @da9d981
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceProfileService.java
View file @da9d981
@@ -53,4 +53,12 @@ public interface TkDeviceProfileService extends BaseService<TkDeviceProfileEntit
    * @return 设备配置信息
    */
   DeviceProfileDTO findByTbDeviceProfileId(String tenantId, String tbProfileId);
+
+  /**
+   * 根据脚本ID查询，使用的产品
+   * @param tenantId 租户ID
+   * @param scriptId 脚本ID
+   * @return 产品列表
+   */
+  List<DeviceProfileDTO> findDeviceProfileByScriptId(String tenantId,String scriptId);
 }