manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加TableName注解,Db模块更改返回类型

Browse Source
This commit is contained in:
Mdai
2022-12-16 11:47:05 +08:00
parent c4f024cfad
commit 3b993205fb
41 changed files with 215 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserDetails.java
View File

@@ -39,15 +39,4 @@ public class DocUserDetails {
this.enabled = enabled;
this.userAuthList = userAuthList;
}
@Override
public String toString() {
return "DocUserDetails{" +
"userId=" + userId +
", username='" + username + '\'' +
", password='" + password + '\'' +
", enabled=" + enabled +
", userAuthList=" + userAuthList +
'}';
}
}

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiCustomNode.java
View File

@@ -20,8 +20,6 @@ import java.util.Date;
@TableName("api_custom_node")
public class ApiCustomNode implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键自增ID
*/

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiCustomParams.java
View File

@@ -20,8 +20,6 @@ import java.util.Date;
@TableName("api_custom_params")
public class ApiCustomParams implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键自增ID
*/

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiCustomRequest.java
View File

@@ -20,8 +20,6 @@ import java.util.Date;
@TableName("api_custom_request")
public class ApiCustomRequest implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键自增ID
*/

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiRequestParam.java
View File

@@ -20,8 +20,6 @@ import java.util.Date;
@TableName("api_request_param")
public class ApiRequestParam implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键自增ID
*/

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/AuthInfo.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2018-12-05
*/
@Data
@TableName("auth_info")
public class AuthInfo implements Serializable {
/**

6
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbDatasource.java
View File

@@ -2,20 +2,20 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
* 数据源对象
*
* @author 暮光：城中城
* @since 2019-07-04
*/
@Data
@TableName("db_datasource")
public class DbDatasource implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbFavorite.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2019-08-21
*/
@Data
@TableName("db_favorite")
public class DbFavorite implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbHistory.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2019-08-21
*/
@Data
@TableName("db_history")
public class DbHistory implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbProcLog.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2021-04-26
*/
@Data
@TableName("db_proc_log")
public class DbProcLog implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbTableRelation.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2021-06-07
*/
@Data
@TableName("db_table_relation")
public class DbTableRelation implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbTransferTask.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2019-09-30
*/
@Data
@TableName("db_transfer_task")
public class DbTransferTask implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/EsDatasource.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2019-07-27
*/
@Data
@TableName("es_datasource")
public class EsDatasource implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserAuth.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2019-05-31
*/
@Data
@TableName("user_auth")
public class UserAuth implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroup.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2021-02-08
*/
@Data
@TableName("user_group")
public class UserGroup implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroupAuth.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2021-02-09
*/
@Data
@TableName("user_group_auth")
public class UserGroupAuth implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroupRelation.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2021-02-08
*/
@Data
@TableName("user_group_relation")
public class UserGroupRelation implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserInfo.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2018-12-05
*/
@Data
@TableName("user_info")
public class UserInfo implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserMessage.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2020-06-23
*/
@Data
@TableName("user_message")
public class UserMessage implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserSetting.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2021-02-09
*/
@Data
@TableName("user_setting")
public class UserSetting implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPage.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2019-06-06
*/
@Data
@TableName("wiki_page")
public class WikiPage implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageComment.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2019-02-24
*/
@Data
@TableName("wiki_page_comment")
public class WikiPageComment implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2019-02-24
*/
@Data
@TableName("wiki_page_content")
public class WikiPageContent implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageFile.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2019-03-06
*/
@Data
@TableName("wiki_page_file")
public class WikiPageFile implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageHistory.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2020-09-05
*/
@Data
@TableName("wiki_page_history")
public class WikiPageHistory implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageZan.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2019-03-05
*/
@Data
@TableName("wiki_page_zan")
public class WikiPageZan implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2019-03-11
*/
@Data
@TableName("wiki_space")
public class WikiSpace implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpaceFavorite.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2021-02-09
*/
@Data
@TableName("wiki_space_favorite")
public class WikiSpaceFavorite implements Serializable {
/**

2
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ZyplayerStorage.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
* @since 2018-11-27
*/
@Data
@TableName("zyplayer_storage")
public class ZyplayerStorage implements Serializable {
@TableId(value = "id", type = IdType.AUTO)

13
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbDatasourceService.java
View File

@@ -1,16 +1,21 @@
package com.zyplayer.doc.data.service.manage;
import com.zyplayer.doc.data.repository.manage.entity.DbDatasource;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zyplayer.doc.data.repository.manage.entity.DbDatasource;
import java.util.List;
/**
* <p>
* 服务类
* </p>
* 数据源业务接口
*
* @author 暮光：城中城
* @since 2019-07-04
*/
public interface DbDatasourceService extends IService<DbDatasource> {
/**
* 获取数据源列表(管理员返回所有数据源,用户返回有权限的数据源)
* @return List<DbDatasource>
*/
List<DbDatasource> getDataSourceList();
}

48
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbDatasourceServiceImpl.java
View File

@@ -1,14 +1,27 @@
package com.zyplayer.doc.data.service.manage.impl;
import com.zyplayer.doc.data.repository.manage.entity.DbDatasource;
import com.zyplayer.doc.data.repository.manage.mapper.DbDatasourceMapper;
import com.zyplayer.doc.data.service.manage.DbDatasourceService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.DbDatasource;
import com.zyplayer.doc.data.repository.manage.entity.UserAuth;
import com.zyplayer.doc.data.repository.manage.mapper.DbDatasourceMapper;
import com.zyplayer.doc.data.repository.support.consts.DocAuthConst;
import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType;
import com.zyplayer.doc.data.repository.support.consts.DocSysType;
import com.zyplayer.doc.data.service.manage.DbDatasourceService;
import com.zyplayer.doc.data.service.manage.UserAuthService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
* 服务实现类
* 服务实现类
* </p>
*
* @author 暮光：城中城
@@ -17,4 +30,31 @@ import org.springframework.stereotype.Service;
@Service
public class DbDatasourceServiceImpl extends ServiceImpl<DbDatasourceMapper, DbDatasource> implements DbDatasourceService {
@Resource
UserAuthService userAuthService;
@Override
public List<DbDatasource> getDataSourceList() {
DocUserDetails currentUser = DocUserUtil.getCurrentUser();
QueryWrapper<DbDatasource> wrapper = new QueryWrapper<>();
wrapper.eq("yn", 1);
// 没管理权限只返回有权限的数据源
if (!DocUserUtil.haveAuth(DocAuthConst.DB_DATASOURCE_MANAGE)) {
QueryWrapper<UserAuth> updateWrapper = new QueryWrapper<>();
updateWrapper.eq("sys_type", DocSysType.DB.getType());
updateWrapper.eq("sys_module_type", DocSysModuleType.Db.DATASOURCE.getType());
updateWrapper.eq("del_flag", 0);
updateWrapper.eq("user_id", currentUser.getUserId());
List<UserAuth> userAuthList = userAuthService.list(updateWrapper);
if (userAuthList == null || userAuthList.isEmpty()) {
return new ArrayList<>();
}
List<Long> userAuthDbIds = userAuthList.stream()
.map(UserAuth::getSysModuleId)
.collect(Collectors.toList());
wrapper.in("id", userAuthDbIds);
}
wrapper.select("id", "name", "group_name");
return list(wrapper);
}
}