Merge branch 'master' into 20220916

@@ -74,7 +74,7 @@ public class SysJobController extends BaseController {
   }
 
   /** 任务调度状态修改 */
-  @PutMapping("/changeStatus/{id}/{status}")
+  @PutMapping("/change_status/{id}/{status}")
   @ApiOperation(value = "任务调度状态修改")
   public ResponseResult<Boolean> changeStatus(
       @PathVariable("id") String id, @PathVariable("status") Integer status)
@@ -120,7 +120,7 @@ public class SysJobController extends BaseController {
   }
 
   /** 校验cron表达式是否有效 */
-  @GetMapping("/checkCron/{cronExpression}")
+  @GetMapping("/check_cron/{cronExpression}")
   @ApiOperation(value = "校验cron表达式是否有效")
   public boolean checkCronExpressionIsValid(@PathVariable("cronExpression") String cronExpression) {
     if (StringUtils.isEmpty(cronExpression)) {
@@ -130,7 +130,7 @@ public class SysJobController extends BaseController {
   }
 
   /** 查询cron表达式近5次的执行时间 */
-  @GetMapping("/queryCronExpression/{cronExpression}")
+  @GetMapping("/query_cron_expression/{cronExpression}")
   @ResponseBody
   @ApiOperation(value = "查询cron表达式近5次的执行时间")
   public ResponseResult queryCronExpression(@PathVariable("cronExpression") String cronExpression) {

@@ -25,7 +25,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  *
  */
 @RestController
-@RequestMapping("api/yt/monitor/jobLog")
+@RequestMapping("api/yt/monitor/job_log")
 @RequiredArgsConstructor
 @Api(tags = {"定时任务执行日志"})
 public class SysJobLogController extends BaseController {

@@ -36,7 +36,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @Description 告警联系人 @Author cxy @Date 2021/11/2 14:54
  */
 @RestController
-@RequestMapping("/api/yt/alarmContact")
+@RequestMapping("/api/yt/alarm_contact")
 @RequiredArgsConstructor
 @Api(tags = "告警联系人")
 public class YtAlarmContactController extends BaseController {

@@ -18,7 +18,7 @@ import org.thingsboard.server.dao.yunteng.service.SysAppDesignService;
  */
 @Api(tags = "APP定制")
 @RestController
-@RequestMapping("api/yt/appDesign")
+@RequestMapping("api/yt/app_design")
 @RequiredArgsConstructor
 public class YtAppDesignController extends BaseController {
 

@@ -24,7 +24,7 @@ import java.util.List;
 public class YtAreaController {
   private final SysAreaService sysAreaService;
 
-  @PostMapping("areaList")
+  @PostMapping("list")
   @ApiOperation("查询")
   public ResponseEntity<List<SysAreaDTO>> areaList(@RequestBody SysAreaDTO sysAreaDTO) {
     return ResponseEntity.ok(sysAreaService.list(sysAreaDTO));

-package org.thingsboard.server.controller.yunteng;
-
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.yunteng.common.YtCommonService;
-import org.thingsboard.server.controller.BaseController;
-
-@RequiredArgsConstructor
-@RequestMapping("/api/yt/common")
-@RestController
-public class YtCommonController extends BaseController {
-    private final YtCommonService commonService;
-
-
-}

@@ -97,7 +97,7 @@ public class YtConfigurationCenterController extends BaseController {
     return ResponseEntity.ok(ytConfigurationCenterService.deleteConfigurationCenter(deleteDTO));
   }
 
-  @GetMapping("/getConfigurationInfo/{id}")
+  @GetMapping("/get_configuration_info/{id}")
   @ApiOperation("获取组态信息")
   public ResponseEntity<ConfigurationContentInfoDTO> getConfigurationInfos(
       @PathVariable("id") String id) throws ThingsboardException {

@@ -72,10 +72,10 @@ public class YtConfigurationNodeController extends BaseController {
         return ResponseEntity.ok(nodeDTO);
     }
 
-    @PostMapping("datascource")
+    @PostMapping("datasource")
     @ApiOperation("编辑数据源")
-    @PreAuthorize("@check.checkPermissions({},{'api:yt:configuration:node:datascource:post'})")
-    public ResponseEntity<ConfigurationDatasourceDTO> saveDatascource(
+    @PreAuthorize("@check.checkPermissions({},{'api:yt:configuration:node:datasource:post'})")
+    public ResponseEntity<ConfigurationDatasourceDTO> saveDatasource(
             @Validated({AddGroup.class}) @RequestBody ConfigurationDatasourceDTO datasourceDTO)
             throws ThingsboardException {
         datasourceDTO.setTenantId(getCurrentUser().getCurrentTenantId());
@@ -106,10 +106,10 @@ public class YtConfigurationNodeController extends BaseController {
     }
 
 
-    @DeleteMapping("datascource")
+    @DeleteMapping("datasource")
     @ApiOperation("删除数据源")
-    @PreAuthorize("@check.checkPermissions({},{'api:yt:configuration:node:datascource:delete'})")
-    public ResponseEntity<Boolean> deleteDatascource(@RequestBody ConfigurationDatasourceDTO deleteDTO)
+    @PreAuthorize("@check.checkPermissions({},{'api:yt:configuration:node:datasource:delete'})")
+    public ResponseEntity<Boolean> deleteDatasource(@RequestBody ConfigurationDatasourceDTO deleteDTO)
             throws ThingsboardException {
         deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
         return ResponseEntity.ok(datasourceService.deleteConfigurationDatasource(deleteDTO));

@@ -47,7 +47,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("api/yt/deviceProfile")
+@RequestMapping("api/yt/device_profile")
 @Api(tags = {"设备配置管理"})
 public class YtDeviceProfileController extends BaseController {
     private final YtDeviceProfileService ytDeviceProfileService;

@@ -25,7 +25,7 @@ import java.util.Map;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
-@RequestMapping("api/yt/dictItem")
+@RequestMapping("api/yt/dict_item")
 @RequiredArgsConstructor
 public class YtDictItemController extends BaseController {
   private final SysDictItemService sysDictItemService;

@@ -17,7 +17,7 @@ import java.util.HashMap;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
-@RequestMapping("api/yt/mailLog")
+@RequestMapping("api/yt/mail_log")
 @RequiredArgsConstructor
 public class YtMailLogController extends BaseController {
 

@@ -36,7 +36,7 @@ public class YtMenuController extends BaseController {
         getCurrentUser().isPtTenantAdmin(),needButton);
   }
 
-  @GetMapping("getMenuIdsByRoleId/{roleId}")
+  @GetMapping("get_ids/{roleId}")
   public Set<String> getMenuIdsByRoleId(@PathVariable("roleId") String roleId) {
     return menuService.getMenuIdsByRoleId(roleId);
   }

@@ -88,7 +88,7 @@ public class YtMessageTemplateController extends BaseController {
     return messageTemplateService.updateMessageTemplate(templateDTO);
   }
 
-  @PostMapping("/sendSms")
+  @PostMapping("/send_sms")
   public ResponseResult<String> sendSms(
       @Validated({AddGroup.class}) @RequestBody SmsReqDTO smsReqDTO) {
     boolean result = smsService.sendSms(smsReqDTO);
@@ -96,7 +96,7 @@ public class YtMessageTemplateController extends BaseController {
     return ResponseResult.success(message);
   }
 
-  @PostMapping("/sendEmail")
+  @PostMapping("/send_email")
   public ResponseResult<String> sendEmail(
       @Validated({AddGroup.class}) @RequestBody EmailReqDTO emailReqDTO) {
     boolean result = mailService.sendEmail(emailReqDTO);

@@ -39,7 +39,7 @@ public class YtNoAuthController{
   private final YtDataComponentService ytDataComponentService;
   private final YtDataBoardService ytDataBoardService;
 
-  @PostMapping("/sendLoginSmsCode/{phoneNumber}")
+  @PostMapping("/send_login_code/{phoneNumber}")
   public boolean sendVerificationCode(@PathVariable("phoneNumber") String phoneNumber) {
     Assert.isTrue(
         CHINA_MOBILE_PATTERN.matcher(phoneNumber).matches(), "please input correct phone number");
@@ -54,7 +54,7 @@ public class YtNoAuthController{
     userService.forgetPassword(phoneNumber, forget);
   }
 
-  @PostMapping("/resetCode/{phoneNumber}")
+  @PostMapping("/reset_code/{phoneNumber}")
   @ApiOperation("密码找回短信验证码")
   public void forgetPasswordCode(@PathVariable("phoneNumber") String phoneNumber) {
     smsService.sendSmsCode(phoneNumber, MsgTemplatePurposeEnum.FOR_FORGET_PASSWORD);
@@ -112,7 +112,7 @@ public class YtNoAuthController{
     objectNode.put("unchange", true);
     return objectNode;
   }
-  @GetMapping("/share/dataBoard/{boardId}/{tenantId}")
+  @GetMapping("/share/data_board/{boardId}/{tenantId}")
   @ApiOperation(value = "查询看板下的所有组件信息")
   public ResponseResult<MoreDataComponentInfoDTO> getDataComponentsByBoardId(
           @PathVariable("boardId") String boardId,@PathVariable("tenantId") String tenantId) throws ThingsboardException {

@@ -25,7 +25,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  */
 @Api(tags = "我的通知")
 @RestController
-@RequestMapping("api/yt/noticeUser")
+@RequestMapping("api/yt/notice_user")
 @RequiredArgsConstructor
 public class YtNoticeUserController extends BaseController {
 

@@ -82,7 +82,7 @@ public class YtOrganizationController extends BaseController {
             getCurrentUser().getCurrentUserId()));
   }
 
-  @PutMapping("saveOrUpdateUserOrganizationMapping/{userId}")
+  @PutMapping("save_organization_mapping/{userId}")
   public void bindUserToOrganization(
       @RequestBody String[] organizationIds, @PathVariable("userId") String userId) throws ThingsboardException {
     organizationService.bindUserToOrganization(getCurrentUser().getCurrentTenantId(), userId, organizationIds);

@@ -24,7 +24,7 @@ public class YtOssFileController {
     return fileStorageService.upload(file);
   }
 
-  @GetMapping("/downloadFile/{fileName:.+}")
+  @GetMapping("/download_file/{fileName:.+}")
   public ResponseEntity<?> downloadFile(
       @PathVariable String fileName, HttpServletRequest request, HttpServletResponse response) {
     return fileStorageService.download(fileName, request, response);

@@ -66,14 +66,14 @@ public class YtRoleController extends BaseController {
     return roleService.getPermissions(getCurrentUser().isPtSysadmin(), getCurrentUser().isPtTenantAdmin(), getCurrentUser().getCurrentTenantId(), getCurrentUser().getCurrentUserId());
   }
 
-  @PutMapping("updateRoleStatus/{roleId}/{status}")
+  @PutMapping("update_status/{roleId}/{status}")
   public void updateRoleStatus(
       @PathVariable("roleId") String roleId, @PathVariable("status") int status) throws ThingsboardException {
     Assert.isTrue(status == 0 || status == 1, "role status is not correct");
     roleService.updateRoleStatus(roleId, status, getCurrentUser().isPtSysadmin() ,getCurrentUser().getCurrentTenantId());
   }
 
-  @PostMapping("saveOrUpdateRoleInfoWithMenu")
+  @PostMapping("save_with_menu")
   @PreAuthorize("@check.checkPermissions({},{'api:yt:role:saveOrUpdateRoleInfoWithMenu:post','api:yt:role:saveOrUpdateRoleInfoWithMenu:update'})")
   public RoleDTO saveOrUpdateRoleInfoWithMenu(@RequestBody RoleReqDTO roleReqDTO) throws ThingsboardException {
     return roleService.saveOrUpdateRoleInfoWithMenu(

@@ -15,7 +15,7 @@ import org.thingsboard.server.dao.yunteng.service.YtRuleChainService;
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("api/yt/rulechain")
+@RequestMapping("api/yt/rule_chain")
 @Api(tags = {"规则链管理"})
 public class YtRuleChainController extends BaseController {
     private final YtRuleChainService chainService;

@@ -35,7 +35,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 
 /** @Description 场景联动 @Author cxy @Date 2021/11/25 11:25 */
 @RestController
-@RequestMapping("/api/yt/sceneLinkage")
+@RequestMapping("/api/yt/scene_linkage")
 @RequiredArgsConstructor
 @Api(tags = "场景联动")
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")

@@ -19,7 +19,7 @@ import java.util.HashMap;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
-@RequestMapping("api/yt/smsLog")
+@RequestMapping("api/yt/sms_log")
 @RequiredArgsConstructor
 public class YtSmsLogController extends BaseController {
 

@@ -36,7 +36,7 @@ public class YtTenantController extends AbstractUserAccount {
     this.accountProperties = accountProperties;
   }
 
-  @PostMapping("/resetPassword/{userId}")
+  @PostMapping("/reset_password/{userId}")
   @PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
   public void resetPassword(@PathVariable("userId") String userId) throws ThingsboardException {
     //check is tenant account

@@ -20,7 +20,7 @@ import java.util.List;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
-@RequestMapping("/api/yt/tenantProfiles")
+@RequestMapping("/api/yt/tenant_profiles")
 @RequiredArgsConstructor
 public class YtTenantProfilesController extends BaseController {
 

@@ -181,7 +181,7 @@ public class YtUserController extends AbstractUserAccount {
 
 
   @PreAuthorize("@check.checkPermissions({'SYS_ADMIN'},{'api:yt:user:saveTenantAdmin:post'})")
-  @PostMapping("saveTenantAdmin")
+  @PostMapping("save_tenant_admin")
   public UserDTO saveTenantAdmin(@Validated(AddGroup.class) @RequestBody UserDTO userDTO)
       throws ThingsboardException {
     if (StringUtils.isEmpty(userDTO.getTenantId())) {
@@ -226,7 +226,7 @@ public class YtUserController extends AbstractUserAccount {
         deleteDTO.getIds(), getCurrentUser().isPtSysadmin(), getCurrentUser().getCurrentTenantId());
   }
 
-  @GetMapping("getGroupUserByGroupId/{groupId}")
+  @GetMapping("get_group_user/{groupId}")
   public ResponseEntity<List<UserDTO>> getGroupUserByGroupId(
       @PathVariable("groupId") String groupId) throws ThingsboardException {
     return ResponseEntity.of(
@@ -245,7 +245,7 @@ public class YtUserController extends AbstractUserAccount {
     ExcelUtil.exportExcel(response, "用户信息", "user info", List.of(me), UserInfoDTO.class);
   }
 
-  @GetMapping("/accountExist/{username}")
+  @GetMapping("/account_exist/{username}")
   public ResponseResult<UserDTO> accountExist(@PathVariable String username)
       throws ThingsboardException {
     return ResponseResult.success(
@@ -253,7 +253,7 @@ public class YtUserController extends AbstractUserAccount {
   }
 
   @ApiOperation(value = "判断电话是否重复")
-  @GetMapping("/findUserByPhoneNumber/{phoneNumber}")
+  @GetMapping("/get_user/{phoneNumber}")
   public ResponseResult<UserDTO> findUserByPhoneNumber(@PathVariable  String phoneNumber) throws ThingsboardException {
     return ResponseResult.success(
             userService.findUserByPhoneNumber(phoneNumber));