Merge branch 'master_dev' into 20230614

@@ -3,16 +3,15 @@ package org.thingsboard.server.controller.yunteng;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationAlarmPageDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SysDictDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
@@ -46,11 +45,11 @@ public class TkAlarmInfoController extends BaseController {
   public TkPageData<TkAlarmEntity> pageAlarmInfo(
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
-      @RequestParam(value = "status", required = false) List<AlarmStatus> status,
+      @RequestParam(value = "status", required = false) AlarmStatus status,
       @RequestParam(value = "alarmType", required = false) String alarmType,
       @RequestParam(value = "severity", required = false) AlarmSeverity severity,
       @RequestParam(value = "organizationId", required = false) String organizationId,
-      @RequestParam(value = "deviceIds", required = false) List<String> deviceIds,
+      @RequestParam(value = "deviceId", required = false) String deviceId,
       @RequestParam(value = "deviceName", required = false) String deviceName,
       @RequestParam(value = "deviceType", required = false) DeviceTypeEnum deviceType,
       @RequestParam(value = "startTime", required = false) Long startTime,
@@ -63,7 +62,15 @@ public class TkAlarmInfoController extends BaseController {
     pageFilter.put(PAGE, page);
     pageFilter.put(ORDER_FILED, orderBy);
     pageFilter.put(ORDER_TYPE, orderType);
-
+    List<String> deviceIds = null;
+    List<AlarmStatus> statuses = null;
+    if(!StringUtils.isEmpty(deviceId))
+    {
+      deviceIds = List.of(deviceId);
+    }
+    if(null !=status){
+      statuses = List.of(status);
+    }
     UUID customerId = null;
     if (getCurrentUser().isCustomerUser()) {
       customerId = getCurrentUser().getCustomerId().getId();
@@ -76,13 +83,53 @@ public class TkAlarmInfoController extends BaseController {
         alarmType,
         startTime,
         endTime,
-        status,
+        statuses,
         deviceIds,
         deviceName,
         deviceType,
         EntityType.DEVICE,
         organizationId);
   }
+  @ApiOperation(value = "组态告警查询")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
+  @PostMapping("/configuration/page")
+  public TkPageData<TkAlarmEntity> pageAlarmInfoForConfiguration(@RequestBody ConfigurationAlarmPageDTO page) throws ThingsboardException {
+    Map<String, Object> pageFilter = new HashMap<>();
+    pageFilter.put(PAGE_SIZE, page.getPageSize());
+    pageFilter.put(PAGE, page.getPage());
+    pageFilter.put(ORDER_FILED, page.getOrderBy());
+    pageFilter.put(ORDER_TYPE, page.getOrderType());
+    UUID customerId = null;
+    if (getCurrentUser().isCustomerUser()) {
+      customerId = getCurrentUser().getCustomerId().getId();
+    }
+    AlarmSeverity severity = page.getSeverity();
+    AlarmStatus status = page.getStatus();
+    List<AlarmStatus> statuses = null;
+    if(null !=status){
+      statuses = List.of(status);
+    }
+    String alarmType = page.getAlarmType();
+    Long startTime = page.getStartTime();
+    Long endTime = page.getEndTime();
+    String deviceName = page.getDeviceName();
+    String organizationId = page.getOrganizationId();
+    DeviceTypeEnum deviceType = page.getDeviceType();
+    return alarmInfoService.alarmPage(
+            pageFilter,
+            getCurrentUser().getTenantId(),
+            customerId,
+            severity,
+            alarmType,
+            startTime,
+            endTime,
+            statuses,
+            page.getDeviceIds(),
+            deviceName,
+            deviceType,
+            EntityType.DEVICE,
+            organizationId);
+  }
 
   @ApiOperation(value = "告警类型")
   @GetMapping()

@@ -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());

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class BasePageDTO {
+  @ApiModelProperty(required = true)
+  @NotNull(message = "分页大小不能为空")
+  private int pageSize;
+
+  @NotNull(message = "分页不能为空")
+  @ApiModelProperty(required = true)
+  private int page;
+
+  private String orderBy;
+  private OrderTypeEnum orderType;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+public class ConfigurationAlarmPageDTO extends BasePageDTO {
+  private AlarmStatus status;
+  private String alarmType;
+  private String organizationId;
+
+  @ApiModelProperty(required = true)
+  @NotEmpty(message = "告警设备列表不能为空")
+  private List<String> deviceIds;
+
+  private String deviceName;
+  private DeviceTypeEnum deviceType;
+  private Long startTime;
+  private Long endTime;
+  private AlarmSeverity severity;
+}

@@ -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

@@ -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;
   }

@@ -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);
 }