Merge branch 'master' into 20220919

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysAppDesignService;
 
@@ -38,7 +39,7 @@ public class YtAppDesignController extends BaseController {
 
   @PutMapping("update")
   @ApiOperation("更新")
-  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','TENANT_ADMIN'},{'api:yt:appDesign:update:update'})")
+  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:appDesign:update:update'})")
   public ResponseEntity update(@RequestBody SysAppDesignDTO sysAppDesignDTO)
       throws ThingsboardException {
     sysAppDesignDTO.setId(null);
@@ -46,4 +47,14 @@ public class YtAppDesignController extends BaseController {
         ? ResponseEntity.ok().build()
         : ResponseEntity.badRequest().build();
   }
+
+  @PostMapping("data_reset")
+  @PreAuthorize(
+          "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:appDesign:data_reset:reset'})")
+  @ApiOperation("恢复出厂设置")
+  public ResponseResult<Boolean> dataReset()
+          throws ThingsboardException {
+    return ResponseResult.success(
+            sysAppDesignService.factoryDataReset(getCurrentUser().getCurrentTenantId()));
+  }
 }

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.dto.SysPlatformDesignDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService;
 
@@ -27,7 +28,7 @@ public class YtPlatformDesignController extends BaseController {
 
   @GetMapping("get")
   @ApiOperation("查询详情")
-  public ResponseEntity<SysPlatformDesignDTO> get()  {
+  public ResponseEntity<SysPlatformDesignDTO> get() {
     String tenantId = EntityId.NULL_UUID.toString();
     try {
       tenantId = getCurrentUser().getCurrentTenantId();
@@ -37,7 +38,8 @@ public class YtPlatformDesignController extends BaseController {
   }
 
   @PutMapping("update")
-  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','TENANT_ADMIN'},{'api:yt:platform:update:update'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:platform:update:update'})")
   @ApiOperation("更新")
   public ResponseEntity update(@RequestBody SysPlatformDesignDTO sysPlatformDesignDTO)
       throws ThingsboardException {
@@ -46,4 +48,14 @@ public class YtPlatformDesignController extends BaseController {
         ? ResponseEntity.ok().build()
         : ResponseEntity.badRequest().build();
   }
+
+  @PostMapping("data_reset")
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:platform:data_reset:reset'})")
+  @ApiOperation("恢复出厂设置")
+  public ResponseResult<Boolean> dataReset(@RequestBody SysPlatformDesignDTO sysPlatformDesignDTO)
+      throws ThingsboardException {
+    return ResponseResult.success(
+        sysPlatformDesignService.factoryDataReset(getCurrentUser().getCurrentTenantId()));
+  }
 }

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO;
 import org.thingsboard.server.dao.yunteng.entities.SysAppDesign;
 import org.thingsboard.server.dao.yunteng.mapper.SysAppDesignMapper;
@@ -21,34 +22,39 @@ import org.thingsboard.server.dao.yunteng.service.SysAppDesignService;
 public class SysAppDesignServiceImpl extends AbstractBaseService<SysAppDesignMapper, SysAppDesign>
     implements SysAppDesignService {
   @Override
-  public boolean save(SysAppDesignDTO sysAppDesignDTO,String tenantId) {
+  public boolean save(SysAppDesignDTO sysAppDesignDTO, String tenantId) {
     if (get(tenantId) != null) {
       return false;
     }
     SysAppDesign entity = sysAppDesignDTO.getEntity(SysAppDesign.class);
     entity.setTenantId(tenantId);
-    return baseMapper.insert(entity) > 0;
+    return baseMapper.insert(entity) > FastIotConstants.MagicNumber.ZERO;
   }
 
   @Override
   public SysAppDesignDTO get(String tenantId) {
-    SysAppDesign sysAppDesign = baseMapper
-            .selectOne(
-                    new LambdaQueryWrapper<SysAppDesign>()
-                            .eq(SysAppDesign::getTenantId, tenantId));
+    SysAppDesign sysAppDesign =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<SysAppDesign>().eq(SysAppDesign::getTenantId, tenantId));
     return sysAppDesign == null ? null : sysAppDesign.getDTO(SysAppDesignDTO.class);
   }
 
   @Override
-  public boolean update(SysAppDesignDTO sysAppDesignDTO,String tenantId) {
+  public boolean update(SysAppDesignDTO sysAppDesignDTO, String tenantId) {
     if (get(tenantId) != null) {
       return baseMapper.update(
               sysAppDesignDTO.getEntity(SysAppDesign.class),
-              new LambdaQueryWrapper<SysAppDesign>()
-                      .eq(SysAppDesign::getTenantId, tenantId))
-              > 0;
-    }else {
-      return save(sysAppDesignDTO,tenantId);
+              new LambdaQueryWrapper<SysAppDesign>().eq(SysAppDesign::getTenantId, tenantId))
+          > FastIotConstants.MagicNumber.ZERO;
+    } else {
+      return save(sysAppDesignDTO, tenantId);
     }
   }
+
+  @Override
+  public boolean factoryDataReset(String tenantId) {
+    return baseMapper.delete(
+            new LambdaQueryWrapper<SysAppDesign>().eq(SysAppDesign::getTenantId, tenantId))
+        > FastIotConstants.MagicNumber.ZERO;
+  }
 }

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.SysPlatformDesignDTO;
 import org.thingsboard.server.dao.yunteng.entities.SysPlatformDesign;
 import org.thingsboard.server.dao.yunteng.mapper.SysPlatformDesignMapper;
@@ -21,32 +22,40 @@ import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService;
 public class SysPlatformDesignServiceImpl
     extends AbstractBaseService<SysPlatformDesignMapper, SysPlatformDesign>
     implements SysPlatformDesignService {
-    @Override
-    public boolean save(SysPlatformDesignDTO sysAppDesignDTO,String tenantId) {
-        SysPlatformDesign entity = sysAppDesignDTO.getEntity(SysPlatformDesign.class);
-        entity.setTenantId(tenantId);
-        return baseMapper.insert(entity) > 0;
-    }
+  @Override
+  public boolean save(SysPlatformDesignDTO sysAppDesignDTO, String tenantId) {
+    SysPlatformDesign entity = sysAppDesignDTO.getEntity(SysPlatformDesign.class);
+    entity.setTenantId(tenantId);
+    return baseMapper.insert(entity) > 0;
+  }
 
-    @Override
-    public SysPlatformDesignDTO get(String tenantId) {
-        SysPlatformDesign sysPlatformDesign = baseMapper
-                .selectOne(
-                        new LambdaQueryWrapper<SysPlatformDesign>()
-                                .eq(SysPlatformDesign::getTenantId, tenantId));
-        return sysPlatformDesign == null ? null : sysPlatformDesign.getDTO(SysPlatformDesignDTO.class);
-    }
+  @Override
+  public SysPlatformDesignDTO get(String tenantId) {
+    SysPlatformDesign sysPlatformDesign =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<SysPlatformDesign>()
+                .eq(SysPlatformDesign::getTenantId, tenantId));
+    return sysPlatformDesign == null ? null : sysPlatformDesign.getDTO(SysPlatformDesignDTO.class);
+  }
 
-    @Override
-    public boolean update(SysPlatformDesignDTO sysAppDesignDTO,String tenantId) {
-        if (get(tenantId) != null) {
-            return baseMapper.update(
-                    sysAppDesignDTO.getEntity(SysPlatformDesign.class),
-                    new LambdaQueryWrapper<SysPlatformDesign>()
-                            .eq(SysPlatformDesign::getTenantId, tenantId))
-                    > 0;
-        }else {
-            return save(sysAppDesignDTO,tenantId);
-        }
+  @Override
+  public boolean update(SysPlatformDesignDTO sysAppDesignDTO, String tenantId) {
+    if (get(tenantId) != null) {
+      return baseMapper.update(
+              sysAppDesignDTO.getEntity(SysPlatformDesign.class),
+              new LambdaQueryWrapper<SysPlatformDesign>()
+                  .eq(SysPlatformDesign::getTenantId, tenantId))
+          > 0;
+    } else {
+      return save(sysAppDesignDTO, tenantId);
     }
+  }
+
+  @Override
+  public boolean factoryDataReset(String tenantId) {
+    return baseMapper.delete(
+            new LambdaQueryWrapper<SysPlatformDesign>()
+                .eq(SysPlatformDesign::getTenantId, tenantId))
+        > FastIotConstants.MagicNumber.ZERO;
+  }
 }

 package org.thingsboard.server.dao.yunteng.service;
 
-
 import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO;
 import org.thingsboard.server.dao.yunteng.entities.SysAppDesign;
 
@@ -9,10 +8,17 @@ import org.thingsboard.server.dao.yunteng.entities.SysAppDesign;
  * @desc:
  * @date: 2021/12/3-18:40
  */
-public interface SysAppDesignService extends BaseService<SysAppDesign>{
-  boolean save(SysAppDesignDTO sysAppDesignDTO,String tenantId);
+public interface SysAppDesignService extends BaseService<SysAppDesign> {
+  boolean save(SysAppDesignDTO sysAppDesignDTO, String tenantId);
 
   SysAppDesignDTO get(String tenantId);
 
-  boolean update(SysAppDesignDTO sysAppDesignDTO,String tenantId);
+  boolean update(SysAppDesignDTO sysAppDesignDTO, String tenantId);
+
+  /**
+   * 恢复出厂设置
+   *
+   * @return true 成功 false 失败
+   */
+  boolean factoryDataReset(String tenantId);
 }

@@ -13,4 +13,10 @@ public interface SysPlatformDesignService extends BaseService<SysPlatformDesign>
     SysPlatformDesignDTO get(String tenantId);
 
     boolean update(SysPlatformDesignDTO sysPlatformDesignDTO,String tenantId);
+
+    /**
+     * 恢复出厂设置
+     * @return true 成功 false 失败
+     */
+    boolean factoryDataReset(String tenantId);
 }