zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 租户id类型 String->Long

V0.5.x
jay 2024-06-13 19:08:46 +08:00
parent 40af1e6f51
commit 86d51844ff
60 changed files with 103 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/TenantModel.java
View File

@ -38,6 +38,6 @@ public class TenantModel extends BaseModel {
/**
* 租户编号
*/
private String tenantId;
private Long tenantId;
}

2
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/system/SysDept.java
View File

@ -99,7 +99,7 @@ public class SysDept extends BaseModel implements Id<Long>, Serializable {
/**
* 租户编号
*/
private String tenantId;
private Long tenantId;
}

2
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/system/SysLoginInfo.java
View File

@ -47,7 +47,7 @@ public class SysLoginInfo implements Id<Long>,Serializable {
/**
* 租户编号
*/
private String tenantId;
private Long tenantId;
/**
* 用户账号

2
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/system/SysOperLog.java
View File

@ -51,7 +51,7 @@ public class SysOperLog extends BaseModel implements Id<Long>, Serializable {
/**
* 租户编号
*/
private String tenantId;
private Long tenantId;
/**
* 模块标题

2
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/system/SysTenant.java
View File

@ -50,7 +50,7 @@ public class SysTenant extends BaseModel implements Id<Long>,Serializable {
/**
* 租户编号
*/
private String tenantId;
private Long tenantId;
/**
* 联系人

2
iot-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysLogininforData.java
View File

@ -51,7 +51,7 @@ public interface ISysLogininforData extends ICommonData<SysLoginInfo, Long> {
*
* @param tenantId 租户id
*/
void deleteByTenantId(String tenantId);
void deleteByTenantId(Long tenantId);
/**
* 清除所有

4
iot-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOperLogData.java
View File

@ -37,7 +37,7 @@ public interface ISysOperLogData extends ICommonData<SysOperLog, Long> {
/**
* 按条件分页查询
*/
Paging<SysOperLog> findByConditions(String tenantId, String title, Integer businessType,
Paging<SysOperLog> findByConditions(Long tenantId, String title, Integer businessType,
Integer status, int page, int size);
/**
@ -45,7 +45,7 @@ public interface ISysOperLogData extends ICommonData<SysOperLog, Long> {
*
* @param tenantId 租户id
*/
void deleteByTenantId(String tenantId);
void deleteByTenantId(Long tenantId);
void deleteAll();
}

6
iot-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserData.java
View File

@ -52,13 +52,13 @@ public interface ISysUserData extends ICommonData<SysUser, Long> {
SysUser selectByPhonenumber(String phonenumber);
SysUser selectTenantUserByPhonenumber(String phonenumber, String tenantId);
SysUser selectTenantUserByPhonenumber(String phonenumber, Long tenantId);
SysUser selectTenantUserByEmail(String email, String tenantId);
SysUser selectTenantUserByEmail(String email, Long tenantId);
SysUser selectUserByEmail(String email);
SysUser selectTenantUserByUserName(String username, String tenantId);
SysUser selectTenantUserByUserName(String username, Long tenantId);
SysUser selectUserByUserName(String username);

6
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/IJPACommData.java
View File

@ -85,13 +85,13 @@ public interface IJPACommData<T extends Id<ID>, ID> extends ICommonData<T, ID> {
tbData = dbObj;
}
if (tbData instanceof TenantAware) {
String sourceTid = null;
Long sourceTid = null;
if (data instanceof TenantModel) {
sourceTid = ((TenantModel) data).getTenantId();
}
String tenantId = TenantHelper.getTenantId();
Long tenantId = TenantHelper.getTenantId();
//未指定租户id,使用当前用户所属租户id
if (StringUtils.isBlank(sourceTid) && tenantId != null) {
if (Objects.isNull(sourceTid) && tenantId != null) {
((TenantAware) tbData).setTenantId(tenantId);
}
}

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbHome.java
View File

@ -95,6 +95,6 @@ public class TbHome extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
}

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbIcon.java
View File

@ -55,7 +55,7 @@ public class TbIcon extends BaseEntity implements TenantAware {
@Column(name = "tenant_id")
private String tenantId;
private Long tenantId;
@ApiModelProperty(value = "图标分类id")
private Long iconTypeId;

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbIconType.java
View File

@ -55,7 +55,7 @@ public class TbIconType extends BaseEntity implements TenantAware {
@Column(name = "tenant_id")
private String tenantId;
private Long tenantId;
@ApiModelProperty(value = "分类名称")
private String typeName;

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbPluginInfo.java
View File

@ -141,5 +141,5 @@ public class TbPluginInfo extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
}

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java
View File

@ -54,7 +54,7 @@ public class TbProduct implements TenantAware {
@Column(name = "tenant_id")
private String tenantId;
private Long tenantId;
@ApiModelProperty(value = "产品key")
private String productKey;

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSpace.java
View File

@ -76,6 +76,6 @@ public class TbSpace extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
}

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSpaceDevice.java
View File

@ -85,6 +85,6 @@ public class TbSpaceDevice extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
}

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysApp.java
View File

@ -70,7 +70,7 @@ public class TbSysApp extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 应用名称

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysConfig.java
View File

@ -66,7 +66,7 @@ public class TbSysConfig extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 参数名称

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDept.java
View File

@ -70,7 +70,7 @@ public class TbSysDept extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户ID")
private String tenantId;
private Long tenantId;
/**
* 父部门ID

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDictData.java
View File

@ -68,7 +68,7 @@ public class TbSysDictData extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 字典排序

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDictType.java
View File

@ -68,7 +68,7 @@ public class TbSysDictType extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 字典名称

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysLogininfor.java
View File

@ -64,7 +64,7 @@ public class TbSysLogininfor extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 用户账号

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysNotice.java
View File

@ -67,7 +67,7 @@ public class TbSysNotice extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 公告标题

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOperLog.java
View File

@ -60,7 +60,7 @@ public class TbSysOperLog implements Serializable {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 操作模块

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOss.java
View File

@ -62,7 +62,7 @@ public class TbSysOss extends BaseEntity {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 文件名

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOssConfig.java
View File

@ -67,7 +67,7 @@ public class TbSysOssConfig extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 配置key

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysPost.java
View File

@ -66,7 +66,7 @@ public class TbSysPost extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 岗位编码

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRole.java
View File

@ -69,7 +69,7 @@ public class TbSysRole extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 角色名称

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenant.java
View File

@ -64,7 +64,7 @@ public class TbSysTenant extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 联系人

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUser.java
View File

@ -70,7 +70,7 @@ public class TbSysUser extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 部门ID

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbUserInfo.java
View File

@ -68,7 +68,7 @@ public class TbUserInfo extends BaseEntity implements TenantAware {
* 租户编号
*/
@ApiModelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 密钥（密码加密后的内容）

3
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysConfigDataImpl.java
View File

@ -37,6 +37,7 @@ import cc.iotkit.data.system.ISysConfigData;
import cc.iotkit.data.util.PageBuilder;
import cc.iotkit.data.util.PredicateBuilder;
import cc.iotkit.model.system.SysConfig;
import cn.hutool.core.util.ObjectUtil;
import com.querydsl.core.QueryResults;
import com.querydsl.core.types.Predicate;
import com.querydsl.jpa.impl.JPAQueryFactory;
@ -119,7 +120,7 @@ public class SysConfigDataImpl implements ISysConfigData, IJPACommData<SysConfig
public List<SysConfig> findAllByCondition(SysConfig data) {
Predicate predicate = PredicateBuilder.instance()
.and(StringUtils.isNotEmpty(data.getConfigKey()), () -> tbSysConfig.configKey.eq(data.getConfigKey()))
.and(StringUtils.isNotEmpty(data.getTenantId()), () -> tbSysConfig.tenantId.eq(data.getTenantId()))
.and(ObjectUtil.isNotNull(data.getTenantId()), () -> tbSysConfig.tenantId.eq(data.getTenantId()))
.build();
Iterator<TbSysConfig> iterator = baseRepository.findAll(predicate).iterator();
return MapstructUtils.convert(IteratorUtils.toList(iterator), SysConfig.class);

3
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysDictDataImpl.java
View File

@ -35,6 +35,7 @@ import cc.iotkit.data.system.ISysDictData;
import cc.iotkit.data.util.PageBuilder;
import cc.iotkit.data.util.PredicateBuilder;
import cc.iotkit.model.system.SysDictData;
import cn.hutool.core.util.ObjectUtil;
import com.querydsl.core.types.Predicate;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;
@ -118,6 +119,6 @@ public class SysDictDataImpl implements ISysDictData, IJPACommData<SysDictData,
.and(StringUtils.isNotEmpty(dictData.getDictLabel()), () -> tbSysDictData.dictLabel.like(dictData.getDictLabel()))
.and(StringUtils.isNotEmpty(dictData.getDictType()), () -> tbSysDictData.dictType.eq(dictData.getDictType()))
.and(StringUtils.isNotEmpty(dictData.getStatus()), () -> tbSysDictData.status.eq(dictData.getStatus()))
.and(StringUtils.isNotEmpty(dictData.getTenantId()), () -> tbSysDictData.tenantId.eq(dictData.getTenantId())).build();
.and(ObjectUtil.isNotNull(dictData.getTenantId()), () -> tbSysDictData.tenantId.eq(dictData.getTenantId())).build();
}
}

3
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysDictTypeDataImpl.java
View File

@ -34,6 +34,7 @@ import cc.iotkit.data.system.ISysDictTypeData;
import cc.iotkit.data.util.PageBuilder;
import cc.iotkit.data.util.PredicateBuilder;
import cc.iotkit.model.system.SysDictType;
import cn.hutool.core.util.ObjectUtil;
import com.querydsl.core.types.Predicate;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;
@ -121,7 +122,7 @@ public class SysDictTypeDataImpl implements ISysDictTypeData, IJPACommData<SysDi
.and(StringUtils.isNotEmpty(dictType.getDictName()), () -> tbSysDictType.dictName.like(dictType.getDictName()))
.and(StringUtils.isNotEmpty(dictType.getDictType()), () -> tbSysDictType.dictType.like(dictType.getDictType()))
.and(StringUtils.isNotEmpty(dictType.getStatus()), () -> tbSysDictType.status.eq(dictType.getStatus()))
.and(StringUtils.isNotEmpty(dictType.getTenantId()), () -> tbSysDictType.tenantId.eq(dictType.getTenantId())).build();
.and(ObjectUtil.isNotNull(dictType.getTenantId()), () -> tbSysDictType.tenantId.eq(dictType.getTenantId())).build();
}

