opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-08-01 08:52:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Complete team user code

Browse Source
This commit is contained in:
JiaJu Zhuang
2023-08-13 14:57:24 +08:00
parent 697e7bc024
commit af6fcc2baf
56 changed files with 1288 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/model/DataSourceAccess.java
View File

@ -61,6 +61,12 @@ public class DataSourceAccess implements Serializable {
@NotNull
private Long dataSourceId;
/**
* 数据源
*/
@NotNull
private DataSource dataSource;
/**
* 授权类型
*

9
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/datasource/access/DataSourceAccessComprehensivePageQueryParam.java
View File

@ -18,7 +18,12 @@ public class DataSourceAccessComprehensivePageQueryParam extends PageQueryParam
private Long dataSourceId;
/**
* searchKey
* Query keywords for users or teams
*/
private String searchKey;
private String userOrTeamSearchKey;
/**
* Query keywords for data source
*/
private String dataSourceSearchKey;
}

39
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/datasource/access/DataSourceAccessCreatParam.java Normal file
View File

@ -0,0 +1,39 @@
package ai.chat2db.server.domain.api.param.datasource.access;
import ai.chat2db.server.domain.api.enums.AccessObjectTypeEnum;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* Data Source Access
*
* @author Jiaju Zhuang
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
public class DataSourceAccessCreatParam {
/**
* 数据源id
*/
@NotNull
private Long dataSourceId;
/**
* 授权类型
*
* @see AccessObjectTypeEnum
*/
@NotNull
private String accessObjectType;
/**
* 授权id,根据类型区分是用户还是团队
*/
@NotNull
private Long accessObjectId;
}

6
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/datasource/access/DataSourceAccessSelector.java
View File

@ -20,4 +20,10 @@ public class DataSourceAccessSelector {
* 授权对象
*/
private Boolean accessObject;
/**
* 数据源
*/
private Boolean dataSource;
}

37
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/team/TeamCreateParam.java Normal file
View File

@ -0,0 +1,37 @@
package ai.chat2db.server.domain.api.param.team;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
* create
*
* @author Jiaju Zhuang
*/
@Data
public class TeamCreateParam {
/**
* 团队编码
*/
@NotNull
private String code;
/**
* 团队名称
*/
@NotNull
private String name;
/**
* 团队状态
*
* @see ai.chat2db.server.domain.api.enums.ValidStatusEnum
*/
@NotNull
private String status;
/**
* 团队描述
*/
private String description;
}

19
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/team/TeamPageQueryParam.java Normal file
View File

@ -0,0 +1,19 @@
package ai.chat2db.server.domain.api.param.team;
import ai.chat2db.server.tools.base.wrapper.param.PageQueryParam;
import lombok.Data;
/**
* page query
*
* @author Jiaju Zhuang
*/
@Data
public class TeamPageQueryParam extends PageQueryParam {
/**
* searchKey
*/
private String searchKey;
}

23
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/team/TeamSelector.java Normal file
View File

@ -0,0 +1,23 @@
package ai.chat2db.server.domain.api.param.team;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* select
*
* @author Jiaju Zhuang
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
public class TeamSelector {
/**
* empty
*/
private Boolean empty;
}

35
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/team/TeamUpdateParam.java Normal file
View File

@ -0,0 +1,35 @@
package ai.chat2db.server.domain.api.param.team;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
* update
*
* @author Jiaju Zhuang
*/
@Data
public class TeamUpdateParam {
/**
* 主键
*/
@NotNull
private Long id;
/**
* 团队名称
*/
private String name;
/**
* 团队状态
*
* @see ai.chat2db.server.domain.api.enums.ValidStatusEnum
*/
private String status;
/**
* 团队描述
*/
private String description;
}

10
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/team/user/TeamUserComprehensivePageQueryParam.java
View File

@ -27,4 +27,14 @@ public class TeamUserComprehensivePageQueryParam extends PageQueryParam {
* @see ai.chat2db.server.domain.api.enums.RoleCodeEnum
*/
private String teamRoleCode;
/**
* Query keywords for team
*/
private String teamSearchKey;
/**
* Query keywords for user
*/
private String userSearchKey;
}

29
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/team/user/TeamUserCreatParam.java Normal file
View File

