perf: 移除未引用的代码

@@ -2,12 +2,8 @@ package org.thingsboard.server.controller.yunteng;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
-import com.amazonaws.util.json.Jackson;
-import com.eclipsesource.json.Json;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -35,16 +31,12 @@ import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 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.dto.DeleteDTO;
-import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertConfigDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertConfigReqDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertReqDTO;
-import org.thingsboard.server.common.data.yunteng.enums.DatasourceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
 import org.thingsboard.server.dao.yunteng.service.SceneLinkageService;
 import org.thingsboard.server.dao.yunteng.service.TkRuleChainService;
@@ -118,27 +110,6 @@ public class TkConvertDataToController extends BaseController {
   public ResponseEntity<ConvertConfigDTO> createOrUpdateConvertData(
       @Validated @RequestBody ConvertConfigDTO convertConfigDTO) throws ThingsboardException {
     convertConfigDTO.setTenantId(getCurrentUser().getCurrentTenantId());
-    //这里针对普通租户管理员的代码 暂时屏蔽根据后续清空看是否开启或删除
-//    if(getCurrentUser().isPtCommonTenant()){
-//      convertConfigDTO.setDatasourceType(DatasourceTypeEnum.DEVICES);
-//      JsonArray convertDevices = new JsonArray();
-//      JsonNode productNode = convertConfigDTO.getDatasourceContent().get("convertProducts");
-//      List<String> orgIds = commonTenantOrganizationAllIds();
-//      for (JsonNode deviceProfileId: productNode ) {
-//        JsonObject product =new JsonObject();
-//        JsonArray devices = new JsonArray();
-//        List<DeviceDTO> dto=deviceMapper.findDevicesByProfileIdAndOrganizationId(orgIds,deviceProfileId.asText());
-//        if(null!=dto&&dto.size()>0){
-//          dto.forEach(device ->{devices.add(device.getTbDeviceId());});
-//          product.addProperty("product",deviceProfileId.asText());
-//          product.add("devices",devices);
-//          convertDevices.add(product);
-//        }
-//      }
-//      ObjectNode convertProducts = (ObjectNode) convertConfigDTO.getDatasourceContent();
-//      convertProducts.set("convertDevices",JacksonUtil.toJsonNode(convertDevices.toString()));
-//      convertConfigDTO.setDatasourceContent(convertProducts);
-//    }
     convertConfigDTO.setNodeType(FastIotConstants.CONVERT_DATA);
     return ResponseEntity.ok(convertConfigService.createOrUpdate(convertConfigDTO));
   }

@@ -63,7 +63,6 @@ public class TkDeviceController extends BaseController {
   private final TkDeviceProfileService ytDeviceProfileService;
   private final GatewayNotificationsService gatewayNotificationsService;
   private final TkAlarmInfoService tkAlarmInfoService ;
-  private final TkOrganizationService tkOrganizationService;
 
 
   @PostMapping("/batch/update")
@@ -71,8 +70,7 @@ public class TkDeviceController extends BaseController {
   @PreAuthorize(
           "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:device:post','api:yt:device:update'})")
   public ResponseEntity<String> batchUpdateDevice(
-          @Validated(AddGroup.class) @RequestBody List<DeviceDTO> deviceDTO,String orgId)
-          throws ThingsboardException, ExecutionException, InterruptedException {
+          @Validated(AddGroup.class) @RequestBody List<DeviceDTO> deviceDTO,String orgId) {
       deviceDTO.stream().forEach(i ->{
         i.setOrganizationId(orgId);
         try {

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -15,7 +14,6 @@ import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 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.dto.DeleteDTO;
-import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.task.TaskImmediateExecuteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.task.TkTaskCenterDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
@@ -23,12 +21,8 @@ import org.thingsboard.server.common.data.yunteng.enums.TargetTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.service.TkTaskCenterService;
-
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
@@ -39,7 +33,6 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequiredArgsConstructor
 public class TkTaskCenterController extends BaseController {
   private final TkTaskCenterService tkTaskCenterService;
-  @Autowired private DeviceMapper deviceMapper;
 
   @GetMapping(
       name = "page",

@@ -54,7 +54,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
@@ -247,7 +246,7 @@ public class TkUserController extends AbstractUserAccount {
   }
 
   @PreAuthorize(
-          "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:user:saveCommonTenant:post'})")//todo
+          "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:user:saveCommonTenant:post'})")
   @PostMapping("save_common_tenant")
   public UserDTO saveCommonTenant(@Validated(AddGroup.class) @RequestBody UserDTO userDTO)
           throws ThingsboardException {

@@ -354,7 +354,7 @@ public interface FastIotConstants {
 
     /** 租户下的用户 */
     public static final int IS_CUSTOMER_USER = 3;
-    /** 租户下的用户 */
+    /** 租户下的子管理员 */
     public static final int IS_CUSTOMER_TENANT = 4;
   }
   class Rpc{

@@ -137,9 +137,8 @@ public enum ErrorMessage {
   DEVICE_NOT_ONLINE(400111,"设备不在线，无法执行相关操作！"),
   GBT_VIDEO_REPETITION(400112,"该设备通道号视频已存在！"),
   SSRC_NO_ENABLED(400113,"未获取到可用的SSRC资源"),
-  TENANT_ERROR(400114,"租户管理员只允许创建一个"),
-  DEVICE_CENTER_IS_DISABLED(400115,"设备【%s】未被允许执行任务"),
-  CUSTOMER_USER_UPDATE_ERROR(400116,"已分配设备给该客户，请取消分配后重试"),
+  DEVICE_CENTER_IS_DISABLED(400114,"设备【%s】未被允许执行任务"),
+  CUSTOMER_USER_UPDATE_ERROR(400115,"已分配设备给该客户，请取消分配后重试"),
   HAVE_NO_PERMISSION(500002,"没有修改权限"),
   NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置");
 

@@ -60,7 +60,6 @@ public class TkHomePageServiceImpl implements HomePageService {
   private final EntityService entityService;
 
   private final ApiUsageStateService apiUsageStateService;
-  private final ApiUsageStateDao apiUsageStateDao;
 
   /** 查询遥测数据，兼容多种数据库 */
   private final TimeseriesService timeseriesService;

@@ -256,7 +256,7 @@ public class TkNoticeServiceImpl implements TkNoticeService {
       String templateId,
       TkOrganizationEntity organization,
       List<TkAlarmContactEntity> contacts) {
-    // TODO 推送钉钉消息
+    // 推送钉钉消息
     SmsReqDTO info = new SmsReqDTO();
     info.setId(templateId);
     info.setParams(setAliAlarmParams(alarmInfo, organization));
@@ -288,7 +288,7 @@ public class TkNoticeServiceImpl implements TkNoticeService {
             String templateId,
             TkOrganizationEntity organization,
             List<TkAlarmContactEntity> contacts) {
-        // TODO 推送企业微信通知
+        // 推送企业微信通知
         SmsReqDTO info = new SmsReqDTO();
         info.setId(templateId);
         info.setParams(setAliAlarmParams(alarmInfo, organization));
@@ -320,7 +320,7 @@ public class TkNoticeServiceImpl implements TkNoticeService {
       String templateId,
       TkOrganizationEntity organization,
       List<TkAlarmContactEntity> contacts) {
-    // TODO 推送微信通知
+    //  推送微信通知
     SmsReqDTO info = new SmsReqDTO();
     info.setId(templateId);
     info.setParams(setAliAlarmParams(alarmInfo, organization));
@@ -349,7 +349,7 @@ public class TkNoticeServiceImpl implements TkNoticeService {
             String templateId,
             TkOrganizationEntity organization,
             List<TkAlarmContactEntity> contacts) {
-        // TODO 电话通知
+        //  电话通知
         SmsReqDTO info = new SmsReqDTO();
         info.setId(templateId);
         info.setParams(setAliAlarmParams(alarmInfo, organization));

@@ -68,7 +68,6 @@
                su.password            as password,
                su.enabled             as enabled,
                su.account_expire_time as account_expire_time,
-               su.level               as level,
                st.name                as tenant_name,
                st.tenant_id           as tenant_id,
                st.enabled             as tenant_enabled,