2
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysLogininfoDataImpl.java
View File

@ -103,7 +103,7 @@ public class SysLogininfoDataImpl implements ISysLogininforData, IJPACommData<Sy
}
@Override
public void deleteByTenantId(String tenantId) {
public void deleteByTenantId(Long tenantId) {
}

4
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysOperLogDataImpl.java
View File

@ -77,12 +77,12 @@ public class SysOperLogDataImpl implements ISysOperLogData, IJPACommData<SysOper
}
@Override
public Paging<SysOperLog> findByConditions(String tenantId, String title, Integer businessType, Integer status, int page, int size) {
public Paging<SysOperLog> findByConditions(Long tenantId, String title, Integer businessType, Integer status, int page, int size) {
return null;
}
@Override
public void deleteByTenantId(String tenantId) {
public void deleteByTenantId(Long tenantId) {
}

3
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysRoleDataImpl.java
View File

@ -34,6 +34,7 @@ import cc.iotkit.data.system.ISysRoleData;
import cc.iotkit.data.util.PageBuilder;
import cc.iotkit.data.util.PredicateBuilder;
import cc.iotkit.model.system.SysRole;
import cn.hutool.core.util.ObjectUtil;
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.Projections;
import com.querydsl.jpa.impl.JPAQueryFactory;
@ -205,7 +206,7 @@ public class SysRoleDataImpl implements ISysRoleData, IJPACommData<SysRole, Long
.and(StringUtils.isNotBlank(role.getRoleName()), () -> tbSysRole.roleName.like(role.getRoleName()))
.and(StringUtils.isNotBlank(role.getStatus()), () -> tbSysRole.roleName.eq(role.getStatus()))
.and(StringUtils.isNotBlank(role.getRoleKey()), () -> tbSysRole.roleKey.like(role.getRoleKey()))
.and(StringUtils.isNotBlank(role.getTenantId()), () -> tbSysRole.tenantId.eq(role.getTenantId()))
.and(ObjectUtil.isNotNull(role.getTenantId()), () -> tbSysRole.tenantId.eq(role.getTenantId()))
.build();
}

3
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysTenantDataImpl.java
View File

@ -31,6 +31,7 @@ import cc.iotkit.data.model.TbSysTenant;
import cc.iotkit.data.system.ISysTenantData;
import cc.iotkit.data.util.PredicateBuilder;
import cc.iotkit.model.system.SysTenant;
import cn.hutool.core.util.ObjectUtil;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Primary;
@ -74,7 +75,7 @@ public class SysTenantDataImpl implements ISysTenantData, IJPACommData<SysTenant
@Override
public List<SysTenant> findAllByCondition(SysTenant data) {
List<TbSysTenant> ret=jpaQueryFactory.selectFrom(tbSysTenant).where(PredicateBuilder.instance()
.and(StringUtils.isNotBlank(data.getTenantId()),()->tbSysTenant.tenantId.eq(data.getTenantId()))
.and(ObjectUtil.isNotNull(data.getTenantId()),()->tbSysTenant.tenantId.eq(data.getTenantId()))
.and(StringUtils.isNotBlank(data.getContactUserName()),()->tbSysTenant.contactUserName.like(data.getContactUserName()))
.and(StringUtils.isNotBlank(data.getContactPhone()),()->tbSysTenant.contactPhone.eq(data.getContactPhone()))
.and(StringUtils.isNotBlank(data.getCompanyName()),()->tbSysTenant.companyName.like(data.getCompanyName()))

6
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserDataImpl.java
View File

@ -167,7 +167,7 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
}
@Override
public SysUser selectTenantUserByPhonenumber(String phonenumber, String tenantId) {
public SysUser selectTenantUserByPhonenumber(String phonenumber, Long tenantId) {
TbSysUser ret = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
.where(PredicateBuilder.instance()
.and(tbSysUser.phonenumber.eq(phonenumber))
@ -177,7 +177,7 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
}
@Override
public SysUser selectTenantUserByEmail(String email, String tenantId) {
public SysUser selectTenantUserByEmail(String email, Long tenantId) {
TbSysUser ret = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
.where(PredicateBuilder.instance()
.and(tbSysUser.email.eq(email))
@ -196,7 +196,7 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
}
@Override
public SysUser selectTenantUserByUserName(String username, String tenantId) {
public SysUser selectTenantUserByUserName(String username, Long tenantId) {
TbSysUser ret = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
.where(PredicateBuilder.instance()
.and(tbSysUser.userName.eq(username))

2
iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/dto/bo/TokenVerifyBo.java
View File

@ -49,6 +49,6 @@ public class TokenVerifyBo {
@NotNull(message = "{tenant.number.not.blank}")
@ApiModelProperty(value = "租户ID")
private String tenantId;
private Long tenantId;
}

4
iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/service/impl/OpenBaseServiceImpl.java
View File

@ -92,7 +92,7 @@ public class OpenBaseServiceImpl implements OpenBaseService {
return StpUtil.getTokenValue();
}
private void checkTenant(String tenantId) {
private void checkTenant(Long tenantId) {
}
/**
@ -121,7 +121,7 @@ public class OpenBaseServiceImpl implements OpenBaseService {
* @param status 状态
* @param message 消息内容
*/
private void recordLoginInfo(String tenantId, String username, String status, String message) {
private void recordLoginInfo(Long tenantId, String username, String status, String message) {
LogininforEvent logininforEvent = new LogininforEvent();
logininforEvent.setTenantId(tenantId);
logininforEvent.setUsername(username);

4
iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java
View File

@ -165,7 +165,7 @@ public class SysTenantController extends BaseController {
@ApiOperation("动态切换租户")
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@PostMapping("/dynamic")
public void dynamicTenant(@Validated @RequestBody Request<String> bo) {
public void dynamicTenant(@Validated @RequestBody Request<Long> bo) {
TenantHelper.setDynamic(bo.getData());
}
@ -191,7 +191,7 @@ public class SysTenantController extends BaseController {
@SaCheckPermission("system:tenant:edit")
@Log(title = "租户", businessType = BusinessType.UPDATE)
@PostMapping("/syncTenantPackage")
public void syncTenantPackage(@NotBlank(message = "租户ID不能为空") String tenantId, @NotBlank(message = "套餐ID不能为空") String packageId) {
public void syncTenantPackage(@NotBlank(message = "租户ID不能为空") Long tenantId, @NotBlank(message = "套餐ID不能为空") String packageId) {
//TenantHelper.ignore(() -> tenantService.syncTenantPackage(tenantId, packageId));
}

2
iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysLoginInfoBo.java
View File

@ -49,7 +49,7 @@ public class SysLoginInfoBo {
/**
* 租户编号
*/
private String tenantId;
private Long tenantId;
/**
* 用户账号

2
iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysOperLogBo.java
View File

@ -56,7 +56,7 @@ public class SysOperLogBo extends BaseDto {
/**
* 租户编号
*/
private String tenantId;
private Long tenantId;
/**
* 模块标题

2
iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysTenantBo.java
View File

@ -54,7 +54,7 @@ public class SysTenantBo extends BaseDto {
/**
* 租户编号
*/
private String tenantId;
private Long tenantId;
/**
* 联系人

2
iot-module/iot-system/src/main/java/cc/iotkit/system/dto/vo/SysAppVo.java
View File

@ -57,7 +57,7 @@ public class SysAppVo implements Serializable {
* 租户id
*/
@ApiModelProperty(value = "租户id")
private String tenantId;
private Long tenantId;
/**
* 应用名称

2
iot-module/iot-system/src/main/java/cc/iotkit/system/dto/vo/SysLogininforVo.java
View File

@ -57,7 +57,7 @@ public class SysLogininforVo implements Serializable {
/**
* 租户编号
*/
private String tenantId;
private Long tenantId;
/**
* 用户账号

2
iot-module/iot-system/src/main/java/cc/iotkit/system/dto/vo/SysOperLogVo.java
View File

@ -57,7 +57,7 @@ public class SysOperLogVo extends BaseDto implements Serializable {
/**
* 租户编号
*/
private String tenantId;
private Long tenantId;
/**
* 模块标题

2
iot-module/iot-system/src/main/java/cc/iotkit/system/dto/vo/SysTenantVo.java
View File

@ -57,7 +57,7 @@ public class SysTenantVo extends BaseModel implements Serializable {
* 租户编号
*/
@ExcelProperty(value = "租户编号")
private String tenantId;
private Long tenantId;
/**
* 联系人

2
iot-module/iot-system/src/main/java/cc/iotkit/system/dto/vo/SysUserVo.java
View File

@ -52,7 +52,7 @@ public class SysUserVo implements Serializable {
/**
* 租户ID
*/
private String tenantId;
private Long tenantId;
/**
* 部门ID

2
iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysConfigService.java
View File

@ -62,7 +62,7 @@ public interface ISysConfigService {
* @param tenantId 租户id
* @return true开启，false关闭
*/
boolean selectRegisterEnabled(String tenantId);
boolean selectRegisterEnabled(Long tenantId);
/**
* 查询参数配置列表

10
iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysTenantService.java
View File

@ -45,7 +45,7 @@ public interface ISysTenantService {
/**
* 基于租户ID查询租户
*/
SysTenantVo queryByTenantId(String tenantId);
SysTenantVo queryByTenantId(Long tenantId);
/**
* 查询租户列表
@ -75,7 +75,7 @@ public interface ISysTenantService {
/**
* 校验租户是否允许操作
*/
void checkTenantAllowed(String tenantId);
void checkTenantAllowed(Long tenantId);
/**
* 删除租户信息
@ -90,15 +90,15 @@ public interface ISysTenantService {
/**
* 校验账号余额
*/
boolean checkAccountBalance(String tenantId);
boolean checkAccountBalance(Long tenantId);
/**
* 校验有效期
*/
boolean checkExpireTime(String tenantId);
boolean checkExpireTime(Long tenantId);
/**
* 同步租户套餐
*/
Boolean syncTenantPackage(String tenantId, String packageId);
Boolean syncTenantPackage(Long tenantId, String packageId);
}

2
iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysUserService.java
View File

@ -155,7 +155,7 @@ public interface ISysUserService {
* @param user 用户信息
* @return 结果
*/
boolean registerUser(SysUserBo user, String tenantId);
boolean registerUser(SysUserBo user, Long tenantId);
/**
* 修改用户信息

2
iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysConfigServiceImpl.java
View File

@ -105,7 +105,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
* @return true开启，false关闭
*/
@Override
public boolean selectRegisterEnabled(String tenantId) {
public boolean selectRegisterEnabled(Long tenantId) {
SysConfig query = new SysConfig();
query.setConfigKey("sys.account.registerUser");
SysConfig retConfig = sysConfigData.findOneByCondition(query);

6
iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssConfigServiceImpl.java
View File

@ -82,10 +82,10 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
@Override
public void init() {
List<SysOssConfig> list = baseData.findAll();
List<SysOssConfig> notEmptyTenantIdList = list.stream().filter(item -> StringUtils.isNotBlank(item.getTenantId())).collect(Collectors.toList());
Map<String, List<SysOssConfig>> map = StreamUtils.groupByKey(notEmptyTenantIdList, SysOssConfig::getTenantId);
List<SysOssConfig> notEmptyTenantIdList = list.stream().filter(item -> ObjectUtil.isNotNull(item.getTenantId())).collect(Collectors.toList());
Map<Long, List<SysOssConfig>> map = StreamUtils.groupByKey(notEmptyTenantIdList, SysOssConfig::getTenantId);
try {
for (Map.Entry<String, List<SysOssConfig>> stringListEntry : map.entrySet()) {
for (Map.Entry<Long, List<SysOssConfig>> stringListEntry : map.entrySet()) {
TenantHelper.setDynamic(stringListEntry.getKey());
for (SysOssConfig config : stringListEntry.getValue()) {
String configKey = config.getConfigKey();

18
iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantServiceImpl.java
View File

@ -92,7 +92,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
*/
@Cacheable(cacheNames = CacheNames.SYS_TENANT, key = "#tenantId")
@Override
public SysTenantVo queryByTenantId(String tenantId) {
public SysTenantVo queryByTenantId(Long tenantId) {
SysTenant sysTenant = new SysTenant();
sysTenant.setTenantId(tenantId);
SysTenant tenant = sysTenantData.findOneByCondition(sysTenant);
@ -111,7 +111,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
@Override
public void insertByBo(SysTenantBo bo) {
bo.setTenantId(YitIdHelper.nextId()+"");
bo.setTenantId(YitIdHelper.nextId());
SysTenant sysTenant=sysTenantData.save(bo.to(SysTenant.class));
// 根据套餐创建角色
Long roleId = createTenantRole(sysTenant.getTenantId(), bo.getPackageId());
@ -157,7 +157,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
userRole.setRoleId(roleId);
sysUserRoleData.save(userRole);
String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID;
Long defaultTenantId = TenantConstants.DEFAULT_TENANT_ID;
SysDictType querySysDictType=new SysDictType();
querySysDictType.setTenantId(defaultTenantId);
List<SysDictType> dictTypeList = sysDictTypeData.findByConditions(querySysDictType);
@ -193,7 +193,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
* @param packageId 租户套餐id
* @return 角色id
*/
private Long createTenantRole(String tenantId, Long packageId) {
private Long createTenantRole(Long tenantId, Long packageId) {
// 获取租户套餐
SysTenantPackage tenantPackage = sysTenantPackageData.findById(packageId);
if (ObjectUtil.isNull(tenantPackage)) {
@ -239,7 +239,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
}
@Override
public void checkTenantAllowed(String tenantId) {
public void checkTenantAllowed(Long tenantId) {
if (ObjectUtil.isNotNull(tenantId) && TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
throw new BizException(ErrCode.UNAUTHORIZED_TENANT);
}
@ -247,7 +247,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
@Override
public void deleteById(Long id) {
String tenantId=LoginHelper.getTenantId();
Long tenantId=LoginHelper.getTenantId();
//删除角色
SysRole querySysRole=new SysRole();
querySysRole.setTenantId(tenantId);
@ -267,7 +267,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
}
@Override
public boolean checkAccountBalance(String tenantId) {
public boolean checkAccountBalance(Long tenantId) {
SysTenantVo tenant = this.queryByTenantId(tenantId);
// 如果余额为-1代表不限制
if (tenant.getAccountCount() == -1) {
@ -279,12 +279,12 @@ public class SysTenantServiceImpl implements ISysTenantService {
}
@Override
public boolean checkExpireTime(String tenantId) {
public boolean checkExpireTime(Long tenantId) {
return false;
}
@Override
public Boolean syncTenantPackage(String tenantId, String packageId) {
public Boolean syncTenantPackage(Long tenantId, String packageId) {
return false;
}
}

2
iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java
View File

@ -249,7 +249,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
}
@Override
public boolean registerUser(SysUserBo user, String tenantId) {
public boolean registerUser(SysUserBo user, Long tenantId) {
return false;
}

2
iot-starter/src/main/java/cc/iotkit/web/domain/vo/TenantListVo.java
View File

@ -43,7 +43,7 @@ import lombok.NoArgsConstructor;
@AutoMapper(target = SysTenantVo.class)
public class TenantListVo {
private String tenantId;
private Long tenantId;
private String companyName;

26
iot-starter/src/main/java/cc/iotkit/web/service/SysLoginService.java
View File

@ -107,7 +107,7 @@ public class SysLoginService {
* @param uuid 唯一标识
* @return 结果
*/
public String login(String tenantId, String username, String password, String code, String uuid) {
public String login(Long tenantId, String username, String password, String code, String uuid) {
boolean captchaEnabled = captchaProperties.getEnable();
// 验证码开关
if (captchaEnabled) {
@ -131,7 +131,7 @@ public class SysLoginService {
return StpUtil.getTokenValue();
}
public String smsLogin(String tenantId, String phonenumber, String smsCode) {
public String smsLogin(Long tenantId, String phonenumber, String smsCode) {
// 校验租户
checkTenant(tenantId);
// 通过手机号查找用户
@ -148,7 +148,7 @@ public class SysLoginService {
return StpUtil.getTokenValue();
}
public String emailLogin(String tenantId, String email, String emailCode) {
public String emailLogin(Long tenantId, String email, String emailCode) {
// 校验租户
checkTenant(tenantId);
// 通过手机号查找用户
@ -225,7 +225,7 @@ public class SysLoginService {
* @param status 状态
* @param message 消息内容
*/
private void recordLoginInfo(String tenantId, String username, String status, String message) {
private void recordLoginInfo(Long tenantId, String username, String status, String message) {
LogininforEvent logininforEvent = new LogininforEvent();
logininforEvent.setTenantId(tenantId);
logininforEvent.setUsername(username);
@ -238,7 +238,7 @@ public class SysLoginService {
/**
* 校验短信验证码
*/
private boolean validateSmsCode(String tenantId, String phonenumber, String smsCode) {
private boolean validateSmsCode(Long tenantId, String phonenumber, String smsCode) {
String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + phonenumber);
if (StringUtils.isBlank(code)) {
recordLoginInfo(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
@ -250,7 +250,7 @@ public class SysLoginService {
/**
* 校验邮箱验证码
*/
private boolean validateEmailCode(String tenantId, String email, String emailCode) {
private boolean validateEmailCode(Long tenantId, String email, String emailCode) {
String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + email);
if (StringUtils.isBlank(code)) {
recordLoginInfo(tenantId, email, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
@ -266,7 +266,7 @@ public class SysLoginService {
* @param code 验证码
* @param uuid 唯一标识
*/
public void validateCaptcha(String tenantId, String username, String code, String uuid) {
public void validateCaptcha(Long tenantId, String username, String code, String uuid) {
String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, "");
String captcha = RedisUtils.getCacheObject(verifyKey);
RedisUtils.deleteObject(verifyKey);
@ -280,7 +280,7 @@ public class SysLoginService {
}
}
private SysUserVo loadUserByUsername(String tenantId, String username) {
private SysUserVo loadUserByUsername(Long tenantId, String username) {
SysUser user = userData.selectTenantUserByUserName(username,tenantId);
if (ObjectUtil.isNull(user)) {
@ -297,7 +297,7 @@ public class SysLoginService {
return MapstructUtils.convert(sysUser, SysUserVo.class);
}
private SysUserVo loadUserByPhonenumber(String tenantId, String phonenumber) {
private SysUserVo loadUserByPhonenumber(Long tenantId, String phonenumber) {
SysUser query = new SysUser();
query.setPhonenumber(phonenumber);
@ -314,7 +314,7 @@ public class SysLoginService {
return MapstructUtils.convert(sysUser, SysUserVo.class);
}
private SysUserVo loadUserByEmail(String tenantId, String email) {
private SysUserVo loadUserByEmail(Long tenantId, String email) {
SysUser query = new SysUser();
query.setEmail(email);
SysUser user = userData.findOneByCondition(query);
@ -331,7 +331,7 @@ public class SysLoginService {
}
private UserInfo loadUserByOpenid(String openid,String tenantId) throws Exception {
private UserInfo loadUserByOpenid(String openid,Long tenantId) throws Exception {
// 使用 openid 查询绑定用户 如未绑定用户 则根据业务自行处理 例如 创建默认用户
UserInfo user=userInfoData.findByUid(openid);
if (ObjectUtil.isNull(user)) {
@ -400,7 +400,7 @@ public class SysLoginService {
/**
* 登录校验
*/
private void checkLogin(LoginType loginType, String tenantId, String username, Supplier<Boolean> supplier) {
private void checkLogin(LoginType loginType, Long tenantId, String username, Supplier<Boolean> supplier) {
String errorKey = GlobalConstants.PWD_ERR_CNT_KEY + username;
String loginFail = Constants.LOGIN_FAIL;
@ -434,7 +434,7 @@ public class SysLoginService {
RedisUtils.deleteObject(errorKey);
}
private void checkTenant(String tenantId) {
private void checkTenant(Long tenantId) {
if (!TenantHelper.isEnable()) {
return;
}

6
iot-starter/src/main/java/cc/iotkit/web/service/SysRegisterService.java
View File

@ -55,7 +55,7 @@ public class SysRegisterService {
* 注册
*/
public void register(RegisterBody registerBody) {
String tenantId = registerBody.getTenantId();
Long tenantId = registerBody.getTenantId();
String username = registerBody.getUsername();
String password = registerBody.getPassword();
// 校验用户类型是否存在
@ -89,7 +89,7 @@ public class SysRegisterService {
* @param code 验证码
* @param uuid 唯一标识
*/
public void validateCaptcha(String tenantId, String username, String code, String uuid) {
public void validateCaptcha(Long tenantId, String username, String code, String uuid) {
String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, "");
String captcha = RedisUtils.getCacheObject(verifyKey);
RedisUtils.deleteObject(verifyKey);
@ -113,7 +113,7 @@ public class SysRegisterService {
* @param message 消息内容
* @return
*/
private void recordLoginInfo(String tenantId, String username, String status, String message) {
private void recordLoginInfo(Long tenantId, String username, String status, String message) {
// LogininforEvent logininforEvent = new LogininforEvent();
// logininforEvent.setTenantId(tenantId);
// logininforEvent.setUsername(username);