@ -0,0 +1,29 @@
package ai.chat2db.server.domain.api.param.team.user;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* Team User
*
* @author Jiaju Zhuang
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
public class TeamUserCreatParam {
/**
* team id
*/
@NotNull
private Long teamId;
/**
* user id
*/
private Long userId;
}

45
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/user/UserCreateParam.java Normal file
View File

@ -0,0 +1,45 @@
package ai.chat2db.server.domain.api.param.user;
import ai.chat2db.server.domain.api.enums.ValidStatusEnum;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
* create
*
* @author Jiaju Zhuang
*/
@Data
public class UserCreateParam {
/**
* 用户名
*/
@NotNull
private String userName;
/**
* 密码
*/
@NotNull
private String password;
/**
* 昵称
*/
@NotNull
private String nickName;
/**
* 邮箱
*/
@NotNull
private String email;
/**
* 用户状态
*
* @see ValidStatusEnum
*/
@NotNull
private String status;
}

16
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/UserQueryParam.java → chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/user/UserPageQueryParam.java
View File

@ -1,16 +1,13 @@
package ai.chat2db.server.domain.api.param;
import java.io.Serial;
package ai.chat2db.server.domain.api.param.user;
import ai.chat2db.server.tools.base.wrapper.param.PageQueryParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* 用户查询参数
* * page query
*
* @author Jiaju Zhuang
*/
@ -18,11 +15,10 @@ import lombok.experimental.SuperBuilder;
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
public class UserQueryParam extends PageQueryParam {
@Serial
private static final long serialVersionUID = 7341467383637825621L;
public class UserPageQueryParam extends PageQueryParam {
/**
* 用户名
* searchKey
*/
private String keyWord;
private String searchKey;
}

23
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/user/UserSelector.java Normal file
View File

@ -0,0 +1,23 @@
package ai.chat2db.server.domain.api.param.user;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* select
*
* @author Jiaju Zhuang
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
public class UserSelector {
/**
* empty
*/
private Boolean empty;
}

51
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/user/UserUpdateParam.java Normal file
View File

@ -0,0 +1,51 @@
package ai.chat2db.server.domain.api.param.user;
import ai.chat2db.server.domain.api.enums.ValidStatusEnum;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
* create
*
* @author Jiaju Zhuang
*/
@Data
public class UserUpdateParam {
/**
* 主键
*/
@NotNull
private Long id;
/**
* 用户名
*/
@NotNull
private String userName;
/**
* 密码
*/
@NotNull
private String password;
/**
* 昵称
*/
@NotNull
private String nickName;
/**
* 邮箱
*/
@NotNull
private String email;
/**
* 用户状态
*
* @see ValidStatusEnum
*/
@NotNull
private String status;
}

7
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/service/DataSourceAccessService.java
View File

@ -1,10 +1,11 @@
package ai.chat2db.server.domain.api.service;
import ai.chat2db.server.domain.api.model.DataSourceAccess;
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessBatchCreatParam;
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessComprehensivePageQueryParam;
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessCreatParam;
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessSelector;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.PageResult;
import jakarta.validation.constraints.NotNull;
@ -25,14 +26,14 @@ public interface DataSourceAccessService {
PageResult<DataSourceAccess> comprehensivePageQuery(DataSourceAccessComprehensivePageQueryParam param,
DataSourceAccessSelector selector);
/**
* Batch Create
*
* @param param
* @return
*/
ActionResult batchCreate(DataSourceAccessBatchCreatParam param);
DataResult<Long> create(DataSourceAccessCreatParam param);
/**
* delete
*

41
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/service/TeamService.java
View File

@ -3,7 +3,15 @@ package ai.chat2db.server.domain.api.service;
import java.util.List;
import ai.chat2db.server.domain.api.model.Team;
import ai.chat2db.server.domain.api.param.team.TeamCreateParam;
import ai.chat2db.server.domain.api.param.team.TeamPageQueryParam;
import ai.chat2db.server.domain.api.param.team.TeamSelector;
import ai.chat2db.server.domain.api.param.team.TeamUpdateParam;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.ListResult;
import ai.chat2db.server.tools.base.wrapper.result.PageResult;
import jakarta.validation.constraints.NotNull;
/**
* team
@ -12,6 +20,15 @@ import ai.chat2db.server.tools.base.wrapper.result.ListResult;
*/
public interface TeamService {
/**
* Pagination query
*
* @param param
* @param selector
* @return
*/
PageResult<Team> pageQuery(TeamPageQueryParam param, TeamSelector selector);
/**
* List Query Data
*
@ -20,4 +37,28 @@ public interface TeamService {
*/
ListResult<Team> listQuery(List<Long> idList);
/**
* Create
*
* @param param
* @return
*/
DataResult<Long> create(TeamCreateParam param);
/**
* update
*
* @param param
* @return
*/
DataResult<Long> update(TeamUpdateParam param);
/**
* delete
*
* @param id
* @return
*/
ActionResult delete(@NotNull Long id);
}

19
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/service/TeamUserService.java
View File

@ -2,8 +2,12 @@ package ai.chat2db.server.domain.api.service;
import ai.chat2db.server.domain.api.model.TeamUser;
import ai.chat2db.server.domain.api.param.team.user.TeamUserComprehensivePageQueryParam;
import ai.chat2db.server.domain.api.param.team.user.TeamUserCreatParam;
import ai.chat2db.server.domain.api.param.team.user.TeamUserSelector;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.PageResult;
import jakarta.validation.constraints.NotNull;
/**
* team user
@ -21,4 +25,19 @@ public interface TeamUserService {
*/
PageResult<TeamUser> comprehensivePageQuery(TeamUserComprehensivePageQueryParam param, TeamUserSelector selector);
/**
* Create
*
* @param param
* @return
*/
DataResult<Long> create(TeamUserCreatParam param);
/**
* delete
*
* @param id
* @return
*/
ActionResult delete(@NotNull Long id);
}

14
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/service/UserService.java
View File

@ -3,7 +3,11 @@ package ai.chat2db.server.domain.api.service;
import java.util.List;
import ai.chat2db.server.domain.api.model.User;
import ai.chat2db.server.domain.api.param.UserQueryParam;
import ai.chat2db.server.domain.api.param.user.UserCreateParam;
import ai.chat2db.server.domain.api.param.user.UserSelector;
import ai.chat2db.server.domain.api.param.user.UserPageQueryParam;
import ai.chat2db.server.domain.api.param.user.UserUpdateParam;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.ListResult;
import ai.chat2db.server.tools.base.wrapper.result.PageResult;
@ -44,26 +48,26 @@ public interface UserService {
* @param param
* @return
*/
PageResult<User> queryPage(UserQueryParam param);
PageResult<User> pageQuery(UserPageQueryParam param, UserSelector selector);
/**
* 更新用户信息
* @param user
* @return
*/
DataResult<Boolean> update(User user);
DataResult<Long> update(UserUpdateParam user);
/**
* 删除用户
* @param id
* @return
*/
DataResult<Boolean> delete(Long id);
ActionResult delete(Long id);
/**
* 创建一个用户
* @param user
* @return
*/
DataResult<Long> create(User user);
DataResult<Long> create(UserCreateParam user);
}

14
chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/converter/DataSourceAccessConverter.java
View File

@ -3,6 +3,7 @@ package ai.chat2db.server.domain.core.converter;
import java.util.List;
import ai.chat2db.server.domain.api.model.DataSourceAccess;
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessCreatParam;
import ai.chat2db.server.domain.repository.entity.DataSourceAccessDO;
import lombok.extern.slf4j.Slf4j;
import org.mapstruct.Mapper;
@ -46,6 +47,19 @@ public abstract class DataSourceAccessConverter {
public abstract DataSourceAccessDO param2do(Long dataSourceId, Long accessObjectId, String accessObjectType,
Long userId);
/**
* convert
*
* @param param
* @return
*/
@Mappings({
@Mapping(target = "createUserId", source = "userId"),
@Mapping(target = "modifiedUserId", source = "userId"),
})
public abstract DataSourceAccessDO param2do(DataSourceAccessCreatParam param, Long userId);
/**
* convert
*

18
chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/converter/TeamConverter.java
View File

@ -4,6 +4,8 @@ import java.util.List;
import java.util.Map;
import ai.chat2db.server.domain.api.model.Team;
import ai.chat2db.server.domain.api.param.team.TeamCreateParam;
import ai.chat2db.server.domain.api.param.team.TeamUpdateParam;
import ai.chat2db.server.domain.api.service.TeamService;
import ai.chat2db.server.domain.repository.entity.TeamDO;
import ai.chat2db.server.tools.common.util.EasyCollectionUtils;
@ -37,6 +39,22 @@ public abstract class TeamConverter {
*/
public abstract List<Team> do2dto(List<TeamDO> list);
/**
* convert
*
* @param param
* @return
*/
public abstract TeamDO param2do(TeamCreateParam param);
/**
* convert
*
* @param param
* @return
*/
public abstract TeamDO param2do(TeamUpdateParam param);
/**
* Fill in detailed information
*

15
chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/converter/TeamUserConverter.java
View File

@ -5,6 +5,7 @@ import java.util.Map;
import ai.chat2db.server.domain.api.model.Environment;
import ai.chat2db.server.domain.api.model.TeamUser;
import ai.chat2db.server.domain.api.param.team.user.TeamUserCreatParam;
import ai.chat2db.server.domain.api.service.EnvironmentService;
import ai.chat2db.server.domain.repository.entity.TeamUserDO;
import ai.chat2db.server.tools.common.util.EasyCollectionUtils;
@ -38,6 +39,20 @@ public abstract class TeamUserConverter {
*/
public abstract List<TeamUser> do2dto(List<TeamUserDO> list);
/**
* convert
*
* @param param
* @return
*/
@Mappings({
@Mapping(target = "createUserId", source = "userId"),
@Mapping(target = "modifiedUserId", source = "userId"),
})
public abstract TeamUserDO param2do(TeamUserCreatParam param, Long userId);
/**
* Fill in detailed information
*

16
chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/converter/UserConverter.java
View File

@ -4,6 +4,8 @@ import java.util.List;
import java.util.Map;
import ai.chat2db.server.domain.api.model.User;
import ai.chat2db.server.domain.api.param.user.UserCreateParam;
import ai.chat2db.server.domain.api.param.user.UserUpdateParam;
import ai.chat2db.server.domain.api.service.UserService;
import ai.chat2db.server.domain.repository.entity.DbhubUserDO;
import ai.chat2db.server.tools.common.util.EasyCollectionUtils;
@ -50,6 +52,20 @@ public abstract class UserConverter {
*/
public abstract DbhubUserDO dto2do(User user);
/**
*
* @param user
* @return
*/
public abstract DbhubUserDO param2do(UserCreateParam user);
/**
*
* @param user
* @return
*/
public abstract DbhubUserDO param2do(UserUpdateParam user);
/**
* Fill in detailed information
*

38
chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceAccessServiceImpl.java
View File

@ -3,16 +3,13 @@ package ai.chat2db.server.domain.core.impl;
import java.util.List;
import java.util.Map;
import com.alibaba.fastjson2.JSON;
import ai.chat2db.server.domain.api.enums.AccessObjectTypeEnum;
import ai.chat2db.server.domain.api.model.DataSourceAccess;
import ai.chat2db.server.domain.api.model.DataSourceAccessObject;
import ai.chat2db.server.domain.api.model.Team;
import ai.chat2db.server.domain.api.model.User;
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessBatchCreatParam;
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessComprehensivePageQueryParam;
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessObjectParam;
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessCreatParam;
import ai.chat2db.server.domain.api.param.datasource.access.DataSourceAccessSelector;
import ai.chat2db.server.domain.api.service.DataSourceAccessService;
import ai.chat2db.server.domain.api.service.TeamService;
@ -22,10 +19,10 @@ import ai.chat2db.server.domain.repository.entity.DataSourceAccessDO;
import ai.chat2db.server.domain.repository.mapper.DataSourceAccessCustomMapper;
import ai.chat2db.server.domain.repository.mapper.DataSourceAccessMapper;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.PageResult;
import ai.chat2db.server.tools.common.util.ContextUtils;
import ai.chat2db.server.tools.common.util.EasyCollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
@ -58,8 +55,11 @@ public class DataSourceAccessServiceImpl implements DataSourceAccessService {
@Override
public PageResult<DataSourceAccess> comprehensivePageQuery(DataSourceAccessComprehensivePageQueryParam param,
DataSourceAccessSelector selector) {
IPage<DataSourceAccessDO> iPage = dataSourceAccessCustomMapper.comprehensivePageQuery(
new Page<>(param.getPageNo(), param.getPageSize()), param.getDataSourceId(), param.getSearchKey());
Page<DataSourceAccessDO> page = new Page<>(param.getPageNo(), param.getPageSize());
page.setSearchCount(param.getEnableReturnCount());
IPage<DataSourceAccessDO> iPage = dataSourceAccessCustomMapper.comprehensivePageQuery(page,
param.getDataSourceId(), param.getUserOrTeamSearchKey(),
param.getDataSourceSearchKey());
List<DataSourceAccess> list = dataSourceAccessConverter.do2dto(iPage.getRecords());
@ -69,25 +69,11 @@ public class DataSourceAccessServiceImpl implements DataSourceAccessService {
}
@Override
public ActionResult batchCreate(DataSourceAccessBatchCreatParam param) {
if (CollectionUtils.isEmpty(param.getAccessObjectList())) {
return ActionResult.isSuccess();
}
for (DataSourceAccessObjectParam dataSourceAccessObjectParam : param.getAccessObjectList()) {
LambdaQueryWrapper<DataSourceAccessDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DataSourceAccessDO::getAccessObjectType, dataSourceAccessObjectParam.getType());
queryWrapper.eq(DataSourceAccessDO::getDataSourceId, dataSourceAccessObjectParam.getId());
DataSourceAccessDO query = dataSourceAccessMapper.selectOne(queryWrapper);
if (query != null) {
log.info("The data source already exists, no need to add it again,{}",
JSON.toJSONString(dataSourceAccessObjectParam));
continue;
}
dataSourceAccessMapper.insert(
dataSourceAccessConverter.param2do(param.getDataSourceId(), dataSourceAccessObjectParam.getId(),
dataSourceAccessObjectParam.getType(), ContextUtils.getUserId()));
}
return ActionResult.isSuccess();
public DataResult<Long> create(DataSourceAccessCreatParam param) {
DataSourceAccessDO data = dataSourceAccessConverter.param2do(param, ContextUtils.getUserId());
dataSourceAccessMapper.insert(data);
return DataResult.of(data.getId());
}
@Override

54
chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/TeamServiceImpl.java
View File

@ -3,15 +3,25 @@ package ai.chat2db.server.domain.core.impl;
import java.util.List;
import ai.chat2db.server.domain.api.model.Team;
import ai.chat2db.server.domain.api.param.team.TeamCreateParam;
import ai.chat2db.server.domain.api.param.team.TeamPageQueryParam;
import ai.chat2db.server.domain.api.param.team.TeamSelector;
import ai.chat2db.server.domain.api.param.team.TeamUpdateParam;
import ai.chat2db.server.domain.api.service.TeamService;
import ai.chat2db.server.domain.core.converter.TeamConverter;
import ai.chat2db.server.domain.repository.entity.TeamDO;
import ai.chat2db.server.domain.repository.mapper.TeamMapper;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.ListResult;
import ai.chat2db.server.tools.base.wrapper.result.PageResult;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
/**
@ -39,4 +49,48 @@ public class TeamServiceImpl implements TeamService {
List<Team> list = teamConverter.do2dto(dataList);
return ListResult.of(list);
}
@Override
public PageResult<Team> pageQuery(TeamPageQueryParam param, TeamSelector selector) {
LambdaQueryWrapper<TeamDO> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(param.getSearchKey())) {
queryWrapper.and(wrapper -> wrapper.like(TeamDO::getCode, "%" + param.getSearchKey() + "%")
.or()
.like(TeamDO::getName, "%" + param.getSearchKey() + "%"));
}
Page<TeamDO> page = new Page<>(param.getPageNo(), param.getPageSize());
page.setSearchCount(param.getEnableReturnCount());
IPage<TeamDO> iPage = teamMapper.selectPage(page, queryWrapper);
List<Team> list = teamConverter.do2dto(iPage.getRecords());
fillData(list, selector);
return PageResult.of(list, iPage.getTotal(), param);
}
@Override
public DataResult<Long> create(TeamCreateParam param) {
TeamDO data = teamConverter.param2do(param);
teamMapper.insert(data);
return DataResult.of(data.getId());
}
@Override
public DataResult<Long> update(TeamUpdateParam param) {
TeamDO data = teamConverter.param2do(param);
teamMapper.updateById(data);
return DataResult.of(data.getId());
}
@Override
public ActionResult delete(Long id) {
teamMapper.deleteById(id);
return ActionResult.isSuccess();
}
private void fillData(List<Team> list, TeamSelector selector) {
if (CollectionUtils.isEmpty(list) || selector == null) {
return;
}
}
}

27
chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/TeamUserServiceImpl.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import ai.chat2db.server.domain.api.model.TeamUser;
import ai.chat2db.server.domain.api.param.team.user.TeamUserComprehensivePageQueryParam;
import ai.chat2db.server.domain.api.param.team.user.TeamUserCreatParam;
import ai.chat2db.server.domain.api.param.team.user.TeamUserSelector;
import ai.chat2db.server.domain.api.service.TeamUserService;
import ai.chat2db.server.domain.core.converter.TeamConverter;
@ -11,7 +12,11 @@ import ai.chat2db.server.domain.core.converter.TeamUserConverter;
import ai.chat2db.server.domain.core.converter.UserConverter;
import ai.chat2db.server.domain.repository.entity.TeamUserDO;
import ai.chat2db.server.domain.repository.mapper.TeamUserCustomMapper;
import ai.chat2db.server.domain.repository.mapper.TeamUserMapper;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.PageResult;
import ai.chat2db.server.tools.common.util.ContextUtils;
import ai.chat2db.server.tools.common.util.EasyCollectionUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -35,6 +40,8 @@ public class TeamUserServiceImpl implements TeamUserService {
@Resource
private TeamUserCustomMapper teamUserCustomMapper;
@Resource
private TeamUserMapper teamUserMapper;
@Resource
private UserConverter userConverter;
@Resource
private TeamConverter teamConverter;
@ -42,8 +49,10 @@ public class TeamUserServiceImpl implements TeamUserService {
@Override
public PageResult<TeamUser> comprehensivePageQuery(TeamUserComprehensivePageQueryParam param,
TeamUserSelector selector) {
IPage<TeamUserDO> iPage = teamUserCustomMapper.comprehensivePageQuery(
new Page<>(param.getPageNo(), param.getPageSize()), param.getTeamId(), param.getUserId(),
Page<TeamUserDO> page = new Page<>(param.getPageNo(), param.getPageSize());
page.setSearchCount(param.getEnableReturnCount());
IPage<TeamUserDO> iPage = teamUserCustomMapper.comprehensivePageQuery(page, param.getTeamId(),
param.getUserId(),
param.getTeamRoleCode());
List<TeamUser> list = teamUserConverter.do2dto(iPage.getRecords());
@ -53,6 +62,20 @@ public class TeamUserServiceImpl implements TeamUserService {
return PageResult.of(list, iPage.getTotal(), param);
}
@Override
public DataResult<Long> create(TeamUserCreatParam param) {
TeamUserDO data = teamUserConverter.param2do(param, ContextUtils.getUserId());
teamUserMapper.insert(data);
return DataResult.of(data.getId());
}
@Override
public ActionResult delete(Long id) {
teamUserMapper.deleteById(id);
return ActionResult.isSuccess();
}
private void fillData(List<TeamUser> list, TeamUserSelector selector) {
if (CollectionUtils.isEmpty(list) || selector == null) {
return;

64
chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/UserServiceImpl.java
View File

@ -3,12 +3,18 @@ package ai.chat2db.server.domain.core.impl;
import java.util.List;
import java.util.Objects;
import ai.chat2db.server.domain.api.enums.RoleCodeEnum;
import ai.chat2db.server.domain.api.model.User;
import ai.chat2db.server.domain.api.param.UserQueryParam;
import ai.chat2db.server.domain.api.param.user.UserCreateParam;
import ai.chat2db.server.domain.api.param.user.UserPageQueryParam;
import ai.chat2db.server.domain.api.param.user.UserSelector;
import ai.chat2db.server.domain.api.param.user.UserUpdateParam;
import ai.chat2db.server.domain.api.service.UserService;
import ai.chat2db.server.domain.core.converter.UserConverter;
import ai.chat2db.server.domain.repository.entity.DbhubUserDO;
import ai.chat2db.server.domain.repository.mapper.DbhubUserMapper;
import ai.chat2db.server.tools.base.excption.BusinessException;
import ai.chat2db.server.tools.base.wrapper.result.ActionResult;
import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.tools.base.wrapper.result.ListResult;
import ai.chat2db.server.tools.base.wrapper.result.PageResult;
@ -18,6 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
/**
@ -61,37 +68,56 @@ public class UserServiceImpl implements UserService {
}
@Override
public PageResult<User> queryPage(UserQueryParam param) {
LambdaQueryWrapper<DbhubUserDO> query = new LambdaQueryWrapper<>();
if (Objects.nonNull(param.getKeyWord())) {
query.like(DbhubUserDO::getUserName, param.getKeyWord());
public PageResult<User> pageQuery(UserPageQueryParam param, UserSelector selector) {
LambdaQueryWrapper<DbhubUserDO> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(param.getSearchKey())) {
queryWrapper.and(wrapper -> wrapper.like(DbhubUserDO::getUserName, "%" + param.getSearchKey() + "%")
.or()
.like(DbhubUserDO::getNickName, "%" + param.getSearchKey() + "%")
.or()
.like(DbhubUserDO::getEmail, "%" + param.getSearchKey() + "%"));
}
// Default not to query desktop accounts
queryWrapper.ne(DbhubUserDO::getId, RoleCodeEnum.DESKTOP.getDefaultUserId());
Page<DbhubUserDO> page = new Page<>(param.getPageNo(), param.getPageSize());
page.setOptimizeCountSql(false);
IPage<DbhubUserDO> iPage = dbhubUserMapper.selectPage(page, query);
page.setSearchCount(param.getEnableReturnCount());
IPage<DbhubUserDO> iPage = dbhubUserMapper.selectPage(page, queryWrapper);
return PageResult.of(userConverter.do2dto(iPage.getRecords()), iPage.getTotal(), param);
}
@Override
public DataResult<Boolean> update(User user) {
DbhubUserDO dbhubUserDO = userConverter.dto2do(user);
if (Objects.nonNull(dbhubUserDO.getPassword())) {
String bcryptPassword = DigestUtil.bcrypt(dbhubUserDO.getPassword());
dbhubUserDO.setPassword(bcryptPassword);
public DataResult<Long> update(UserUpdateParam user) {
if (RoleCodeEnum.DESKTOP.getDefaultUserId().equals(user.getId())) {
throw new BusinessException("user.canNotOperateSystemAccount");
}
int n = dbhubUserMapper.updateById(dbhubUserDO);
return DataResult.of(n == 1);
DbhubUserDO data = userConverter.param2do(user);
if (Objects.nonNull(data.getPassword())) {
String bcryptPassword = DigestUtil.bcrypt(data.getPassword());
data.setPassword(bcryptPassword);
}
if (RoleCodeEnum.ADMIN.getDefaultUserId().equals(user.getId())) {
data.setStatus(null);
data.setEmail(null);
data.setUserName(null);
data.setRoleCode(null);
}
dbhubUserMapper.updateById(data);
return DataResult.of(data.getId());
}
@Override
public DataResult<Boolean> delete(Long id) {
int n = dbhubUserMapper.deleteById(id);
return DataResult.of(n == 1);
public ActionResult delete(Long id) {
if (RoleCodeEnum.DESKTOP.getDefaultUserId().equals(id) || RoleCodeEnum.ADMIN.getDefaultUserId().equals(id)) {
throw new BusinessException("user.canNotOperateSystemAccount");
}
dbhubUserMapper.deleteById(id);
return ActionResult.isSuccess();
}
@Override
public DataResult<Long> create(User user) {
DbhubUserDO data = userConverter.dto2do(user);
public DataResult<Long> create(UserCreateParam user) {
DbhubUserDO data = userConverter.param2do(user);
String bcryptPassword = DigestUtil.bcrypt(data.getPassword());
data.setPassword(bcryptPassword);
dbhubUserMapper.insert(data);

5
chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/DataSourceAccessCustomMapper.java
View File

@ -1,7 +1,6 @@
package ai.chat2db.server.domain.repository.mapper;
import ai.chat2db.server.domain.repository.entity.DataSourceAccessDO;
import ai.chat2db.server.domain.repository.entity.DataSourceDO;
import com.baomidou.mybatisplus.core.mapper.Mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
@ -13,6 +12,8 @@ import org.apache.ibatis.annotations.Param;
*/
public interface DataSourceAccessCustomMapper extends Mapper<DataSourceAccessDO> {
IPage<DataSourceAccessDO> comprehensivePageQuery(IPage<DataSourceDO> page, @Param("dataSourceId") Long dataSourceId, @Param("searchKey") String searchKey);
IPage<DataSourceAccessDO> comprehensivePageQuery(IPage<DataSourceAccessDO> page, @Param("dataSourceId") Long dataSourceId,
@Param("userOrTeamSearchKey") String userOrTeamSearchKey,
@Param("dataSourceSearchKey") String dataSourceSearchKey);
}

3
chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/mapper/TeamUserCustomMapper.java
View File

@ -1,6 +1,5 @@
package ai.chat2db.server.domain.repository.mapper;
import ai.chat2db.server.domain.repository.entity.DataSourceDO;
import ai.chat2db.server.domain.repository.entity.TeamUserDO;
import com.baomidou.mybatisplus.core.mapper.Mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -13,6 +12,6 @@ import org.apache.ibatis.annotations.Param;
*/
public interface TeamUserCustomMapper extends Mapper<TeamUserDO> {
IPage<TeamUserDO> comprehensivePageQuery(IPage<DataSourceDO> page, @Param("teamId") Long teamId,
IPage<TeamUserDO> comprehensivePageQuery(IPage<TeamUserDO> page, @Param("teamId") Long teamId,
@Param("userId") Long userId, @Param("teamRoleCode") String teamRoleCode);
}

14
chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/DataSourceAccessCustomMapper.xml
View File

@ -4,18 +4,24 @@
<select id="comprehensivePageQuery" resultType="ai.chat2db.server.domain.repository.entity.DataSourceAccessDO">
select dsa.*
from DATA_SOURCE_ACCESS dsa
<if test="searchKey != null ">
<if test="userOrTeamSearchKey != null ">
left join TEAM t on t.id =dsa.ACCESS_OBJECT_ID and dsa.ACCESS_OBJECT_TYPE = 'TEAM'
left join DBHUB_USER du on du.ID=dsa.ACCESS_OBJECT_ID and dsa.ACCESS_OBJECT_TYPE = 'USER'
</if>
<if test="dataSourceSearchKey != null ">
left join DATA_SOURCE ds on ds.id =dsa.DATA_SOURCE_ID
</if>
<where>
<if test="dataSourceId != null ">
and dsa.DATA_SOURCE_ID = #{dataSourceId}
</if>
<if test="searchKey != null ">
and (t.CODE like concat('%',#{searchKey},'%') or t.NAME like concat('%',#{searchKey},'%') or
du.USER_NAME like concat('%',#{searchKey},'%') or du.NICK_NAME like concat('%',#{searchKey},'%') or
du.EMAIL like concat('%',#{searchKey},'%'))
and (t.CODE like concat('%',#{userOrTeamSearchKey},'%') or t.NAME like concat('%',#{userOrTeamSearchKey},'%') or
du.USER_NAME like concat('%',#{userOrTeamSearchKey},'%') or du.NICK_NAME like concat('%',#{userOrTeamSearchKey},'%') or
du.EMAIL like concat('%',#{userOrTeamSearchKey},'%'))
</if>
<if test="dataSourceSearchKey != null ">
and (ds.ALIAS like concat('%',#{dataSourceSearchKey},'%') or ds.URL like concat('%',#{dataSourceSearchKey},'%'))
</if>
</where>
</select>

13
chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/mapper/TeamUserCustomMapper.xml
View File

@ -4,9 +4,12 @@
<select id="comprehensivePageQuery" resultType="ai.chat2db.server.domain.repository.entity.TeamUserDO">
select tu.*
from TEAM_USER tu
<if test="teamRoleCode != null ">
<if test="teamRoleCode != null or teamSearchKey != null">
left join TEAM t on t.id = tu.TEAM_ID
</if>
<if test="userSearchKey != null">
left join DBHUB_USER du on du.id = tu.USER_ID
</if>
<where>
<if test="teamId != null ">
and tu.TEAM_ID = #{teamId}
@ -18,6 +21,14 @@
and t.ROLE_CODE = #{teamRoleCode}
and t.STATUS = 'VALID'
</if>
<if test="teamSearchKey != null ">
and (t.CODE like concat('%',#{teamSearchKey},'%') or t.NAME like concat('%',#{teamSearchKey},'%'))
</if>
<if test="userSearchKey != null ">
and ( du.USER_NAME like concat('%',#{userSearchKey},'%') or du.NICK_NAME like
concat('%',#{userSearchKey},'%') or
du.EMAIL like concat('%',#{userSearchKey},'%'))
</if>
</where>
</select>