Merge branch 'ljl1207' into 'master'

docs: 设备配置相关接口

See merge request huang/thingsboard3.3.2!9

@@ -52,7 +52,7 @@ public class YtDeviceController extends BaseController {
   private final DeviceService tbDeviceService;
   private final DeviceService tbDeviceService;
 
 
   @PostMapping
   @PostMapping
-  @ApiOperation("刷新=保存+更新")
+  @ApiOperation("创建|编辑")
   public ResponseEntity<DeviceDTO> saveDevice(@Validated(AddGroup.class)@RequestBody DeviceDTO deviceDTO)
   public ResponseEntity<DeviceDTO> saveDevice(@Validated(AddGroup.class)@RequestBody DeviceDTO deviceDTO)
           throws ThingsboardException {
           throws ThingsboardException {
     String currentTenantId = getCurrentUser().getCurrentTenantId();
     String currentTenantId = getCurrentUser().getCurrentTenantId();
@@ -96,11 +96,13 @@ public class YtDeviceController extends BaseController {
   }
   }
 
 
   @GetMapping("{id}")
   @GetMapping("{id}")
+  @ApiOperation("详情")
   public ResponseEntity<DeviceDTO> getDevice(@PathVariable("id") String id) throws ThingsboardException {
   public ResponseEntity<DeviceDTO> getDevice(@PathVariable("id") String id) throws ThingsboardException {
     return ResponseEntity.of(deviceService.getDevice(getCurrentUser().getCurrentTenantId(), id));
     return ResponseEntity.of(deviceService.getDevice(getCurrentUser().getCurrentTenantId(), id));
   }
   }
 
 
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @GetMapping(params = {PAGE_SIZE, PAGE})
+  @ApiOperation("查询")
   public YtPageData<DeviceDTO> pageDevice(
   public YtPageData<DeviceDTO> pageDevice(
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
       @RequestParam(PAGE) int page,
@@ -133,8 +135,21 @@ public class YtDeviceController extends BaseController {
     }
     }
     return deviceService.page(getCurrentUser().getCurrentTenantId(), queryMap);
     return deviceService.page(getCurrentUser().getCurrentTenantId(), queryMap);
   }
   }
+  @PostMapping("/import")
+  @ApiOperation("导入配置")
+  public ResponseEntity<String> importDeviceProfile(){
+    //TODO   实现的业务功能
+    return ResponseEntity.ok("");
+  }
 
 
+  @PostMapping("/export")
+  @ApiOperation("导出")
+  public ResponseEntity<String> exportDeviceProfile(){
+    //TODO   实现的业务功能
+    return ResponseEntity.ok("");
+  }
   @DeleteMapping
   @DeleteMapping
+  @ApiOperation("删除")
   public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
   public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
     String currentTenantId = getCurrentUser().getCurrentTenantId();
     String currentTenantId = getCurrentUser().getCurrentTenantId();
     List<String> tdIds = deviceService.findTbDeviceId(currentTenantId, deleteDTO.getIds());
     List<String> tdIds = deviceService.findTbDeviceId(currentTenantId, deleteDTO.getIds());

@@ -34,6 +34,7 @@ import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Operation;
 
 
 import java.net.URI;
 import java.net.URI;
+import java.sql.ResultSet;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.ZoneOffset;
 import java.util.*;
 import java.util.*;
@@ -47,9 +48,9 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 public class YtDeviceProfileController extends BaseController {
 public class YtDeviceProfileController extends BaseController {
     private final YtDeviceProfileService ytDeviceProfileService;
     private final YtDeviceProfileService ytDeviceProfileService;
 
 
-    @PostMapping
+    @PostMapping()
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
-    @ApiOperation("刷新=保存+更新")
+    @ApiOperation("创建 | 编辑")
     public ResponseEntity<DeviceProfileDTO> saveDeviceProfile(
     public ResponseEntity<DeviceProfileDTO> saveDeviceProfile(
             @RequestBody DeviceProfileDTO deviceProfileDTO) throws ThingsboardException {
             @RequestBody DeviceProfileDTO deviceProfileDTO) throws ThingsboardException {
 
 
@@ -61,15 +62,13 @@ public class YtDeviceProfileController extends BaseController {
          * 2/3.处理TB业务逻辑
          * 2/3.处理TB业务逻辑
          * 3/3.处理业务平台的业务逻辑
          * 3/3.处理业务平台的业务逻辑
          */
          */
-        //TODO  1/3.验证业务平台中表单数据的合法性
 
 
-        //TODO  2/3.处理TB业务逻辑
         deviceProfileDTO.setTenantId(getCurrentUser().getCurrentTenantId());
         deviceProfileDTO.setTenantId(getCurrentUser().getCurrentTenantId());
         DeviceProfile tbDeviceProfile = buildTbDeviceProfileFromDeviceProfileDTO(deviceProfileDTO);
         DeviceProfile tbDeviceProfile = buildTbDeviceProfileFromDeviceProfileDTO(deviceProfileDTO);
         DeviceProfile savedDeviceProfile = updateTbDeviceProfile(tbDeviceProfile, created);
         DeviceProfile savedDeviceProfile = updateTbDeviceProfile(tbDeviceProfile, created);
 
 
 
 
-        //TODO  3/3.处理业务平台的业务逻辑
+
 
 
         DeviceProfileDTO newDeviceProfileDTO = ytDeviceProfileService.insertOrUpdate(savedDeviceProfile.getId().getId().toString(), deviceProfileDTO);
         DeviceProfileDTO newDeviceProfileDTO = ytDeviceProfileService.insertOrUpdate(savedDeviceProfile.getId().getId().toString(), deviceProfileDTO);
         return Optional.ofNullable(newDeviceProfileDTO)
         return Optional.ofNullable(newDeviceProfileDTO)
@@ -123,12 +122,14 @@ public class YtDeviceProfileController extends BaseController {
     }
     }
 
 
     @GetMapping("{id}")
     @GetMapping("{id}")
+    @ApiOperation("详情")
     public ResponseEntity<DeviceProfileDTO> getDevice(@PathVariable("id") String id) throws ThingsboardException {
     public ResponseEntity<DeviceProfileDTO> getDevice(@PathVariable("id") String id) throws ThingsboardException {
         return ResponseEntity.of(ytDeviceProfileService.getDeviceProfile(getCurrentUser().getCurrentTenantId(), id));
         return ResponseEntity.of(ytDeviceProfileService.getDeviceProfile(getCurrentUser().getCurrentTenantId(), id));
     }
     }
 
 
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @GetMapping(params = {PAGE_SIZE, PAGE})
-    public YtPageData<DeviceProfileDTO> pageDevice(
+    @ApiOperation("查询")
+    public YtPageData<DeviceProfileDTO> pageDeviceProfile(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
             @RequestParam(PAGE) int page,
             @RequestParam(value = "name", required = false) String name,
             @RequestParam(value = "name", required = false) String name,
@@ -140,7 +141,15 @@ public class YtDeviceProfileController extends BaseController {
         return ytDeviceProfileService.page(pageLink, getCurrentUser().getCurrentTenantId(), transportType);
         return ytDeviceProfileService.page(pageLink, getCurrentUser().getCurrentTenantId(), transportType);
     }
     }
 
 
+    @GetMapping("/me/list")
+    @ApiOperation("选项列表")
+    public ResponseEntity listDeviceProfile() throws ThingsboardException {
+        List<DeviceProfileDTO> results = ytDeviceProfileService.findDeviceProfile(getCurrentUser().getCurrentTenantId());
+        return ResponseEntity.ok(results);
+    }
+
     @DeleteMapping
     @DeleteMapping
+    @ApiOperation("删除")
     public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
     public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
         for (String id : deleteDTO.getIds()) {
         for (String id : deleteDTO.getIds()) {
             deleteTbDeviceProfile(id);
             deleteTbDeviceProfile(id);
@@ -163,12 +172,29 @@ public class YtDeviceProfileController extends BaseController {
         sendEntityNotificationMsg(getTenantId(), deviceProfile.getId(), EdgeEventActionType.DELETED);
         sendEntityNotificationMsg(getTenantId(), deviceProfile.getId(), EdgeEventActionType.DELETED);
     }
     }
 
 
-    @GetMapping("/me")
-    public ResponseEntity<List<DeviceProfileDTO>> findCurrentTenantDeviceProfiles() throws ThingsboardException {
+    @GetMapping("/me/default")
+    @ApiOperation("默认设备配置")
+    public ResponseEntity<DeviceProfile> findCurrentTenantDeviceProfiles() throws ThingsboardException {
+        DeviceProfile result = deviceProfileService.findDefaultDeviceProfile(getCurrentUser().getTenantId());
+        return ResponseEntity.ok(result);
+    }
+
+    @PostMapping("/import")
+    @ApiOperation("导入配置")
+    public ResponseEntity<String> importDeviceProfile(){
+        //TODO   实现的业务功能
+        return ResponseEntity.ok("");
+    }
 
 
-        return ResponseEntity.ok(ytDeviceProfileService.findDeviceProfile(getCurrentUser().getCurrentTenantId()));
+    @PostMapping("/export")
+    @ApiOperation("导出")
+    public ResponseEntity<String> exportDeviceProfile(){
+        //TODO   实现的业务功能
+        return ResponseEntity.ok("");
     }
     }
 
 
+
+
     /**
     /**
      * 构造调用TBDeviceProfile需要的参数
      * 构造调用TBDeviceProfile需要的参数
      *
      *

 package org.thingsboard.server.controller.yunteng;
 package org.thingsboard.server.controller.yunteng;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
@@ -19,6 +21,7 @@ import java.util.Optional;
 
 
 @RestController
 @RestController
 @RequestMapping("api/yt/organization")
 @RequestMapping("api/yt/organization")
+@Api(tags = "组织管理")
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 public class YtOrganizationController extends BaseController {
 public class YtOrganizationController extends BaseController {
 
 
@@ -49,17 +52,19 @@ public class YtOrganizationController extends BaseController {
         organizationService.deleteOrganizations(deleteDTO, getCurrentUser().getCurrentTenantId()));
         organizationService.deleteOrganizations(deleteDTO, getCurrentUser().getCurrentTenantId()));
   }
   }
 
 
-  @GetMapping("/me/organizations")
-  public List<OrganizationDTO> getMyOrganizations() throws ThingsboardException {
-    return organizationService.getMyOrganizations(
-        getCurrentUser().isPtTenantAdmin(),
-        getCurrentUser().getCurrentTenantId(),
-        getCurrentUser().getCurrentUserId());
+  @GetMapping("/me/list")
+  @ApiOperation("下拉列表")
+  public ResponseEntity getMyOrganizations() throws ThingsboardException {
+    List<OrganizationDTO> result = organizationService.getMyOrganizations(
+            getCurrentUser().isPtTenantAdmin(),
+            getCurrentUser().getCurrentTenantId(),
+            getCurrentUser().getCurrentUserId());
+    return ResponseEntity.ok(result);
   }
   }
 
 
   @PutMapping
   @PutMapping
-  public OrganizationDTO updateOrganization(@Validated(UpdateGroup.class) @RequestBody OrganizationDTO groupDTO) throws ThingsboardException {
-    return organizationService.updateOrganization(groupDTO, getCurrentUser().getCurrentTenantId());
+  public ResponseEntity updateOrganization(@Validated(UpdateGroup.class) @RequestBody OrganizationDTO groupDTO) throws ThingsboardException {
+    return ResponseEntity.ok(organizationService.updateOrganization(groupDTO, getCurrentUser().getCurrentTenantId()));
   }
   }
 
 
   @PutMapping("saveOrUpdateUserOrganizationMapping/{userId}")
   @PutMapping("saveOrUpdateUserOrganizationMapping/{userId}")

+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.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.DeviceProfileProvisionType;
+import org.thingsboard.server.common.data.DeviceProfileType;
+import org.thingsboard.server.common.data.DeviceTransportType;
+import org.thingsboard.server.common.data.audit.ActionType;
+import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileConfiguration;
+import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
+import org.thingsboard.server.common.data.device.profile.DisabledDeviceProfileProvisionConfiguration;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.RuleChainId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.data.rule.RuleChain;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.common.msg.queue.ServiceQueue;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.rule.RuleChainService;
+import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
+import org.thingsboard.server.service.security.permission.Operation;
+
+import java.net.URI;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("api/yt/rulechain")
+@Api(tags = {"规则链管理"})
+public class YtRuleChainController extends BaseController {
+    private final RuleChainService chainService;
+
+
+
+
+
+    @GetMapping("/me/list")
+    @ApiOperation("下拉列表")
+    public ResponseEntity listDeviceProfile() throws ThingsboardException {
+        TenantId tenantId = getCurrentUser().getTenantId();
+        return ResponseEntity.ok(chainService.getRootTenantRuleChain(tenantId));
+    }
+
+
+}