Merge branch 'localhost-cxy' into 'master'

fix: 场景联动编辑租户id不为空,user添加备注,告警username分页修改,user电话不能重复问题

See merge request huang/thingsboard3.3.2!38

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
@@ -60,7 +61,7 @@ public class YtAlarmContactController extends BaseController {
     List<AlarmContactDTO> all = alarmService.findAll(getCurrentUser().getCurrentTenantId(), params);
     List<AlarmContactDTO> all = alarmService.findAll(getCurrentUser().getCurrentTenantId(), params);
     return ResponseEntity.ok(all);
     return ResponseEntity.ok(all);
   }
   }
-
+  @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
   @ApiOperation(value = "分页查询")
   @ApiOperation(value = "分页查询")
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @GetMapping(params = {PAGE_SIZE, PAGE})
   public YtPageData<AlarmContactDTO> pageAlarm(
   public YtPageData<AlarmContactDTO> pageAlarm(

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 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.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -41,6 +42,7 @@ public class YtAlarmInfoController extends BaseController {
 
 
 
 
     //分页测试通过
     //分页测试通过
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
     @ApiOperation(value="查询")
     @ApiOperation(value="查询")
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @GetMapping(params = {PAGE_SIZE, PAGE})
     public YtPageData<YtAlarmEntity> pageAlarmInfo(
     public YtPageData<YtAlarmEntity> pageAlarmInfo(
@@ -63,8 +65,6 @@ public class YtAlarmInfoController extends BaseController {
         if (orderType != null) {
         if (orderType != null) {
             pageFilter.put(ORDER_TYPE, orderType.name());
             pageFilter.put(ORDER_TYPE, orderType.name());
         }
         }
-
-
         return alarmInfoService.alarmPage(pageFilter,getCurrentUser().getTenantId(),alarmType,startTime,endTime,status,deviceId, EntityType.DEVICE,organizationId);
         return alarmInfoService.alarmPage(pageFilter,getCurrentUser().getTenantId(),alarmType,startTime,endTime,status,deviceId, EntityType.DEVICE,organizationId);
     }
     }
 
 

@@ -63,8 +63,8 @@ public class YtSceneLinkageController extends BaseController {
   @ApiOperation("修改场景联动的数据")
   @ApiOperation("修改场景联动的数据")
   @PostMapping("/update")
   @PostMapping("/update")
   public void updateSceneLinkage(
   public void updateSceneLinkage(
-      @Validated(UpdateGroup.class) @RequestBody SceneLinkageDTO sceneLinkageDTO) {
-    sceneLinkageService.updateSceneLinkage(sceneLinkageDTO);
+      @Validated(UpdateGroup.class) @RequestBody SceneLinkageDTO sceneLinkageDTO) throws ThingsboardException {
+    sceneLinkageService.updateSceneLinkage(sceneLinkageDTO,getCurrentUser().getCurrentTenantId());
   }
   }
 
 
   @ApiOperation("场景联动的分页")
   @ApiOperation("场景联动的分页")

@@ -189,6 +189,7 @@ public class YtUserController extends BaseController {
     } catch (Exception e) {
     } catch (Exception e) {
       throw handleException(e);
       throw handleException(e);
     }
     }
+
     return userService.saveTenantAdmin(
     return userService.saveTenantAdmin(
         userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
         userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
   }
   }
@@ -233,9 +234,15 @@ public class YtUserController extends BaseController {
   public ResponseResult<UserDTO> accountExist(@PathVariable String username)
   public ResponseResult<UserDTO> accountExist(@PathVariable String username)
       throws ThingsboardException {
       throws ThingsboardException {
     return ResponseResult.success(
     return ResponseResult.success(
-        userService.accountExist(username, getCurrentUser().getCurrentTenantId()));
+        userService.accountExist(username,getCurrentUser().getCurrentTenantId()));
   }
   }
 
 
+  @ApiOperation(value = "判断电话是否重复")
+  @GetMapping("/findUserByPhoneNumber/{phoneNumber}")
+  public ResponseResult<UserDTO> findUserByPhoneNumber(@PathVariable  String phoneNumber) throws ThingsboardException {
+    return ResponseResult.success(
+            userService.findUserByPhoneNumber(phoneNumber,getCurrentUser().getCurrentTenantId()));
+  }
   @PostMapping("/relation")
   @PostMapping("/relation")
   public String[] getUserRoleOrGroup(
   public String[] getUserRoleOrGroup(
       @Validated @RequestBody RoleOrOrganizationReqDTO roleOrGroupReqDTO) {
       @Validated @RequestBody RoleOrOrganizationReqDTO roleOrGroupReqDTO) {

@@ -37,7 +37,7 @@ public class UserDTO extends BaseDTO {
 
 
   /** 角色ids */
   /** 角色ids */
   private String[] roleIds;
   private String[] roleIds;
-
+  @NotEmpty(message = "电话号码不能为空或字符串", groups = AddGroup.class)
   private String phoneNumber;
   private String phoneNumber;
   private String email;
   private String email;
   private String avatar;
   private String avatar;
@@ -68,4 +68,6 @@ public class UserDTO extends BaseDTO {
 
 
   /** 0：超级管理员；1：租户账号；2：租户下的账号 */
   /** 0：超级管理员；1：租户账号；2：租户下的账号 */
   private Integer level;
   private Integer level;
+
+  private String  remark;
 }
 }

@@ -41,4 +41,6 @@ public class User extends TenantBaseEntity {
 
 
   /** 0：超级管理员；1：租户账号；2：租户下的账号 */
   /** 0：超级管理员；1：租户账号；2：租户下的账号 */
   private Integer level;
   private Integer level;
+
+  private String  remark;
 }
 }

@@ -195,14 +195,14 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
    */
    */
   @Override
   @Override
   @Transactional
   @Transactional
-  public SceneLinkageDTO updateSceneLinkage(SceneLinkageDTO sceneLinkageDTO) {
+  public SceneLinkageDTO updateSceneLinkage(SceneLinkageDTO sceneLinkageDTO,String tenantId) {
     // 获取场景
     // 获取场景
     SceneLinkage sceneLinkage = baseMapper.selectById(sceneLinkageDTO.getId());
     SceneLinkage sceneLinkage = baseMapper.selectById(sceneLinkageDTO.getId());
     if (sceneLinkage == null) {
     if (sceneLinkage == null) {
       throw new YtDataValidationException("此场景已不存在");
       throw new YtDataValidationException("此场景已不存在");
     }
     }
     sceneLinkageDTO.copyToEntity(sceneLinkage);
     sceneLinkageDTO.copyToEntity(sceneLinkage);
-
+    sceneLinkage.setTenantId(tenantId);
     updateTrigger(sceneLinkageDTO);
     updateTrigger(sceneLinkageDTO);
     updateDoAction(sceneLinkageDTO);
     updateDoAction(sceneLinkageDTO);
     updateDoCondition(sceneLinkageDTO);
     updateDoCondition(sceneLinkageDTO);

@@ -55,7 +55,7 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan
 
 
   @Override
   @Override
   public YtPageData<TenantDTO> page(Map<String, Object> queryMap) {
   public YtPageData<TenantDTO> page(Map<String, Object> queryMap) {
-    IPage<Tenant> tenantIPage = getPage(queryMap, "create_time", true);
+    IPage<Tenant> tenantIPage = getPage(queryMap, "create_time", false);
     IPage<TenantDTO> userPage =
     IPage<TenantDTO> userPage =
         baseMapper.getTenantPage(
         baseMapper.getTenantPage(
             tenantIPage, (String) queryMap.get("tenantName"), EntityId.NULL_UUID.toString());
             tenantIPage, (String) queryMap.get("tenantName"), EntityId.NULL_UUID.toString());

@@ -244,6 +244,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     user.setPhoneNumber(userDTO.getPhoneNumber());
     user.setPhoneNumber(userDTO.getPhoneNumber());
     user.setEmail(userDTO.getEmail());
     user.setEmail(userDTO.getEmail());
     user.setAccountExpireTime(userDTO.getAccountExpireTime());
     user.setAccountExpireTime(userDTO.getAccountExpireTime());
+    user.setRemark(userDTO.getRemark());
     if (userDTO.getPassword() !=null && !userDTO.getPassword().equals("******")) {
     if (userDTO.getPassword() !=null && !userDTO.getPassword().equals("******")) {
       user.setPassword(passwordEncoder.encode(userDTO.getPassword()));
       user.setPassword(passwordEncoder.encode(userDTO.getPassword()));
     }
     }
@@ -264,7 +265,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       boolean isTenantAdmin) {
       boolean isTenantAdmin) {
     String tenantId = (String) queryMap.get("tenantId");
     String tenantId = (String) queryMap.get("tenantId");
     IPage<UserDTO> userPage = null;
     IPage<UserDTO> userPage = null;
-    IPage<User> userIPage = getPage(queryMap, "create_time", true);
+    IPage<User> userIPage = getPage(queryMap, "create_time", false);
     String organizationId = queryMap.get("organizationId") != null ? (String) queryMap.get("organizationId") : null;
     String organizationId = queryMap.get("organizationId") != null ? (String) queryMap.get("organizationId") : null;
     List<String> userIds = null;
     List<String> userIds = null;
     if(null != organizationId){
     if(null != organizationId){
@@ -521,7 +522,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   }
   }
 
 
   @Override
   @Override
-  public UserDTO accountExist(String userName, String tenantId) {
+  public UserDTO accountExist(String userName,String tenantId) {
     if (StringUtils.isEmpty(userName)) {
     if (StringUtils.isEmpty(userName)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     }
@@ -531,6 +532,23 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     return baseMapper.findUserInfo(userDTO);
     return baseMapper.findUserInfo(userDTO);
   }
   }
 
 
+  /**
+   * 判断手机号是否重复
+   * @param phoneNumber
+   * @param tenantId
+   * @return
+   */
+  @Override
+  public UserDTO findUserByPhoneNumber(String phoneNumber, String tenantId) {
+    if (StringUtils.isEmpty(phoneNumber)) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    UserDTO userDTO = new UserDTO();
+    userDTO.setTenantId(tenantId);
+    userDTO.setPhoneNumber(phoneNumber);
+    return baseMapper.findUserInfoByPhoneNumber(userDTO);
+  }
+
   @Override
   @Override
   public User validateChangePasswordAccount(AccountReqDTO accountReqDTO) {
   public User validateChangePasswordAccount(AccountReqDTO accountReqDTO) {
     User user = baseMapper.selectById(accountReqDTO.getUserId());
     User user = baseMapper.selectById(accountReqDTO.getUserId());

@@ -32,6 +32,8 @@ public interface UserMapper extends BaseMapper<User> {
 
 
     UserDTO findUserInfo(UserDTO userDTO);
     UserDTO findUserInfo(UserDTO userDTO);
 
 
+    UserDTO findUserInfoByPhoneNumber(UserDTO userDTO);
+
     String findUserCustomerIdById(@Param("userId") String userId);
     String findUserCustomerIdById(@Param("userId") String userId);
 
 
     List<UserDTO> getUserCountByRoleType(@Param("roleType") RoleEnum roleType);
     List<UserDTO> getUserCountByRoleType(@Param("roleType") RoleEnum roleType);

@@ -32,7 +32,7 @@ public interface SceneLinkageService {
      * @param sceneLinkageDTO
      * @param sceneLinkageDTO
      * @return
      * @return
      */
      */
-    SceneLinkageDTO updateSceneLinkage(SceneLinkageDTO sceneLinkageDTO);
+    SceneLinkageDTO updateSceneLinkage(SceneLinkageDTO sceneLinkageDTO,String tenantId);
 
 
     /**
     /**
      * 分页查询
      * 分页查询

@@ -62,6 +62,14 @@ public interface YtUserService {
    */
    */
   UserDTO accountExist(String username, String tenantId);
   UserDTO accountExist(String username, String tenantId);
 
 
+  /**
+   * 判断电话是否注册过
+   * @param phoneNumber
+   * @param tenantId
+   * @return
+   */
+  UserDTO findUserByPhoneNumber(String phoneNumber,String tenantId);
+
   User validateChangePasswordAccount(AccountReqDTO accountReqDTO);
   User validateChangePasswordAccount(AccountReqDTO accountReqDTO);
 
 
   Optional<List<UserDTO>> getOrganizationUserByOrganizationId(
   Optional<List<UserDTO>> getOrganizationUserByOrganizationId(

@@ -35,7 +35,7 @@
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND a.tenant_id = #{queryMap.tenantId}
                 AND a.tenant_id = #{queryMap.tenantId}
             </if>
             </if>
-            <if test="queryMap.name !=null and queryMap.name !=''">
+            <if test="queryMap.username !=null and queryMap.username !=''">
                 AND a.username LIKE concat('%',#{queryMap.username}::TEXT,'%')
                 AND a.username LIKE concat('%',#{queryMap.username}::TEXT,'%')
             </if>
             </if>
             <if test="queryMap.organizationIds !=null">
             <if test="queryMap.organizationIds !=null">

@@ -37,6 +37,7 @@
         <result property="level" column="level"/>
         <result property="level" column="level"/>
         <result property="tbUser" column="tb_user"/>
         <result property="tbUser" column="tb_user"/>
         <result property="customerId" column="customer_id"/>
         <result property="customerId" column="customer_id"/>
+        <result property="remark" column="remark"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="columns">
     <sql id="columns">
@@ -54,7 +55,8 @@
         su.real_name AS real_name,
         su.real_name AS real_name,
         su.dept_id AS dept_id,
         su.dept_id AS dept_id,
         su.level AS level,
         su.level AS level,
-        su.tb_user AS tb_user
+        su.tb_user AS tb_user,
+        su.remark AS remark
     </sql>
     </sql>
 
 
     <select id="findUserDetailsByUserName" resultMap="userDetailsMap">
     <select id="findUserDetailsByUserName" resultMap="userDetailsMap">
@@ -157,6 +159,13 @@
         WHERE su.username=#{username}
         WHERE su.username=#{username}
         AND su.tenant_id=#{tenantId}
         AND su.tenant_id=#{tenantId}
     </select>
     </select>
+    <select id="findUserInfoByPhoneNumber" resultMap="userDTOMap">
+        SELECT
+        <include refid="columns"/>
+        FROM sys_user su
+        WHERE su.phone_number=#{phoneNumber}
+        AND su.tenant_id=#{tenantId}
+</select>
 
 
     <select id="findUserCustomerIdById" resultType="java.lang.String">
     <select id="findUserCustomerIdById" resultType="java.lang.String">
         SELECT tu.customer_id
         SELECT tu.customer_id