datas = ConfigConvert.INSTANCE.convertList(list);
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java
index f1990f3fc..368162214 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java
@@ -39,27 +39,38 @@ public class CodegenColumnDO extends BaseDO {
/**
* 字段名
+ *
+ * 关联 {@link TableField#getName()}
*/
private String columnName;
/**
* 数据库字段类型
+ *
* 关联 {@link TableField.MetaInfo#getJdbcType()}
*/
private String dataType;
/**
* 字段描述
+ *
+ * 关联 {@link TableField#getComment()}
*/
private String columnComment;
/**
* 是否允许为空
+ *
+ * 关联 {@link TableField.MetaInfo#isNullable()}
*/
private Boolean nullable;
/**
* 是否主键
+ *
+ * 关联 {@link TableField#isKeyFlag()}
*/
private Boolean primaryKey;
/**
* 是否自增
+ *
+ * 关联 {@link TableField#isKeyIdentityFlag()}
*/
private Boolean autoIncrement;
/**
@@ -71,12 +82,16 @@ public class CodegenColumnDO extends BaseDO {
/**
* Java 属性类型
- *
+ *
* 例如说 String、Boolean 等等
+ *
+ * 关联 {@link TableField#getColumnType()}
*/
private String javaType;
/**
* Java 属性名
+ *
+ * 关联 {@link TableField#getPropertyName()}
*/
private String javaField;
/**
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java
index b821d210c..4f4a644a7 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.infra.enums.codegen.CodegenSceneEnum;
import cn.iocoder.yudao.module.infra.enums.codegen.CodegenTemplateTypeEnum;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -44,10 +45,14 @@ public class CodegenTableDO extends BaseDO {
/**
* 表名称
+ *
+ * 关联 {@link TableInfo#getName()}
*/
private String tableName;
/**
* 表描述
+ *
+ * 关联 {@link TableInfo#getComment()}
*/
private String tableComment;
/**
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
index b5103bc04..c4a9fb801 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
@@ -28,6 +28,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.function.BiPredicate;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -75,7 +76,7 @@ public class CodegenServiceImpl implements CodegenService {
private Long createCodegen0(Long userId, Long dataSourceConfigId, TableInfo tableInfo) {
// 校验导入的表和字段非空
- checkTableInfo(tableInfo);
+ validateTableInfo(tableInfo);
// 校验是否已经存在
if (codegenTableMapper.selectByTableNameAndDataSourceConfigId(tableInfo.getName(),
dataSourceConfigId) != null) {
@@ -86,7 +87,7 @@ public class CodegenServiceImpl implements CodegenService {
CodegenTableDO table = codegenBuilder.buildTable(tableInfo);
table.setDataSourceConfigId(dataSourceConfigId);
table.setScene(CodegenSceneEnum.ADMIN.getScene()); // 默认配置下，使用管理后台的模板
- table.setAuthor(userApi.getUser(userId).getData().getNickname());
+ table.setAuthor(userApi.getUser(userId).getCheckedData().getNickname());
codegenTableMapper.insert(table);
// 构建 CodegenColumnDO 数组，插入到 DB 中
@@ -99,7 +100,7 @@ public class CodegenServiceImpl implements CodegenService {
return table.getId();
}
- private void checkTableInfo(TableInfo tableInfo) {
+ private void validateTableInfo(TableInfo tableInfo) {
if (tableInfo == null) {
throw exception(CODEGEN_IMPORT_TABLE_NULL);
}
@@ -148,18 +149,33 @@ public class CodegenServiceImpl implements CodegenService {
private void syncCodegen0(Long tableId, TableInfo tableInfo) {
// 校验导入的表和字段非空
- checkTableInfo(tableInfo);
+ validateTableInfo(tableInfo);
List tableFields = tableInfo.getFields();
// 构建 CodegenColumnDO 数组，只同步新增的字段
List codegenColumns = codegenColumnMapper.selectListByTableId(tableId);
Set codegenColumnNames = CollectionUtils.convertSet(codegenColumns, CodegenColumnDO::getColumnName);
+
+ //计算需要修改的字段，插入时重新插入，删除时将原来的删除
+ BiPredicate pr =
+ (tableField, codegenColumn) -> tableField.getType().equals(codegenColumn.getDataType())
+ && tableField.getMetaInfo().isNullable() == codegenColumn.getNullable()
+ && tableField.isKeyFlag() == codegenColumn.getPrimaryKey()
+ && tableField.getComment().equals(codegenColumn.getColumnComment());
+ Map codegenColumnDOMap = CollectionUtils.convertMap(codegenColumns, CodegenColumnDO::getColumnName);
+ //需要修改的字段
+ Set modifyFieldNames = tableFields.stream()
+ .filter(tableField -> codegenColumnDOMap.get(tableField.getColumnName()) != null
+ && !pr.test(tableField, codegenColumnDOMap.get(tableField.getColumnName())))
+ .map(TableField::getColumnName)
+ .collect(Collectors.toSet());
// 计算需要删除的字段
Set tableFieldNames = CollectionUtils.convertSet(tableFields, TableField::getName);
- Set deleteColumnIds = codegenColumns.stream().filter(column -> !tableFieldNames.contains(column.getColumnName()))
+ Set deleteColumnIds = codegenColumns.stream()
+ .filter(column -> (!tableFieldNames.contains(column.getColumnName())) || modifyFieldNames.contains(column.getColumnName()))
.map(CodegenColumnDO::getId).collect(Collectors.toSet());
// 移除已经存在的字段
- tableFields.removeIf(column -> codegenColumnNames.contains(column.getColumnName()));
+ tableFields.removeIf(column -> codegenColumnNames.contains(column.getColumnName()) && (!modifyFieldNames.contains(column.getColumnName())));
if (CollUtil.isEmpty(tableFields) && CollUtil.isEmpty(deleteColumnIds)) {
throw exception(CODEGEN_SYNC_NONE_CHANGE);
}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImpl.java
index 5c354c989..51c912be7 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImpl.java
@@ -9,7 +9,6 @@ import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigUpdateReqV
import cn.iocoder.yudao.module.infra.convert.config.ConfigConvert;
import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO;
import cn.iocoder.yudao.module.infra.dal.mysql.config.ConfigMapper;
-import cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants;
import cn.iocoder.yudao.module.infra.enums.config.ConfigTypeEnum;
import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;
@@ -20,6 +19,7 @@ import javax.annotation.Resource;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
/**
* 参数配置 Service 实现类
@@ -35,7 +35,7 @@ public class ConfigServiceImpl implements ConfigService {
@Override
public Long createConfig(ConfigCreateReqVO reqVO) {
// 校验正确性
- checkCreateOrUpdate(null, reqVO.getKey());
+ validateConfigForCreateOrUpdate(null, reqVO.getKey());
// 插入参数配置
ConfigDO config = ConfigConvert.INSTANCE.convert(reqVO);
config.setType(ConfigTypeEnum.CUSTOM.getType());
@@ -46,19 +46,19 @@ public class ConfigServiceImpl implements ConfigService {
@Override
public void updateConfig(ConfigUpdateReqVO reqVO) {
// 校验正确性
- checkCreateOrUpdate(reqVO.getId(), null); // 不允许更新 key
+ validateConfigForCreateOrUpdate(reqVO.getId(), null); // 不允许更新 key
// 更新参数配置
ConfigDO updateObj = ConfigConvert.INSTANCE.convert(reqVO);
- configMapper.updateById(updateObj);;
+ configMapper.updateById(updateObj);
}
@Override
public void deleteConfig(Long id) {
// 校验配置存在
- ConfigDO config = checkConfigExists(id);
+ ConfigDO config = validateConfigExists(id);
// 内置配置，不允许删除
if (ConfigTypeEnum.SYSTEM.getType().equals(config.getType())) {
- throw exception(ErrorCodeConstants.CONFIG_CAN_NOT_DELETE_SYSTEM_TYPE);
+ throw exception(CONFIG_CAN_NOT_DELETE_SYSTEM_TYPE);
}
// 删除
configMapper.deleteById(id);
@@ -84,39 +84,39 @@ public class ConfigServiceImpl implements ConfigService {
return configMapper.selectList(reqVO);
}
- private void checkCreateOrUpdate(Long id, String key) {
+ private void validateConfigForCreateOrUpdate(Long id, String key) {
// 校验自己存在
- checkConfigExists(id);
+ validateConfigExists(id);
// 校验参数配置 key 的唯一性
if (StrUtil.isNotEmpty(key)) {
- checkConfigKeyUnique(id, key);
+ validateConfigKeyUnique(id, key);
}
}
@VisibleForTesting
- public ConfigDO checkConfigExists(Long id) {
+ public ConfigDO validateConfigExists(Long id) {
if (id == null) {
return null;
}
ConfigDO config = configMapper.selectById(id);
if (config == null) {
- throw exception(ErrorCodeConstants.CONFIG_NOT_EXISTS);
+ throw exception(CONFIG_NOT_EXISTS);
}
return config;
}
@VisibleForTesting
- public void checkConfigKeyUnique(Long id, String key) {
+ public void validateConfigKeyUnique(Long id, String key) {
ConfigDO config = configMapper.selectByKey(key);
if (config == null) {
return;
}
// 如果 id 为空，说明不用比较是否为相同 id 的参数配置
if (id == null) {
- throw exception(ErrorCodeConstants.CONFIG_KEY_DUPLICATE);
+ throw exception(CONFIG_KEY_DUPLICATE);
}
if (!config.getId().equals(id)) {
- throw exception(ErrorCodeConstants.CONFIG_KEY_DUPLICATE);
+ throw exception(CONFIG_KEY_DUPLICATE);
}
}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java
index f2fd0a408..e4365c205 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java
@@ -37,7 +37,7 @@ public class DataSourceConfigServiceImpl implements DataSourceConfigService {
@Override
public Long createDataSourceConfig(DataSourceConfigCreateReqVO createReqVO) {
DataSourceConfigDO dataSourceConfig = DataSourceConfigConvert.INSTANCE.convert(createReqVO);
- checkConnectionOK(dataSourceConfig);
+ validateConnectionOK(dataSourceConfig);
// 插入
dataSourceConfigMapper.insert(dataSourceConfig);
@@ -50,7 +50,7 @@ public class DataSourceConfigServiceImpl implements DataSourceConfigService {
// 校验存在
validateDataSourceConfigExists(updateReqVO.getId());
DataSourceConfigDO updateObj = DataSourceConfigConvert.INSTANCE.convert(updateReqVO);
- checkConnectionOK(updateObj);
+ validateConnectionOK(updateObj);
// 更新
dataSourceConfigMapper.updateById(updateObj);
@@ -88,7 +88,7 @@ public class DataSourceConfigServiceImpl implements DataSourceConfigService {
return result;
}
- private void checkConnectionOK(DataSourceConfigDO config) {
+ private void validateConnectionOK(DataSourceConfigDO config) {
boolean success = JdbcUtils.isConnectionOK(config.getUrl(), config.getUsername(), config.getPassword());
if (!success) {
throw exception(DATA_SOURCE_CONFIG_NOT_OK);
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
index cd3ddaba7..8bd2d5c93 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
@@ -41,7 +41,7 @@ public class DatabaseTableServiceImpl implements DatabaseTableService {
return CollUtil.getFirst(getTableList0(dataSourceConfigId, name));
}
- public List getTableList0(Long dataSourceConfigId, String name) {
+ private List getTableList0(Long dataSourceConfigId, String name) {
// 获得数据源配置
DataSourceConfigDO config = dataSourceConfigService.getDataSourceConfig(dataSourceConfigId);
Assert.notNull(config, "数据源({}) 不存在！", dataSourceConfigId);
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigService.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigService.java
index b3fc6bad2..43ab5bc68 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigService.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigService.java
@@ -8,8 +8,6 @@ import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigU
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileConfigDO;
import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
/**
* 文件配置 Service 接口
@@ -60,14 +58,6 @@ public interface FileConfigService {
*/
FileConfigDO getFileConfig(Long id);
- /**
- * 获得文件配置列表
- *
- * @param ids 编号
- * @return 文件配置列表
- */
- List getFileConfigList(Collection ids);
-
/**
* 获得文件配置分页
*
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java
index e81be2e73..6236df6ff 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java
@@ -27,7 +27,6 @@ import org.springframework.validation.annotation.Validated;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.validation.Validator;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -95,7 +94,7 @@ public class FileConfigServiceImpl implements FileConfigService {
@Override
public void updateFileConfig(FileConfigUpdateReqVO updateReqVO) {
// 校验存在
- FileConfigDO config = this.validateFileConfigExists(updateReqVO.getId());
+ FileConfigDO config = validateFileConfigExists(updateReqVO.getId());
// 更新
FileConfigDO updateObj = FileConfigConvert.INSTANCE.convert(updateReqVO)
.setConfig(parseClientConfig(config.getStorage(), updateReqVO.getConfig()));
@@ -108,7 +107,7 @@ public class FileConfigServiceImpl implements FileConfigService {
@Transactional(rollbackFor = Exception.class)
public void updateFileConfigMaster(Long id) {
// 校验存在
- this.validateFileConfigExists(id);
+ validateFileConfigExists(id);
// 更新其它为非 master
fileConfigMapper.updateBatch(new FileConfigDO().setMaster(false));
// 更新
@@ -138,9 +137,9 @@ public class FileConfigServiceImpl implements FileConfigService {
@Override
public void deleteFileConfig(Long id) {
// 校验存在
- FileConfigDO config = this.validateFileConfigExists(id);
+ FileConfigDO config = validateFileConfigExists(id);
if (Boolean.TRUE.equals(config.getMaster())) {
- throw exception(FILE_CONFIG_DELETE_FAIL_MASTER);
+ throw exception(FILE_CONFIG_DELETE_FAIL_MASTER);
}
// 删除
fileConfigMapper.deleteById(id);
@@ -161,11 +160,6 @@ public class FileConfigServiceImpl implements FileConfigService {
return fileConfigMapper.selectById(id);
}
- @Override
- public List getFileConfigList(Collection ids) {
- return fileConfigMapper.selectBatchIds(ids);
- }
-
@Override
public PageResult getFileConfigPage(FileConfigPageReqVO pageReqVO) {
return fileConfigMapper.selectPage(pageReqVO);
@@ -174,7 +168,7 @@ public class FileConfigServiceImpl implements FileConfigService {
@Override
public String testFileConfig(Long id) throws Exception {
// 校验存在
- this.validateFileConfigExists(id);
+ validateFileConfigExists(id);
// 上传文件
byte[] content = ResourceUtil.readBytes("file/erweima.jpg");
return fileClientFactory.getFileClient(id).upload(content, IdUtil.fastSimpleUUID() + ".jpg", "image/jpeg");
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
index 2226e7bae..0732765d8 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
@@ -69,7 +69,7 @@ public class FileServiceImpl implements FileService {
@Override
public void deleteFile(Long id) throws Exception {
// 校验存在
- FileDO file = this.validateFileExists(id);
+ FileDO file = validateFileExists(id);
// 从文件存储器中删除
FileClient client = fileConfigService.getFileClient(file.getConfigId());
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java
index 6d79f8754..c0f9252af 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java
@@ -1,17 +1,13 @@
package cn.iocoder.yudao.module.infra.service.logger;
-import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLog;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO;
import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO;
import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO;
import cn.iocoder.yudao.module.infra.convert.logger.ApiErrorLogConvert;
import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO;
import cn.iocoder.yudao.module.infra.dal.mysql.logger.ApiErrorLogMapper;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants;
import cn.iocoder.yudao.module.infra.enums.logger.ApiErrorLogProcessStatusEnum;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -19,6 +15,10 @@ import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.API_ERROR_LOG_NOT_FOUND;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.API_ERROR_LOG_PROCESSED;
+
/**
* API 错误日志 Service 实现类
*
@@ -33,8 +33,8 @@ public class ApiErrorLogServiceImpl implements ApiErrorLogService {
@Override
public void createApiErrorLog(ApiErrorLogCreateReqDTO createDTO) {
- ApiErrorLogDO apiErrorLog = ApiErrorLogConvert.INSTANCE.convert(createDTO);
- apiErrorLog.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
+ ApiErrorLogDO apiErrorLog = ApiErrorLogConvert.INSTANCE.convert(createDTO)
+ .setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
apiErrorLogMapper.insert(apiErrorLog);
}
@@ -52,10 +52,10 @@ public class ApiErrorLogServiceImpl implements ApiErrorLogService {
public void updateApiErrorLogProcess(Long id, Integer processStatus, Long processUserId) {
ApiErrorLogDO errorLog = apiErrorLogMapper.selectById(id);
if (errorLog == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.API_ERROR_LOG_NOT_FOUND);
+ throw exception(API_ERROR_LOG_NOT_FOUND);
}
if (!ApiErrorLogProcessStatusEnum.INIT.getStatus().equals(errorLog.getProcessStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.API_ERROR_LOG_PROCESSED);
+ throw exception(API_ERROR_LOG_PROCESSED);
}
// 标记处理
apiErrorLogMapper.updateById(ApiErrorLogDO.builder().id(id).processStatus(processStatus)
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoServiceImpl.java
index 92153b022..f476b5a72 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoServiceImpl.java
@@ -45,7 +45,7 @@ public class TestDemoServiceImpl implements TestDemoService {
@CacheEvict(value = "test", key = "#updateReqVO.id")
public void updateTestDemo(TestDemoUpdateReqVO updateReqVO) {
// 校验存在
- this.validateTestDemoExists(updateReqVO.getId());
+ validateTestDemoExists(updateReqVO.getId());
// 更新
TestDemoDO updateObj = TestDemoConvert.INSTANCE.convert(updateReqVO);
testDemoMapper.updateById(updateObj);
@@ -55,7 +55,7 @@ public class TestDemoServiceImpl implements TestDemoService {
@CacheEvict(value = "test", key = "#id")
public void deleteTestDemo(Long id) {
// 校验存在
- this.validateTestDemoExists(id);
+ validateTestDemoExists(id);
// 删除
testDemoMapper.deleteById(id);
}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm
index 85dfa0aab..a732039ce 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm
@@ -39,7 +39,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
@Override
public void update${simpleClassName}(${sceneEnum.prefixClass}${table.className}UpdateReqVO updateReqVO) {
// 校验存在
- this.validate${simpleClassName}Exists(updateReqVO.getId());
+ validate${simpleClassName}Exists(updateReqVO.getId());
// 更新
${table.className}DO updateObj = ${table.className}Convert.INSTANCE.convert(updateReqVO);
${classNameVar}Mapper.updateById(updateObj);
@@ -48,7 +48,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
@Override
public void delete${simpleClassName}(${primaryColumn.javaType} id) {
// 校验存在
- this.validate${simpleClassName}Exists(id);
+ validate${simpleClassName}Exists(id);
// 删除
${classNameVar}Mapper.deleteById(id);
}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm
index e97fbb275..67a44e989 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm
@@ -52,7 +52,7 @@ import static org.mockito.Mockito.*;
#if (${column.listOperation})
#set ($JavaField = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})##首字母大写
#if (${column.listOperationCondition} == "BETWEEN")## BETWEEN 的情况
- reqVO.set${JavaField}((new LocalDateTime[]{}));
+ reqVO.set${JavaField}(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
#else
reqVO.set$JavaField(null);
#end
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImplTest.java
similarity index 73%
rename from yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceTest.java
rename to yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImplTest.java
index 5d7d74338..428b20522 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceTest.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImplTest.java
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.infra.service.config;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigCreateReqVO;
@@ -12,27 +11,25 @@ import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigUpdateReqV
import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO;
import cn.iocoder.yudao.module.infra.dal.mysql.config.ConfigMapper;
import cn.iocoder.yudao.module.infra.enums.config.ConfigTypeEnum;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import;
import javax.annotation.Resource;
-import java.time.LocalDateTime;
import java.util.List;
import java.util.function.Consumer;
import static cn.hutool.core.util.RandomUtil.randomEle;
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
@Import(ConfigServiceImpl.class)
-public class ConfigServiceTest extends BaseDbUnitTest {
+public class ConfigServiceImplTest extends BaseDbUnitTest {
@Resource
private ConfigServiceImpl configService;
@@ -52,7 +49,7 @@ public class ConfigServiceTest extends BaseDbUnitTest {
// 校验记录的属性是否正确
ConfigDO config = configMapper.selectById(configId);
assertPojoEquals(reqVO, config);
- Assertions.assertEquals(ConfigTypeEnum.CUSTOM.getType(), config.getType());
+ assertEquals(ConfigTypeEnum.CUSTOM.getType(), config.getType());
}
@Test
@@ -103,40 +100,40 @@ public class ConfigServiceTest extends BaseDbUnitTest {
}
@Test
- public void testCheckConfigExists_success() {
+ public void testValidateConfigExists_success() {
// mock 数据
ConfigDO dbConfigDO = randomConfigDO();
configMapper.insert(dbConfigDO);// @Sql: 先插入出一条存在的数据
// 调用成功
- configService.checkConfigExists(dbConfigDO.getId());
+ configService.validateConfigExists(dbConfigDO.getId());
}
@Test
- public void testCheckConfigExist_notExists() {
- assertServiceException(() -> configService.checkConfigExists(randomLongId()), CONFIG_NOT_EXISTS);
+ public void testValidateConfigExist_notExists() {
+ assertServiceException(() -> configService.validateConfigExists(randomLongId()), CONFIG_NOT_EXISTS);
}
@Test
- public void testCheckConfigKeyUnique_success() {
+ public void testValidateConfigKeyUnique_success() {
// 调用，成功
- configService.checkConfigKeyUnique(randomLongId(), randomString());
+ configService.validateConfigKeyUnique(randomLongId(), randomString());
}
@Test
- public void testCheckConfigKeyUnique_keyDuplicateForCreate() {
+ public void testValidateConfigKeyUnique_keyDuplicateForCreate() {
// 准备参数
String key = randomString();
// mock 数据
configMapper.insert(randomConfigDO(o -> o.setConfigKey(key)));
// 调用，校验异常
- assertServiceException(() -> configService.checkConfigKeyUnique(null, key),
+ assertServiceException(() -> configService.validateConfigKeyUnique(null, key),
CONFIG_KEY_DUPLICATE);
}
@Test
- public void testCheckConfigKeyUnique_keyDuplicateForUpdate() {
+ public void testValidateConfigKeyUnique_keyDuplicateForUpdate() {
// 准备参数
Long id = randomLongId();
String key = randomString();
@@ -144,7 +141,7 @@ public class ConfigServiceTest extends BaseDbUnitTest {
configMapper.insert(randomConfigDO(o -> o.setConfigKey(key)));
// 调用，校验异常
- assertServiceException(() -> configService.checkConfigKeyUnique(id, key),
+ assertServiceException(() -> configService.validateConfigKeyUnique(id, key),
CONFIG_KEY_DUPLICATE);
}
@@ -155,23 +152,23 @@ public class ConfigServiceTest extends BaseDbUnitTest {
o.setName("芋艿");
o.setConfigKey("yunai");
o.setType(ConfigTypeEnum.SYSTEM.getType());
- o.setCreateTime(buildLocalDateTime(2021, 2, 1));
+ o.setCreateTime(buildTime(2021, 2, 1));
});
configMapper.insert(dbConfig);
// 测试 name 不匹配
- configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setName("土豆")));
+ configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setName("土豆")));
// 测试 key 不匹配
- configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setConfigKey("tudou")));
+ configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setConfigKey("tudou")));
// 测试 type 不匹配
- configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setType(ConfigTypeEnum.CUSTOM.getType())));
+ configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setType(ConfigTypeEnum.CUSTOM.getType())));
// 测试 createTime 不匹配
- configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildLocalDateTime(2021, 1, 1))));
+ configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildTime(2021, 1, 1))));
// 准备参数
ConfigPageReqVO reqVO = new ConfigPageReqVO();
reqVO.setName("艿");
reqVO.setKey("nai");
reqVO.setType(ConfigTypeEnum.SYSTEM.getType());
- reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 1, 15),buildLocalDateTime(2021, 2, 15)}));
+ reqVO.setCreateTime(buildBetweenTime(2021, 1, 15, 2021, 2, 15));
// 调用
PageResult pageResult = configService.getConfigPage(reqVO);
@@ -188,23 +185,23 @@ public class ConfigServiceTest extends BaseDbUnitTest {
o.setName("芋艿");
o.setConfigKey("yunai");
o.setType(ConfigTypeEnum.SYSTEM.getType());
- o.setCreateTime(buildLocalDateTime(2021, 2, 1));
+ o.setCreateTime(buildTime(2021, 2, 1));
});
configMapper.insert(dbConfig);
// 测试 name 不匹配
- configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setName("土豆")));
+ configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setName("土豆")));
// 测试 key 不匹配
- configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setConfigKey("tudou")));
+ configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setConfigKey("tudou")));
// 测试 type 不匹配
- configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setType(ConfigTypeEnum.CUSTOM.getType())));
+ configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setType(ConfigTypeEnum.CUSTOM.getType())));
// 测试 createTime 不匹配
- configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildLocalDateTime(2021, 1, 1))));
+ configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildTime(2021, 1, 1))));
// 准备参数
ConfigExportReqVO reqVO = new ConfigExportReqVO();
reqVO.setName("艿");
reqVO.setKey("nai");
reqVO.setType(ConfigTypeEnum.SYSTEM.getType());
- reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 1, 15),buildLocalDateTime(2021, 2, 15)}));
+ reqVO.setCreateTime(buildBetweenTime(2021, 1, 15, 2021, 2, 15));
// 调用
List list = configService.getConfigList(reqVO);
@@ -213,6 +210,21 @@ public class ConfigServiceTest extends BaseDbUnitTest {
assertPojoEquals(dbConfig, list.get(0));
}
+ @Test
+ public void testGetConfig() {
+ // mock 数据
+ ConfigDO dbConfig = randomConfigDO();
+ configMapper.insert(dbConfig);// @Sql: 先插入出一条存在的数据
+ // 准备参数
+ Long id = dbConfig.getId();
+
+ // 调用
+ ConfigDO config = configService.getConfig(id);
+ // 断言
+ assertNotNull(config);
+ assertPojoEquals(dbConfig, config);
+ }
+
@Test
public void testGetConfigByKey() {
// mock 数据
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImplTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImplTest.java
index e1c997f7b..b5ef46c46 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImplTest.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImplTest.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.infra.service.db;
+import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ReflectUtil;
import cn.hutool.crypto.symmetric.AES;
import cn.iocoder.yudao.framework.mybatis.core.type.EncryptTypeHandler;
@@ -9,6 +10,7 @@ import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigCrea
import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigUpdateReqVO;
import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO;
import cn.iocoder.yudao.module.infra.dal.mysql.db.DataSourceConfigMapper;
+import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty;
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -18,14 +20,14 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Import;
import javax.annotation.Resource;
+import java.util.List;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.DATA_SOURCE_CONFIG_NOT_EXISTS;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mockStatic;
@@ -57,6 +59,11 @@ public class DataSourceConfigServiceImplTest extends BaseDbUnitTest {
ReflectUtil.setFieldValue(EncryptTypeHandler.class, "aes", aes);
when(aes.encryptBase64(anyString())).then((Answer) invocation -> invocation.getArgument(0));
when(aes.decryptStr(anyString())).then((Answer) invocation -> invocation.getArgument(0));
+
+ // mock DynamicDataSourceProperties
+ when(dynamicDataSourceProperties.getPrimary()).thenReturn("primary");
+ when(dynamicDataSourceProperties.getDatasource()).thenReturn(MapUtil.of("primary",
+ new DataSourceProperty().setUrl("http://localhost:3306").setUsername("yunai").setPassword("tudou")));
}
@Test
@@ -89,7 +96,6 @@ public class DataSourceConfigServiceImplTest extends BaseDbUnitTest {
o.setId(dbDataSourceConfig.getId()); // 设置更新的 ID
});
// mock 方法
-// when(stringEncryptor.encrypt(eq(reqVO.getPassword()))).thenReturn("123456");
databaseUtilsMock.when(() -> JdbcUtils.isConnectionOK(eq(reqVO.getUrl()),
eq(reqVO.getUsername()), eq(reqVO.getPassword()))).thenReturn(true);
@@ -142,7 +148,58 @@ public class DataSourceConfigServiceImplTest extends BaseDbUnitTest {
// 调用
DataSourceConfigDO result = dataSourceConfigMapper.selectOne(DataSourceConfigDO::getPassword,
EncryptTypeHandler.encrypt(dbDataSourceConfig.getPassword()));
- System.out.println(result);
+ assertPojoEquals(dbDataSourceConfig, result);
+ }
+
+ @Test
+ public void testGetDataSourceConfig_master() {
+ // 准备参数
+ Long id = 0L;
+ // mock 方法
+
+ // 调用
+ DataSourceConfigDO dataSourceConfig = dataSourceConfigService.getDataSourceConfig(id);
+ // 断言
+ assertEquals(id, dataSourceConfig.getId());
+ assertEquals("primary", dataSourceConfig.getName());
+ assertEquals("http://localhost:3306", dataSourceConfig.getUrl());
+ assertEquals("yunai", dataSourceConfig.getUsername());
+ assertEquals("tudou", dataSourceConfig.getPassword());
+ }
+
+ @Test
+ public void testGetDataSourceConfig_normal() {
+ // mock 数据
+ DataSourceConfigDO dbDataSourceConfig = randomPojo(DataSourceConfigDO.class);
+ dataSourceConfigMapper.insert(dbDataSourceConfig);// @Sql: 先插入出一条存在的数据
+ // 准备参数
+ Long id = dbDataSourceConfig.getId();
+
+ // 调用
+ DataSourceConfigDO dataSourceConfig = dataSourceConfigService.getDataSourceConfig(id);
+ // 断言
+ assertPojoEquals(dbDataSourceConfig, dataSourceConfig);
+ }
+
+ @Test
+ public void testGetDataSourceConfigList() {
+ // mock 数据
+ DataSourceConfigDO dbDataSourceConfig = randomPojo(DataSourceConfigDO.class);
+ dataSourceConfigMapper.insert(dbDataSourceConfig);// @Sql: 先插入出一条存在的数据
+ // 准备参数
+
+ // 调用
+ List dataSourceConfigList = dataSourceConfigService.getDataSourceConfigList();
+ // 断言
+ assertEquals(2, dataSourceConfigList.size());
+ // master
+ assertEquals(0L, dataSourceConfigList.get(0).getId());
+ assertEquals("primary", dataSourceConfigList.get(0).getName());
+ assertEquals("http://localhost:3306", dataSourceConfigList.get(0).getUrl());
+ assertEquals("yunai", dataSourceConfigList.get(0).getUsername());
+ assertEquals("tudou", dataSourceConfigList.get(0).getPassword());
+ // normal
+ assertPojoEquals(dbDataSourceConfig, dataSourceConfigList.get(1));
}
}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImplTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImplTest.java
new file mode 100644
index 000000000..6ce8c7d41
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImplTest.java
@@ -0,0 +1,89 @@
+package cn.iocoder.yudao.module.infra.service.db;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO;
+import com.baomidou.mybatisplus.generator.config.po.TableField;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
+import org.apache.ibatis.type.JdbcType;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+@Import(DatabaseTableServiceImpl.class)
+public class DatabaseTableServiceImplTest extends BaseDbUnitTest {
+
+ @Resource
+ private DatabaseTableServiceImpl databaseTableService;
+
+ @MockBean
+ private DataSourceConfigService dataSourceConfigService;
+
+ @Test
+ public void testGetTableList() {
+ // 准备参数
+ Long dataSourceConfigId = randomLongId();
+ // mock 方法
+ DataSourceConfigDO dataSourceConfig = new DataSourceConfigDO().setUsername("sa").setPassword("")
+ .setUrl("jdbc:h2:mem:testdb");
+ when(dataSourceConfigService.getDataSourceConfig(eq(dataSourceConfigId)))
+ .thenReturn(dataSourceConfig);
+
+ // 调用
+ List tables = databaseTableService.getTableList(dataSourceConfigId,
+ "config", "参数");
+ // 断言
+ assertEquals(1, tables.size());
+ assertTableInfo(tables.get(0));
+ }
+
+ @Test
+ public void testGetTable() {
+ // 准备参数
+ Long dataSourceConfigId = randomLongId();
+ // mock 方法
+ DataSourceConfigDO dataSourceConfig = new DataSourceConfigDO().setUsername("sa").setPassword("")
+ .setUrl("jdbc:h2:mem:testdb");
+ when(dataSourceConfigService.getDataSourceConfig(eq(dataSourceConfigId)))
+ .thenReturn(dataSourceConfig);
+
+ // 调用
+ TableInfo tableInfo = databaseTableService.getTable(dataSourceConfigId, "infra_config");
+ // 断言
+ assertTableInfo(tableInfo);
+ }
+
+ private void assertTableInfo(TableInfo tableInfo) {
+ assertEquals("infra_config", tableInfo.getName());
+ assertEquals("参数配置表", tableInfo.getComment());
+ assertEquals(13, tableInfo.getFields().size());
+ // id 字段
+ TableField idField = tableInfo.getFields().get(0);
+ assertEquals("id", idField.getName());
+ assertEquals(JdbcType.BIGINT, idField.getMetaInfo().getJdbcType());
+ assertEquals("编号", idField.getComment());
+ assertFalse(idField.getMetaInfo().isNullable());
+ assertTrue(idField.isKeyFlag());
+ assertTrue(idField.isKeyIdentityFlag());
+ assertEquals(DbColumnType.LONG, idField.getColumnType());
+ assertEquals("id", idField.getPropertyName());
+ // name 字段
+ TableField nameField = tableInfo.getFields().get(3);
+ assertEquals("name", nameField.getName());
+ assertEquals(JdbcType.VARCHAR, nameField.getMetaInfo().getJdbcType());
+ assertEquals("名字", nameField.getComment());
+ assertFalse(nameField.getMetaInfo().isNullable());
+ assertFalse(nameField.isKeyFlag());
+ assertFalse(nameField.isKeyIdentityFlag());
+ assertEquals(DbColumnType.STRING, nameField.getColumnType());
+ assertEquals("name", nameField.getPropertyName());
+ }
+}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java
index 56261576b..656955194 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.file.core.client.FileClient;
import cn.iocoder.yudao.framework.file.core.client.FileClientConfig;
import cn.iocoder.yudao.framework.file.core.client.FileClientFactory;
+import cn.iocoder.yudao.framework.file.core.client.local.LocalFileClient;
import cn.iocoder.yudao.framework.file.core.client.local.LocalFileClientConfig;
import cn.iocoder.yudao.framework.file.core.enums.FileStorageEnum;
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
@@ -41,10 +42,10 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;
/**
- * {@link FileConfigServiceImpl} 的单元测试类
- *
- * @author 芋道源码
- */
+* {@link FileConfigServiceImpl} 的单元测试类
+*
+* @author 芋道源码
+*/
@Import(FileConfigServiceImpl.class)
public class FileConfigServiceImplTest extends BaseDbUnitTest {
@@ -171,8 +172,8 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest {
// 调用
fileConfigService.deleteFileConfig(id);
- // 校验数据不存在了
- assertNull(fileConfigMapper.selectById(id));
+ // 校验数据不存在了
+ assertNull(fileConfigMapper.selectById(id));
// verify 调用
verify(fileConfigProducer).sendFileConfigRefreshMessage();
}
@@ -200,30 +201,30 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest {
@Test
public void testGetFileConfigPage() {
- // mock 数据
- FileConfigDO dbFileConfig = randomFileConfigDO().setName("芋道源码")
- .setStorage(FileStorageEnum.LOCAL.getStorage());
- dbFileConfig.setCreateTime(LocalDateTimeUtil.parse("2020-01-23", DatePattern.NORM_DATE_PATTERN));// 等会查询到
- fileConfigMapper.insert(dbFileConfig);
- // 测试 name 不匹配
- fileConfigMapper.insert(cloneIgnoreId(dbFileConfig, o -> o.setName("源码")));
- // 测试 storage 不匹配
- fileConfigMapper.insert(cloneIgnoreId(dbFileConfig, o -> o.setStorage(FileStorageEnum.DB.getStorage())));
- // 测试 createTime 不匹配
- fileConfigMapper.insert(cloneIgnoreId(dbFileConfig, o -> o.setCreateTime(LocalDateTimeUtil.parse("2020-11-23", DatePattern.NORM_DATE_PATTERN))));
- // 准备参数
- FileConfigPageReqVO reqVO = new FileConfigPageReqVO();
- reqVO.setName("芋道");
- reqVO.setStorage(FileStorageEnum.LOCAL.getStorage());
- reqVO.setCreateTime((new LocalDateTime[]{buildTime(2020, 1, 1),
- buildTime(2020, 1, 24)}));
+ // mock 数据
+ FileConfigDO dbFileConfig = randomFileConfigDO().setName("芋道源码")
+ .setStorage(FileStorageEnum.LOCAL.getStorage());
+ dbFileConfig.setCreateTime(LocalDateTimeUtil.parse("2020-01-23", DatePattern.NORM_DATE_PATTERN));// 等会查询到
+ fileConfigMapper.insert(dbFileConfig);
+ // 测试 name 不匹配
+ fileConfigMapper.insert(cloneIgnoreId(dbFileConfig, o -> o.setName("源码")));
+ // 测试 storage 不匹配
+ fileConfigMapper.insert(cloneIgnoreId(dbFileConfig, o -> o.setStorage(FileStorageEnum.DB.getStorage())));
+ // 测试 createTime 不匹配
+ fileConfigMapper.insert(cloneIgnoreId(dbFileConfig, o -> o.setCreateTime(LocalDateTimeUtil.parse("2020-11-23", DatePattern.NORM_DATE_PATTERN))));
+ // 准备参数
+ FileConfigPageReqVO reqVO = new FileConfigPageReqVO();
+ reqVO.setName("芋道");
+ reqVO.setStorage(FileStorageEnum.LOCAL.getStorage());
+ reqVO.setCreateTime((new LocalDateTime[]{buildTime(2020, 1, 1),
+ buildTime(2020, 1, 24)}));
- // 调用
- PageResult pageResult = fileConfigService.getFileConfigPage(reqVO);
- // 断言
- assertEquals(1, pageResult.getTotal());
- assertEquals(1, pageResult.getList().size());
- assertPojoEquals(dbFileConfig, pageResult.getList().get(0));
+ // 调用
+ PageResult pageResult = fileConfigService.getFileConfigPage(reqVO);
+ // 断言
+ assertEquals(1, pageResult.getTotal());
+ assertEquals(1, pageResult.getList().size());
+ assertPojoEquals(dbFileConfig, pageResult.getList().get(0));
}
@Test
@@ -242,6 +243,30 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest {
assertEquals("https://www.iocoder.cn", fileConfigService.testFileConfig(id));
}
+ @Test
+ public void testGetFileConfig() {
+ // mock 数据
+ FileConfigDO dbFileConfig = randomFileConfigDO().setMaster(false);
+ fileConfigMapper.insert(dbFileConfig);// @Sql: 先插入出一条存在的数据
+ // 准备参数
+ Long id = dbFileConfig.getId();
+
+ // 调用，并断言
+ assertPojoEquals(dbFileConfig, fileConfigService.getFileConfig(id));
+ }
+
+ @Test
+ public void testGetFileClient() {
+ // 准备参数
+ Long id = randomLongId();
+ // mock 获得 Client
+ FileClient fileClient = new LocalFileClient(id, new LocalFileClientConfig());
+ when(fileClientFactory.getFileClient(eq(id))).thenReturn(fileClient);
+
+ // 调用，并断言
+ assertSame(fileClient, fileConfigService.getFileClient(id));
+ }
+
private FileConfigDO randomFileConfigDO() {
return randomPojo(FileConfigDO.class).setStorage(randomEle(FileStorageEnum.values()).getStorage())
.setConfig(new EmptyFileClientConfig());
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java
similarity index 92%
rename from yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceTest.java
rename to yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java
index 1261d0a99..fe5f6fb1e 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceTest.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java
@@ -16,7 +16,7 @@ import org.springframework.context.annotation.Import;
import javax.annotation.Resource;
import java.time.LocalDateTime;
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_NOT_EXISTS;
@@ -25,7 +25,7 @@ import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.*;
@Import({FileServiceImpl.class})
-public class FileServiceTest extends BaseDbUnitTest {
+public class FileServiceImplTest extends BaseDbUnitTest {
@Resource
private FileService fileService;
@@ -42,7 +42,7 @@ public class FileServiceTest extends BaseDbUnitTest {
FileDO dbFile = randomPojo(FileDO.class, o -> { // 等会查询到
o.setPath("yunai");
o.setType("image/jpg");
- o.setCreateTime(buildLocalDateTime(2021, 1, 15));
+ o.setCreateTime(buildTime(2021, 1, 15));
});
fileMapper.insert(dbFile);
// 测试 path 不匹配
@@ -53,13 +53,13 @@ public class FileServiceTest extends BaseDbUnitTest {
}));
// 测试 createTime 不匹配
fileMapper.insert(ObjectUtils.cloneIgnoreId(dbFile, o -> {
- o.setCreateTime(buildLocalDateTime(2020, 1, 15));
+ o.setCreateTime(buildTime(2020, 1, 15));
}));
// 准备参数
FilePageReqVO reqVO = new FilePageReqVO();
reqVO.setPath("yunai");
reqVO.setType("jp");
- reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 1, 10), buildLocalDateTime(2021, 1, 20)}));
+ reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 1, 10), buildTime(2021, 1, 20)}));
// 调用
PageResult pageResult = fileService.getFilePage(reqVO);
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java
index cb1e52b23..8ff2dd9bf 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java
@@ -1,12 +1,9 @@
package cn.iocoder.yudao.module.infra.service.logger;
-import cn.hutool.core.util.RandomUtil;
import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO;
import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO;
import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO;
@@ -16,149 +13,121 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import;
import javax.annotation.Resource;
-import java.time.LocalDateTime;
import java.util.List;
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
@Import(ApiAccessLogServiceImpl.class)
public class ApiAccessLogServiceImplTest extends BaseDbUnitTest {
@Resource
- private ApiAccessLogService apiAccessLogService;
+ private ApiAccessLogServiceImpl apiAccessLogService;
@Resource
private ApiAccessLogMapper apiAccessLogMapper;
@Test
public void testGetApiAccessLogPage() {
- // 构造测试数据
- long userId = 2233L;
- int userType = UserTypeEnum.ADMIN.getValue();
- String applicationName = "yudao-test";
- String requestUrl = "foo";
- LocalDateTime beginTime = buildLocalDateTime(2021, 3, 13);
- int duration = 1000;
- int resultCode = GlobalErrorCodeConstants.SUCCESS.getCode();
-
- ApiAccessLogDO infApiAccessLogDO = RandomUtils.randomPojo(ApiAccessLogDO.class, dto -> {
- dto.setUserId(userId);
- dto.setUserType(userType);
- dto.setApplicationName(applicationName);
- dto.setRequestUrl(requestUrl);
- dto.setBeginTime(beginTime);
- dto.setDuration(duration);
- dto.setResultCode(resultCode);
+ ApiAccessLogDO apiAccessLogDO = randomPojo(ApiAccessLogDO.class, o -> {
+ o.setUserId(2233L);
+ o.setUserType(UserTypeEnum.ADMIN.getValue());
+ o.setApplicationName("yudao-test");
+ o.setRequestUrl("foo");
+ o.setBeginTime(buildTime(2021, 3, 13));
+ o.setDuration(1000);
+ o.setResultCode(GlobalErrorCodeConstants.SUCCESS.getCode());
});
- apiAccessLogMapper.insert(infApiAccessLogDO);
-
- // 下面几个都是不匹配的数据
- // userId 不同的
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setUserId(3344L)));
- // userType
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setUserType(UserTypeEnum.MEMBER.getValue())));
- // applicationName 不同的
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setApplicationName("test")));
- // requestUrl 不同的
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setRequestUrl("bar")));
- // 构造一个早期时间 2021-02-06 00:00:00
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setBeginTime(buildLocalDateTime(2021, 2, 6))));
- // duration 不同的
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setDuration(100)));
- // resultCode 不同的
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setResultCode(2)));
-
- // 构造调用参数
+ apiAccessLogMapper.insert(apiAccessLogDO);
+ // 测试 userId 不匹配
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setUserId(3344L)));
+ // 测试 userType 不匹配
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
+ // 测试 applicationName 不匹配
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setApplicationName("test")));
+ // 测试 requestUrl 不匹配
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setRequestUrl("bar")));
+ // 测试 beginTime 不匹配：构造一个早期时间 2021-02-06 00:00:00
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setBeginTime(buildTime(2021, 2, 6))));
+ // 测试 duration 不匹配
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setDuration(100)));
+ // 测试 resultCode 不匹配
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setResultCode(2)));
+ // 准备参数
ApiAccessLogPageReqVO reqVO = new ApiAccessLogPageReqVO();
- reqVO.setUserId(userId);
- reqVO.setUserType(userType);
- reqVO.setApplicationName(applicationName);
- reqVO.setRequestUrl(requestUrl);
- reqVO.setBeginTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 12),buildLocalDateTime(2021, 3, 14)}));
- reqVO.setDuration(duration);
- reqVO.setResultCode(resultCode);
+ reqVO.setUserId(2233L);
+ reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
+ reqVO.setApplicationName("yudao-test");
+ reqVO.setRequestUrl("foo");
+ reqVO.setBeginTime(buildBetweenTime(2021, 3, 13, 2021, 3, 13));
+ reqVO.setDuration(1000);
+ reqVO.setResultCode(GlobalErrorCodeConstants.SUCCESS.getCode());
- // 调用service方法
+ // 调用
PageResult pageResult = apiAccessLogService.getApiAccessLogPage(reqVO);
-
// 断言，只查到了一条符合条件的
assertEquals(1, pageResult.getTotal());
assertEquals(1, pageResult.getList().size());
- assertPojoEquals(infApiAccessLogDO, pageResult.getList().get(0));
+ assertPojoEquals(apiAccessLogDO, pageResult.getList().get(0));
}
@Test
public void testGetApiAccessLogList() {
- // 构造测试数据
- long userId = 2233L;
- int userType = UserTypeEnum.ADMIN.getValue();
- String applicationName = "yudao-test";
- String requestUrl = "foo";
- LocalDateTime beginTime = buildLocalDateTime(2021, 3, 13);
- int duration = 1000;
- int resultCode = GlobalErrorCodeConstants.SUCCESS.getCode();
-
- ApiAccessLogDO infApiAccessLogDO = RandomUtils.randomPojo(ApiAccessLogDO.class, dto -> {
- dto.setUserId(userId);
- dto.setUserType(userType);
- dto.setApplicationName(applicationName);
- dto.setRequestUrl(requestUrl);
- dto.setBeginTime(beginTime);
- dto.setDuration(duration);
- dto.setResultCode(resultCode);
+ ApiAccessLogDO apiAccessLogDO = randomPojo(ApiAccessLogDO.class, o -> {
+ o.setUserId(2233L);
+ o.setUserType(UserTypeEnum.ADMIN.getValue());
+ o.setApplicationName("yudao-test");
+ o.setRequestUrl("foo");
+ o.setBeginTime(buildTime(2021, 3, 13));
+ o.setDuration(1000);
+ o.setResultCode(GlobalErrorCodeConstants.SUCCESS.getCode());
});
- apiAccessLogMapper.insert(infApiAccessLogDO);
-
- // 下面几个都是不匹配的数据
- // userId 不同的
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setUserId(3344L)));
- // userType
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setUserType(UserTypeEnum.MEMBER.getValue())));
- // applicationName 不同的
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setApplicationName("test")));
- // requestUrl 不同的
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setRequestUrl("bar")));
- // 构造一个早期时间 2021-02-06 00:00:00
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setBeginTime(buildLocalDateTime(2021, 2, 6))));
- // duration 不同的
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setDuration(100)));
- // resultCode 不同的
- apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setResultCode(2)));
-
- // 构造调用参数
+ apiAccessLogMapper.insert(apiAccessLogDO);
+ // 测试 userId 不匹配
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setUserId(3344L)));
+ // 测试 userType 不匹配
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
+ // 测试 applicationName 不匹配
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setApplicationName("test")));
+ // 测试 requestUrl 不匹配
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setRequestUrl("bar")));
+ // 测试 beginTime 不匹配：构造一个早期时间 2021-02-06 00:00:00
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setBeginTime(buildTime(2021, 2, 6))));
+ // 测试 duration 不匹配
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setDuration(100)));
+ // 测试 resultCode 不匹配
+ apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setResultCode(2)));
+ // 准备参数
ApiAccessLogExportReqVO reqVO = new ApiAccessLogExportReqVO();
- reqVO.setUserId(userId);
- reqVO.setUserType(userType);
- reqVO.setApplicationName(applicationName);
- reqVO.setRequestUrl(requestUrl);
- reqVO.setBeginTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 12),buildLocalDateTime(2021, 3, 14)}));
- reqVO.setDuration(duration);
- reqVO.setResultCode(resultCode);
+ reqVO.setUserId(2233L);
+ reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
+ reqVO.setApplicationName("yudao-test");
+ reqVO.setRequestUrl("foo");
+ reqVO.setBeginTime(buildBetweenTime(2021, 3, 13, 2021, 3, 13));
+ reqVO.setDuration(1000);
+ reqVO.setResultCode(GlobalErrorCodeConstants.SUCCESS.getCode());
- // 调用service方法
+ // 调用
List list = apiAccessLogService.getApiAccessLogList(reqVO);
-
// 断言，只查到了一条符合条件的
assertEquals(1, list.size());
- assertPojoEquals(infApiAccessLogDO, list.get(0));
+ assertPojoEquals(apiAccessLogDO, list.get(0));
}
@Test
- public void testCreateApiAccessLogAsync() {
+ public void testCreateApiAccessLog() {
// 准备参数
- ApiAccessLogCreateReqDTO createDTO = RandomUtils.randomPojo(ApiAccessLogCreateReqDTO.class,
- dto -> dto.setUserType(RandomUtil.randomEle(UserTypeEnum.values()).getValue()));
+ ApiAccessLogCreateReqDTO createDTO = randomPojo(ApiAccessLogCreateReqDTO.class);
// 调用
apiAccessLogService.createApiAccessLog(createDTO);
// 断言
- ApiAccessLogDO infApiAccessLogDO = apiAccessLogMapper.selectOne(null);
- assertNotNull(infApiAccessLogDO);
- assertPojoEquals(createDTO, infApiAccessLogDO);
+ ApiAccessLogDO apiAccessLogDO = apiAccessLogMapper.selectOne(null);
+ assertPojoEquals(createDTO, apiAccessLogDO);
}
-
}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImplTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImplTest.java
index bffdf46e8..86e55f5d1 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImplTest.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImplTest.java
@@ -1,28 +1,28 @@
package cn.iocoder.yudao.module.infra.service.logger;
-import cn.hutool.core.util.RandomUtil;
import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO;
import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO;
import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO;
import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO;
import cn.iocoder.yudao.module.infra.dal.mysql.logger.ApiErrorLogMapper;
import cn.iocoder.yudao.module.infra.enums.logger.ApiErrorLogProcessStatusEnum;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import;
import javax.annotation.Resource;
-import java.time.LocalDateTime;
import java.util.List;
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
+import static cn.hutool.core.util.RandomUtil.randomEle;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.API_ERROR_LOG_NOT_FOUND;
import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.API_ERROR_LOG_PROCESSED;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,161 +35,150 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest {
private ApiErrorLogServiceImpl apiErrorLogService;
@Resource
- private ApiErrorLogMapper infApiErrorLogMapper;
+ private ApiErrorLogMapper apiErrorLogMapper;
@Test
public void testGetApiErrorLogPage() {
- // 构造测试数据
- long userId = 2233L;
- int userType = UserTypeEnum.ADMIN.getValue();
- String applicationName = "yudao-test";
- String requestUrl = "foo";
- LocalDateTime beginTime = buildLocalDateTime(2021, 3, 13);
- int progressStatus = ApiErrorLogProcessStatusEnum.INIT.getStatus();
-
- ApiErrorLogDO infApiErrorLogDO = RandomUtils.randomPojo(ApiErrorLogDO.class, logDO -> {
- logDO.setUserId(userId);
- logDO.setUserType(userType);
- logDO.setApplicationName(applicationName);
- logDO.setRequestUrl(requestUrl);
- logDO.setExceptionTime(beginTime);
- logDO.setProcessStatus(progressStatus);
+ // mock 数据
+ ApiErrorLogDO apiErrorLogDO = randomPojo(ApiErrorLogDO.class, o -> {
+ o.setUserId(2233L);
+ o.setUserType(UserTypeEnum.ADMIN.getValue());
+ o.setApplicationName("yudao-test");
+ o.setRequestUrl("foo");
+ o.setExceptionTime(buildTime(2021, 3, 13));
+ o.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
});
- infApiErrorLogMapper.insert(infApiErrorLogDO);
-
- // 下面几个都是不匹配的数据
- // userId 不同的
- infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setUserId(3344L)));
- // userType
- infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setUserType(UserTypeEnum.MEMBER.getValue())));
- // applicationName 不同的
- infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setApplicationName("test")));
- // requestUrl 不同的
- infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setRequestUrl("bar")));
- // 构造一个早期时间 2021-02-06 00:00:00
- infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setExceptionTime(buildLocalDateTime(2021, 2, 6))));
- // progressStatus 不同的
- infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus())));
-
- // 构造调用参数
+ apiErrorLogMapper.insert(apiErrorLogDO);
+ // 测试 userId 不匹配
+ apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, o -> o.setUserId(3344L)));
+ // 测试 userType 不匹配
+ apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setUserType(UserTypeEnum.MEMBER.getValue())));
+ // 测试 applicationName 不匹配
+ apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setApplicationName("test")));
+ // 测试 requestUrl 不匹配
+ apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setRequestUrl("bar")));
+ // 测试 exceptionTime 不匹配：构造一个早期时间 2021-02-06 00:00:00
+ apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setExceptionTime(buildTime(2021, 2, 6))));
+ // 测试 progressStatus 不匹配
+ apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus())));
+ // 准备参数
ApiErrorLogPageReqVO reqVO = new ApiErrorLogPageReqVO();
- reqVO.setUserId(userId);
- reqVO.setUserType(userType);
- reqVO.setApplicationName(applicationName);
- reqVO.setRequestUrl(requestUrl);
- reqVO.setExceptionTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 12),buildLocalDateTime(2021, 3, 14)}));
- reqVO.setProcessStatus(progressStatus);
+ reqVO.setUserId(2233L);
+ reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
+ reqVO.setApplicationName("yudao-test");
+ reqVO.setRequestUrl("foo");
+ reqVO.setExceptionTime(buildBetweenTime(2021, 3, 1, 2021, 3, 31));
+ reqVO.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
- // 调用service方法
+ // 调用
PageResult pageResult = apiErrorLogService.getApiErrorLogPage(reqVO);
-
// 断言，只查到了一条符合条件的
assertEquals(1, pageResult.getTotal());
assertEquals(1, pageResult.getList().size());
- assertPojoEquals(infApiErrorLogDO, pageResult.getList().get(0));
+ assertPojoEquals(apiErrorLogDO, pageResult.getList().get(0));
}
@Test
public void testGetApiErrorLogList() {
- // 构造测试数据
- long userId = 2233L;
- int userType = UserTypeEnum.ADMIN.getValue();
- String applicationName = "yudao-test";
- String requestUrl = "foo";
- LocalDateTime beginTime = buildLocalDateTime(2021, 3, 13);
- int progressStatus = ApiErrorLogProcessStatusEnum.INIT.getStatus();
-
- ApiErrorLogDO infApiErrorLogDO = RandomUtils.randomPojo(ApiErrorLogDO.class, logDO -> {
- logDO.setUserId(userId);
- logDO.setUserType(userType);
- logDO.setApplicationName(applicationName);
- logDO.setRequestUrl(requestUrl);
- logDO.setExceptionTime(beginTime);
- logDO.setProcessStatus(progressStatus);
+ // mock 数据
+ ApiErrorLogDO apiErrorLogDO = randomPojo(ApiErrorLogDO.class, o -> {
+ o.setUserId(2233L);
+ o.setUserType(UserTypeEnum.ADMIN.getValue());
+ o.setApplicationName("yudao-test");
+ o.setRequestUrl("foo");
+ o.setExceptionTime(buildTime(2021, 3, 13));
+ o.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
});
- infApiErrorLogMapper.insert(infApiErrorLogDO);
-
- // 下面几个都是不匹配的数据
- // userId 不同的
- infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setUserId(3344L)));
- // userType
- infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setUserType(UserTypeEnum.MEMBER.getValue())));
- // applicationName 不同的
- infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setApplicationName("test")));
- // requestUrl 不同的
- infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setRequestUrl("bar")));
- // 构造一个早期时间 2021-02-06 00:00:00
- infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setExceptionTime(buildLocalDateTime(2021, 2, 6))));
- // progressStatus 不同的
- infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus())));
-
- // 构造调用参数
+ apiErrorLogMapper.insert(apiErrorLogDO);
+ // 测试 userId 不匹配
+ apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, o -> o.setUserId(3344L)));
+ // 测试 userType 不匹配
+ apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setUserType(UserTypeEnum.MEMBER.getValue())));
+ // 测试 applicationName 不匹配
+ apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setApplicationName("test")));
+ // 测试 requestUrl 不匹配
+ apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setRequestUrl("bar")));
+ // 测试 exceptionTime 不匹配：构造一个早期时间 2021-02-06 00:00:00
+ apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setExceptionTime(buildTime(2021, 2, 6))));
+ // 测试 progressStatus 不匹配
+ apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus())));
+ // 准备参数
ApiErrorLogExportReqVO reqVO = new ApiErrorLogExportReqVO();
- reqVO.setUserId(userId);
- reqVO.setUserType(userType);
- reqVO.setApplicationName(applicationName);
- reqVO.setRequestUrl(requestUrl);
- reqVO.setExceptionTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 12),buildLocalDateTime(2021, 3, 14)}));
- reqVO.setProcessStatus(progressStatus);
+ reqVO.setUserId(2233L);
+ reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
+ reqVO.setApplicationName("yudao-test");
+ reqVO.setRequestUrl("foo");
+ reqVO.setExceptionTime(buildBetweenTime(2021, 3, 1, 2021, 3, 31));
+ reqVO.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
- // 调用service方法
+ // 调用
List list = apiErrorLogService.getApiErrorLogList(reqVO);
-
// 断言，只查到了一条符合条件的
assertEquals(1, list.size());
- assertPojoEquals(infApiErrorLogDO, list.get(0));
- }
-
-
- // TODO 芋艿：单元测试，可以拆小一点
- @Test
- public void testUpdateApiErrorLogProcess() {
- // 先构造两条数据，第一条用于抛出异常，第二条用于正常的执行update操作
- Long processUserId = 2233L;
-
- ApiErrorLogDO first = RandomUtils.randomPojo(ApiErrorLogDO.class, logDO -> {
- logDO.setProcessUserId(processUserId);
- logDO.setUserType(UserTypeEnum.ADMIN.getValue());
- logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus());
- });
- infApiErrorLogMapper.insert(first);
-
- ApiErrorLogDO second = RandomUtils.randomPojo(ApiErrorLogDO.class, logDO -> {
- logDO.setProcessUserId(1122L);
- logDO.setUserType(UserTypeEnum.ADMIN.getValue());
- logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
- });
- infApiErrorLogMapper.insert(second);
-
- Long firstId = first.getId();
- Long secondId = second.getId();
-
- // 执行正常的 update 操作
- apiErrorLogService.updateApiErrorLogProcess(secondId, ApiErrorLogProcessStatusEnum.DONE.getStatus(), processUserId);
- ApiErrorLogDO secondSelect = infApiErrorLogMapper.selectOne("id", secondId);
-
- // id 为 0 查询不到，应该抛出异常 API_ERROR_LOG_NOT_FOUND
- assertServiceException(() -> apiErrorLogService.updateApiErrorLogProcess(0L, ApiErrorLogProcessStatusEnum.DONE.getStatus(), processUserId), API_ERROR_LOG_NOT_FOUND);
- // id 为 first 的 progressStatus 为 DONE ，应该抛出 API_ERROR_LOG_PROCESSED
- assertServiceException(() -> apiErrorLogService.updateApiErrorLogProcess(firstId, ApiErrorLogProcessStatusEnum.DONE.getStatus(), processUserId), API_ERROR_LOG_PROCESSED);
- // 验证 progressStatus 是否修改成功
- Assertions.assertEquals(ApiErrorLogProcessStatusEnum.DONE.getStatus(), secondSelect.getProcessStatus());
- // 验证 progressUserId 是否修改成功
- Assertions.assertEquals(processUserId, secondSelect.getProcessUserId());
+ assertPojoEquals(apiErrorLogDO, list.get(0));
}
@Test
- public void testCreateApiErrorLogAsync() {
+ public void testCreateApiErrorLog() {
// 准备参数
- ApiErrorLogCreateReqDTO createDTO = RandomUtils.randomPojo(ApiErrorLogCreateReqDTO.class,
- dto -> dto.setUserType(RandomUtil.randomEle(UserTypeEnum.values()).getValue()));
+ ApiErrorLogCreateReqDTO createDTO = randomPojo(ApiErrorLogCreateReqDTO.class);
// 调用
apiErrorLogService.createApiErrorLog(createDTO);
// 断言
- ApiErrorLogDO infApiErrorLogDO = infApiErrorLogMapper.selectOne(null);
- assertNotNull(infApiErrorLogDO);
- assertPojoEquals(createDTO, infApiErrorLogDO);
+ ApiErrorLogDO apiErrorLogDO = apiErrorLogMapper.selectOne(null);
+ assertPojoEquals(createDTO, apiErrorLogDO);
+ assertEquals(ApiErrorLogProcessStatusEnum.INIT.getStatus(), apiErrorLogDO.getProcessStatus());
+ }
+
+ @Test
+ public void testUpdateApiErrorLogProcess_success() {
+ // 准备参数
+ ApiErrorLogDO apiErrorLogDO = randomPojo(ApiErrorLogDO.class,
+ o -> o.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus()));
+ apiErrorLogMapper.insert(apiErrorLogDO);
+ // 准备参数
+ Long id = apiErrorLogDO.getId();
+ Integer processStatus = randomEle(ApiErrorLogProcessStatusEnum.values()).getStatus();
+ Long processUserId = randomLongId();
+
+ // 调用
+ apiErrorLogService.updateApiErrorLogProcess(id, processStatus, processUserId);
+ // 断言
+ ApiErrorLogDO dbApiErrorLogDO = apiErrorLogMapper.selectById(apiErrorLogDO.getId());
+ assertEquals(processStatus, dbApiErrorLogDO.getProcessStatus());
+ assertEquals(processUserId, dbApiErrorLogDO.getProcessUserId());
+ assertNotNull(dbApiErrorLogDO.getProcessTime());
+ }
+
+ @Test
+ public void testUpdateApiErrorLogProcess_processed() {
+ // 准备参数
+ ApiErrorLogDO apiErrorLogDO = randomPojo(ApiErrorLogDO.class,
+ o -> o.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus()));
+ apiErrorLogMapper.insert(apiErrorLogDO);
+ // 准备参数
+ Long id = apiErrorLogDO.getId();
+ Integer processStatus = randomEle(ApiErrorLogProcessStatusEnum.values()).getStatus();
+ Long processUserId = randomLongId();
+
+ // 调用，并断言异常
+ assertServiceException(() ->
+ apiErrorLogService.updateApiErrorLogProcess(id, processStatus, processUserId),
+ API_ERROR_LOG_PROCESSED);
+ }
+
+ @Test
+ public void testUpdateApiErrorLogProcess_notFound() {
+ // 准备参数
+ Long id = randomLongId();
+ Integer processStatus = randomEle(ApiErrorLogProcessStatusEnum.values()).getStatus();
+ Long processUserId = randomLongId();
+
+ // 调用，并断言异常
+ assertServiceException(() ->
+ apiErrorLogService.updateApiErrorLogProcess(id, processStatus, processUserId),
+ API_ERROR_LOG_NOT_FOUND);
}
}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/sql/create_tables.sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/sql/create_tables.sql
index 5825e0fef..9d4e57e67 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/sql/create_tables.sql
@@ -1,9 +1,9 @@
CREATE TABLE IF NOT EXISTS "infra_config" (
- "id" bigint(20) NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+ "id" bigint(20) NOT NULL GENERATED BY DEFAULT AS IDENTITY COMMENT '编号',
"category" varchar(50) NOT NULL,
"type" tinyint NOT NULL,
- "name" varchar(100) NOT NULL DEFAULT '',
+ "name" varchar(100) NOT NULL DEFAULT '' COMMENT '名字',
"config_key" varchar(100) NOT NULL DEFAULT '',
"value" varchar(500) NOT NULL DEFAULT '',
"visible" bit NOT NULL,
diff --git a/yudao-module-report/pom.xml b/yudao-module-report/pom.xml
new file mode 100644
index 000000000..2c8aecedc
--- /dev/null
+++ b/yudao-module-report/pom.xml
@@ -0,0 +1,23 @@
+
+
+
+ cn.iocoder.cloud
+ yudao
+ ${revision}
+
+ 4.0.0
+
+ yudao-module-report-api
+ yudao-module-report-biz
+
+ yudao-module-report
+ pom
+
+ ${project.artifactId}
+
+ report 模块，主要实现数据可视化报表等功能。
+
+
+
diff --git a/yudao-module-report/yudao-module-report-api/pom.xml b/yudao-module-report/yudao-module-report-api/pom.xml
new file mode 100644
index 000000000..7d7135538
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-api/pom.xml
@@ -0,0 +1,26 @@
+
+
+
+ cn.iocoder.cloud
+ yudao-module-report
+ ${revision}
+
+ 4.0.0
+
+ yudao-module-report-api
+ jar
+
+ ${project.artifactId}
+
+ report 模块 API，暴露给其它模块调用
+
+
+
+
+ cn.iocoder.cloud
+ yudao-common
+
+
+
diff --git a/yudao-module-report/yudao-module-report-api/src/main/java/cn/iocoder/yudao/module/report/api/package-info.java b/yudao-module-report/yudao-module-report-api/src/main/java/cn/iocoder/yudao/module/report/api/package-info.java
new file mode 100644
index 000000000..827bef3fd
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-api/src/main/java/cn/iocoder/yudao/module/report/api/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 占位，避免 api 目录无文件时，git 无法提交
+ */
+package cn.iocoder.yudao.module.report.api;
diff --git a/yudao-module-report/yudao-module-report-api/src/main/java/cn/iocoder/yudao/module/report/enums/ErrorCodeConstants.java b/yudao-module-report/yudao-module-report-api/src/main/java/cn/iocoder/yudao/module/report/enums/ErrorCodeConstants.java
new file mode 100644
index 000000000..d90bed398
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-api/src/main/java/cn/iocoder/yudao/module/report/enums/ErrorCodeConstants.java
@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.report.enums;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+
+/**
+ * Report 错误码枚举类
+ *
+ * system 系统，使用 1-003-000-000 段
+ */
+public interface ErrorCodeConstants {
+
+ // ========== AUTH 模块 1003000000 ==========
+ ErrorCode GO_VIEW_PROJECT_NOT_EXISTS = new ErrorCode(1003000000, "GoView 项目不存在");
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/pom.xml b/yudao-module-report/yudao-module-report-biz/pom.xml
new file mode 100644
index 000000000..2b1349650
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/pom.xml
@@ -0,0 +1,135 @@
+
+
+
+ cn.iocoder.cloud
+ yudao-module-report
+ ${revision}
+
+ 4.0.0
+
+ yudao-module-report-biz
+ jar
+
+ ${project.artifactId}
+
+ report 模块，主要实现数据可视化报表等功能：
+ 1. 基于「积木报表」实现，打印设计、报表设计、图形设计、大屏设计等。
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-bootstrap
+
+
+
+
+ cn.iocoder.cloud
+ yudao-module-report-api
+ ${revision}
+
+
+
+ cn.iocoder.cloud
+ yudao-module-system-api
+ ${revision}
+
+
+ cn.iocoder.cloud
+ yudao-module-infra-api
+ ${revision}
+
+
+
+
+ cn.iocoder.cloud
+ yudao-spring-boot-starter-banner
+
+
+ cn.iocoder.cloud
+ yudao-spring-boot-starter-biz-operatelog
+
+
+ cn.iocoder.cloud
+ yudao-spring-boot-starter-biz-tenant
+
+
+ cn.iocoder.cloud
+ yudao-spring-boot-starter-biz-error-code
+
+
+
+
+ cn.iocoder.cloud
+ yudao-spring-boot-starter-security
+
+
+
+
+ cn.iocoder.cloud
+ yudao-spring-boot-starter-mybatis
+
+
+
+ cn.iocoder.cloud
+ yudao-spring-boot-starter-redis
+
+
+
+
+ cn.iocoder.cloud
+ yudao-spring-boot-starter-rpc
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ cn.iocoder.cloud
+ yudao-spring-boot-starter-test
+ test
+
+
+
+
+ cn.iocoder.cloud
+ yudao-spring-boot-starter-monitor
+
+
+
+
+ org.jeecgframework.jimureport
+ jimureport-spring-boot-starter
+
+
+
+ xerces
+ xercesImpl
+
+
+
+
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/ReportServerApplication.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/ReportServerApplication.java
new file mode 100644
index 000000000..759482a31
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/ReportServerApplication.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.report;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * 项目的启动类
+ *
+ * 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
+ * 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
+ * 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
+ *
+ * @author 芋道源码
+ */
+@SpringBootApplication
+public class ReportServerApplication {
+
+ public static void main(String[] args) {
+ // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
+ // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
+ // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
+
+ SpringApplication.run(ReportServerApplication.class, args);
+
+ // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
+ // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
+ // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
+ }
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ajreport/package-info.java
new file mode 100644
index 000000000..e32b8b916
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ajreport/package-info.java
@@ -0,0 +1 @@
+package cn.iocoder.yudao.module.report.controller.admin.ajreport;
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java
new file mode 100644
index 000000000..31805c1e2
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java
@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.report.controller.admin.goview;
+
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.RandomUtil;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.data.GoViewDataGetBySqlReqVO;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.data.GoViewDataRespVO;
+import cn.iocoder.yudao.module.report.service.goview.GoViewDataService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+//@Tag(name = "管理后台 - GoView 数据", description = "提供 SQL、HTTP 等数据查询的能力")
+@RestController
+@RequestMapping("/report/go-view/data")
+@Validated
+public class GoViewDataController {
+
+ @Resource
+ private GoViewDataService goViewDataService;
+
+ @RequestMapping("/get-by-sql")
+// @Operation(summary = "使用 SQL 查询数据")
+ @PreAuthorize("@ss.hasPermission('report:go-view-data:get-by-sql')")
+ @OperateLog(enable = false) // 不记录操作日志，因为不需要
+ public CommonResult getDataBySQL(@Valid @RequestBody GoViewDataGetBySqlReqVO reqVO) {
+ return success(goViewDataService.getDataBySQL(reqVO.getSql()));
+ }
+
+ @RequestMapping("/get-by-http")
+// @Operation(summary = "使用 HTTP 查询数据", description = "这个只是示例接口，实际应该每个查询，都要写一个接口")
+ @PreAuthorize("@ss.hasPermission('report:go-view-data:get-by-http')")
+ @OperateLog(enable = false) // 不记录操作日志，因为不需要
+ public CommonResult getDataByHttp(
+ @RequestParam(required = false) Map params,
+ @RequestBody(required = false) String body) { // params、body 按照需要去接收，这里仅仅是示例
+ GoViewDataRespVO respVO = new GoViewDataRespVO();
+ // 1. 数据维度
+ respVO.setDimensions(Arrays.asList("日期", "PV", "UV")); // PV 是每天访问次数；UV 是每天访问人数
+ // 2. 明细数据列表
+ // 目前通过随机的方式生成。一般来说，这里你可以写逻辑来实现数据的返回
+ respVO.setSource(new LinkedList<>());
+ for (int i = 1; i <= 12; i++) {
+ String date = "2021-" + (i < 10 ? "0" + i : i);
+ Integer pv = RandomUtil.randomInt(1000, 10000);
+ Integer uv = RandomUtil.randomInt(100, 1000);
+ respVO.getSource().add(MapUtil.builder().put("日期", date)
+ .put("PV", pv).put("UV", uv).build());
+ }
+ return success(respVO);
+ }
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewProjectController.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewProjectController.java
new file mode 100644
index 000000000..240be46c3
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewProjectController.java
@@ -0,0 +1,73 @@
+package cn.iocoder.yudao.module.report.controller.admin.goview;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectRespVO;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO;
+import cn.iocoder.yudao.module.report.convert.goview.GoViewProjectConvert;
+import cn.iocoder.yudao.module.report.dal.dataobject.goview.GoViewProjectDO;
+import cn.iocoder.yudao.module.report.service.goview.GoViewProjectService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+//@Tag(name = "管理后台 - GoView 项目")
+@RestController
+@RequestMapping("/report/go-view/project")
+@Validated
+public class GoViewProjectController {
+
+ @Resource
+ private GoViewProjectService goViewProjectService;
+
+ @PostMapping("/create")
+// @Operation(summary = "创建项目")
+ @PreAuthorize("@ss.hasPermission('report:go-view-project:create')")
+ public CommonResult createProject(@Valid @RequestBody GoViewProjectCreateReqVO createReqVO) {
+ return success(goViewProjectService.createProject(createReqVO));
+ }
+
+ @PutMapping("/update")
+// @Operation(summary = "更新项目")
+ @PreAuthorize("@ss.hasPermission('report:go-view-project:update')")
+ public CommonResult updateProject(@Valid @RequestBody GoViewProjectUpdateReqVO updateReqVO) {
+ goViewProjectService.updateProject(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+// @Operation(summary = "删除 GoView 项目")
+// @Parameter(name = "id", description = "编号", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('report:go-view-project:delete')")
+ public CommonResult deleteProject(@RequestParam("id") Long id) {
+ goViewProjectService.deleteProject(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+// @Operation(summary = "获得项目")
+// @Parameter(name = "id", description = "编号", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('report:go-view-project:query')")
+ public CommonResult getProject(@RequestParam("id") Long id) {
+ GoViewProjectDO project = goViewProjectService.getProject(id);
+ return success(GoViewProjectConvert.INSTANCE.convert(project));
+ }
+
+ @GetMapping("/my-page")
+// @Operation(summary = "获得我的项目分页")
+ @PreAuthorize("@ss.hasPermission('report:go-view-project:query')")
+ public CommonResult> getMyProjectPage(@Valid PageParam pageVO) {
+ PageResult pageResult = goViewProjectService.getMyProjectPage(
+ pageVO, getLoginUserId());
+ return success(GoViewProjectConvert.INSTANCE.convertPage(pageResult));
+ }
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java
new file mode 100644
index 000000000..ecd1fdcd7
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java
@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.report.controller.admin.goview.vo.data;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+//@Schema(description = "管理后台 - GoView 使用 SQL 查询数据 Request VO")
+@Data
+public class GoViewDataGetBySqlReqVO {
+
+// @Schema(description = "SQL 语句", required = true, example = "SELECT * FROM user")
+ @NotEmpty(message = "SQL 语句不能为空")
+ private String sql;
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java
new file mode 100644
index 000000000..25e4112e5
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.report.controller.admin.goview.vo.data;
+
+//import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+//@Schema(description = "管理后台 - GoView 数据 Response VO")
+@Data
+public class GoViewDataRespVO {
+
+// @Schema(description = "数据维度", required = true, example = "['product', 'data1', 'data2']")
+ private List dimensions;
+
+// @Schema(description = "数据明细列表", required = true)
+ private List> source;
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java
new file mode 100644
index 000000000..c9fe3e0cc
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java
@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.report.controller.admin.goview.vo.project;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+//@Schema(description = "管理后台 - GoView 项目创建 Request VO")
+@Data
+public class GoViewProjectCreateReqVO {
+
+// @Schema(description = "项目名称", required = true, example = "王五")
+ @NotEmpty(message = "项目名称不能为空")
+ private String name;
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java
new file mode 100644
index 000000000..73f823733
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.report.controller.admin.goview.vo.project;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+//@Schema(description = "管理后台 - GoView 项目 Response VO")
+@Data
+public class GoViewProjectRespVO {
+
+// @Schema(description = "编号", required = true, example = "18993")
+ private Long id;
+
+// @Schema(description = "项目名称", required = true, example = "王五")
+ private String name;
+
+// @Schema(description = "发布状态", required = true, example = "1")
+ private Integer status;
+
+// @Schema(description = "报表内容") // JSON 格式
+ private String content;
+
+// @Schema(description = "预览图片 URL", example = "https://www.iocoder.cn")
+ private String picUrl;
+
+// @Schema(description = "项目备注", example = "你猜")
+ private String remark;
+
+// @Schema(description = "创建人编号", required = true, example = "1024")
+ private String creator;
+
+// @Schema(description = "创建时间", required = true)
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java
new file mode 100644
index 000000000..97801fe8d
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.report.controller.admin.goview.vo.project;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+//@Schema(description = "管理后台 - GoView 项目更新 Request VO")
+@Data
+public class GoViewProjectUpdateReqVO {
+
+// @Schema(description = "编号", required = true, example = "18993")
+ @NotNull(message = "编号不能为空")
+ private Long id;
+
+// @Schema(description = "项目名称", required = true, example = "王五")
+ private String name;
+
+// @Schema(description = "发布状态", required = true, example = "1")
+ @InEnum(value = CommonStatusEnum.class, message = "发布状态必须是 {value}")
+ private Integer status;
+
+// @Schema(description = "报表内容") // JSON 格式
+ private String content;
+
+// @Schema(description = "预览图片 URL", example = "https://www.iocoder.cn")
+ private String picUrl;
+
+// @Schema(description = "项目备注", example = "你猜")
+ private String remark;
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/package-info.java
new file mode 100644
index 000000000..ccbf9bb19
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * 提供 RESTful API 给前端：
+ * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目
+ * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分
+ */
+package cn.iocoder.yudao.module.report.controller;
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/ajreport/package-info.java
new file mode 100644
index 000000000..72860791f
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/ajreport/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * TODO 占位，后续删除
+ */
+package cn.iocoder.yudao.module.report.convert.ajreport;
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvert.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvert.java
new file mode 100644
index 000000000..9c993a19c
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvert.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.report.convert.goview;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectRespVO;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO;
+import cn.iocoder.yudao.module.report.dal.dataobject.goview.GoViewProjectDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface GoViewProjectConvert {
+
+ GoViewProjectConvert INSTANCE = Mappers.getMapper(GoViewProjectConvert.class);
+
+ GoViewProjectDO convert(GoViewProjectCreateReqVO bean);
+
+ GoViewProjectDO convert(GoViewProjectUpdateReqVO bean);
+
+ GoViewProjectRespVO convert(GoViewProjectDO bean);
+
+ PageResult convertPage(PageResult page);
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/ajreport/package-info.java
new file mode 100644
index 000000000..922ec6fd4
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/ajreport/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * TODO 芋艿：占位，待删除
+ */
+package cn.iocoder.yudao.module.report.dal.dataobject.ajreport;
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/goview/GoViewProjectDO.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/goview/GoViewProjectDO.java
new file mode 100644
index 000000000..38730d29e
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/goview/GoViewProjectDO.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.report.dal.dataobject.goview;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * GoView 项目表
+ *
+ * 每个大屏图标，对应一个项目
+ *
+ * @author 芋道源码
+ */
+@TableName(value = "report_go_view_project", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users
+@KeySequence("report_go_view_project_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class GoViewProjectDO extends BaseDO {
+
+ /**
+ * 编号，数据库自增
+ */
+ @TableId
+ private Long id;
+ /**
+ * 项目名称
+ */
+ private String name;
+ /**
+ * 预览图片 URL
+ */
+ private String picUrl;
+ /**
+ * 报表内容
+ *
+ * JSON 配置，使用字符串存储
+ */
+ private String content;
+ /**
+ * 发布状态
+ *
+ * 0 - 已发布
+ * 1 - 未发布
+ *
+ * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum}
+ */
+ private Integer status;
+ /**
+ * 项目备注
+ */
+ private String remark;
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/ajreport/package-info.java
new file mode 100644
index 000000000..0fb86173d
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/ajreport/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * TODO 芋艿：占位，待删除
+ */
+package cn.iocoder.yudao.module.report.dal.mysql.ajreport;
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/goview/GoViewProjectMapper.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/goview/GoViewProjectMapper.java
new file mode 100644
index 000000000..af1ca6345
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/goview/GoViewProjectMapper.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.report.dal.mysql.goview;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.report.dal.dataobject.goview.GoViewProjectDO;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface GoViewProjectMapper extends BaseMapperX {
+
+ default PageResult selectPage(PageParam reqVO, Long userId) {
+ return selectPage(reqVO, new LambdaQueryWrapperX()
+ .eq(GoViewProjectDO::getCreator, userId)
+ .orderByDesc(GoViewProjectDO::getId));
+ }
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java
new file mode 100644
index 000000000..3c99b2858
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.report.framework.jmreport.config;
+
+import cn.iocoder.yudao.framework.security.config.SecurityProperties;
+import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi;
+import cn.iocoder.yudao.module.report.framework.jmreport.core.service.JmReportTokenServiceImpl;
+import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 积木报表的配置类
+ *
+ * @author 芋道源码
+ */
+@Configuration(proxyBeanMethods = false)
+@ComponentScan(basePackages = "org.jeecg.modules.jmreport") // 扫描积木报表的包
+public class JmReportConfiguration {
+
+ @Bean
+ @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
+ public JmReportTokenServiceI jmReportTokenService(OAuth2TokenApi oAuth2TokenApi, SecurityProperties securityProperties) {
+ return new JmReportTokenServiceImpl(oAuth2TokenApi, securityProperties);
+ }
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
new file mode 100644
index 000000000..cdc23c9e4
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
@@ -0,0 +1,131 @@
+package cn.iocoder.yudao.module.report.framework.jmreport.core.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
+import cn.iocoder.yudao.framework.security.config.SecurityProperties;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
+import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
+import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi;
+import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO;
+import lombok.RequiredArgsConstructor;
+import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
+import org.springframework.http.HttpHeaders;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
+
+/**
+ * {@link JmReportTokenServiceI} 实现类，提供积木报表的 Token 校验、用户信息的查询等功能
+ *
+ * @author 随心
+ */
+@RequiredArgsConstructor
+public class JmReportTokenServiceImpl implements JmReportTokenServiceI {
+
+ /**
+ * 积木 token head 头
+ */
+ private static final String JM_TOKEN_HEADER = "X-Access-Token";
+ /**
+ * auth 相关格式
+ */
+ private static final String AUTHORIZATION_FORMAT = SecurityFrameworkUtils.AUTHORIZATION_BEARER + " %s";
+
+ private final OAuth2TokenApi oauth2TokenApi;
+
+ private final SecurityProperties securityProperties;
+
+ /**
+ * 自定义 API 数据集appian自定义 Header，解决 Token 传递。
+ * 参考 api数据集token机制详解 文档
+ *
+ * @return 新 head
+ */
+ @Override
+ public HttpHeaders customApiHeader() {
+ // 读取积木标标系统的 token
+ HttpServletRequest request = ServletUtils.getRequest();
+ String token = request.getHeader(JM_TOKEN_HEADER);
+
+ // 设置到 yudao 系统的 token
+ HttpHeaders headers = new HttpHeaders();
+ headers.add(securityProperties.getTokenHeader(), String.format(AUTHORIZATION_FORMAT, token));
+ return headers;
+ }
+
+ /**
+ * 校验 Token 是否有效，即验证通过
+ *
+ * @param token JmReport 前端传递的 token
+ * @return 是否认证通过
+ */
+ @Override
+ public Boolean verifyToken(String token) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ if (!Objects.isNull(userId)) {
+ return true;
+ }
+ return buildLoginUserByToken(token) != null;
+ }
+
+ /**
+ * 获得用户编号
+ *
+ * 虽然方法名获得的是 username，实际对应到项目中是用户编号
+ *
+ * @param token JmReport 前端传递的 token
+ * @return 用户编号
+ */
+ @Override
+ public String getUsername(String token) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ if (ObjectUtil.isNotNull(userId)) {
+ return String.valueOf(userId);
+ }
+ LoginUser user = buildLoginUserByToken(token);
+ return user == null ? null : String.valueOf(user.getId());
+ }
+
+ /**
+ * 基于 token 构建登录用户
+ *
+ * @param token token
+ * @return 返回 token 对应的用户信息
+ */
+ private LoginUser buildLoginUserByToken(String token) {
+ if (StrUtil.isEmpty(token)) {
+ return null;
+ }
+ // TODO 如下的实现不算特别优雅，主要咱是不想搞的太复杂，所以参考对应的 Filter 先实现了
+
+ // ① 参考 TokenAuthenticationFilter 的认证逻辑（Security 的上下文清理，交给 Spring Security 完成）
+ // 目的：实现基于 JmReport 前端传递的 token，实现认证
+ TenantContextHolder.setIgnore(true); // 忽略租户，保证可查询到 token 信息
+ LoginUser user = null;
+ try {
+ OAuth2AccessTokenCheckRespDTO accessToken = oauth2TokenApi.checkAccessToken(token).getCheckedData();
+ if (accessToken == null) {
+ return null;
+ }
+ user = new LoginUser().setId(accessToken.getUserId()).setUserType(accessToken.getUserType())
+ .setTenantId(accessToken.getTenantId()).setScopes(accessToken.getScopes());
+ } catch (ServiceException ignored) {
+ // do nothing：如果报错，说明认证失败，则返回 false 即可
+ }
+ if (user == null) {
+ return null;
+ }
+ SecurityFrameworkUtils.setLoginUser(user, WebFrameworkUtils.getRequest());
+
+ // ② 参考 TenantContextWebFilter 实现（Tenant 的上下文清理，交给 TenantContextWebFilter 完成）
+ // 目的：基于 LoginUser 获得到的租户编号，设置到 Tenant 上下文，避免查询数据库时的报错
+ TenantContextHolder.setIgnore(false);
+ TenantContextHolder.setTenantId(user.getTenantId());
+ return user;
+ }
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/web/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/web/package-info.java
new file mode 100644
index 000000000..e082e3bdc
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/web/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 占位，后续会基于 Filter 实现积木报表的认证等功能，替代 {@link cn.iocoder.yudao.module.report.framework.jmreport.core.service.JmReportTokenServiceImpl}
+ */
+package cn.iocoder.yudao.module.report.framework.jmreport.core.web;
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/package-info.java
new file mode 100644
index 000000000..c2163d8cd
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * 属于 report 模块的 framework 封装
+ *
+ * @author 芋道源码
+ */
+package cn.iocoder.yudao.module.report.framework;
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
new file mode 100644
index 000000000..e481133b8
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.report.framework.security.config;
+
+import cn.iocoder.yudao.framework.security.config.AuthorizeRequestsCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
+
+/**
+ * Report 模块的 Security 配置
+ */
+@Configuration("reportSecurityConfiguration")
+public class SecurityConfiguration {
+
+ @Bean("reportAuthorizeRequestsCustomizer")
+ public AuthorizeRequestsCustomizer authorizeRequestsCustomizer() {
+ return new AuthorizeRequestsCustomizer() {
+
+ @Override
+ public void customize(ExpressionUrlAuthorizationConfigurer.ExpressionInterceptUrlRegistry registry) {
+ // Swagger 接口文档
+ registry.antMatchers("/swagger-ui.html").anonymous()
+ .antMatchers("/swagger-resources/**").anonymous()
+ .antMatchers("/webjars/**").anonymous()
+ .antMatchers("/*/api-docs").anonymous();
+ // Spring Boot Actuator 的安全配置
+ registry.antMatchers("/actuator").anonymous()
+ .antMatchers("/actuator/**").anonymous();
+ // Druid 监控
+ registry.antMatchers("/druid/**").anonymous();
+ // 积木报表
+ registry.antMatchers("/jmreport/**").permitAll();
+ }
+
+ };
+ }
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/core/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/core/package-info.java
new file mode 100644
index 000000000..61083268f
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/core/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 占位
+ */
+package cn.iocoder.yudao.module.report.framework.security.core;
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/package-info.java
new file mode 100644
index 000000000..a4e2e8bf1
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * ureport2：https://github.com/youseries/ureport
+ *
+ * ureport2 和 jimurepot 是相同类型的产品，不过停更了，最好发布时间是 2018 年。
+ * 它们之间的功能对比，可见 https://juejin.cn/post/6939836480269320200 地址
+ */
+package cn.iocoder.yudao.module.report.framework.ureport;
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/package-info.java
new file mode 100644
index 000000000..3306c0ebb
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/package-info.java
@@ -0,0 +1,9 @@
+/**
+ * report 模块，主要实现数据可视化报表等功能：
+ * 1. 基于「积木报表」实现，打印设计、报表设计、图形设计、大屏设计等。URL 前缀是 /jmreport，表名前缀是 jimu_
+ *
+ * 由于「积木报表」的大屏设计器需要收费，后续会自研，对应的是：
+ * 1. Controller URL：以 /report/ 开头，避免和其它 Module 冲突
+ * 2. DataObject 表名：以 report_ 开头，方便在数据库中区分
+ */
+package cn.iocoder.yudao.module.report;
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ajreport/package-info.java
new file mode 100644
index 000000000..2512e50ed
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ajreport/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * TODO 芋艿：占位，待删除
+ */
+package cn.iocoder.yudao.module.report.service.ajreport;
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataService.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataService.java
new file mode 100644
index 000000000..b912373b1
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataService.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.report.service.goview;
+
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.data.GoViewDataRespVO;
+
+/**
+ * GoView 数据 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface GoViewDataService {
+
+ /**
+ * 使用 SQL 查询数据
+ *
+ * @param sql SQL 语句
+ * @return 数据
+ */
+ GoViewDataRespVO getDataBySQL(String sql);
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImpl.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImpl.java
new file mode 100644
index 000000000..8938d3e74
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImpl.java
@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.report.service.goview;
+
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.data.GoViewDataRespVO;
+import com.google.common.collect.Maps;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.rowset.SqlRowSet;
+import org.springframework.jdbc.support.rowset.SqlRowSetMetaData;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.Map;
+
+/**
+ * GoView 数据 Service 实现类
+ *
+ * 补充说明：
+ * 1. 目前默认使用 jdbcTemplate 查询项目配置的数据源。如果你想查询其它数据源，可以新建对应数据源的 jdbcTemplate 来实现。
+ * 2. 默认数据源是 MySQL 关系数据源，可能数据量比较大的情况下，会比较慢，可以考虑后续使用 Click House 等等。
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class GoViewDataServiceImpl implements GoViewDataService {
+
+ @Resource
+ private JdbcTemplate jdbcTemplate;
+
+ @Override
+ public GoViewDataRespVO getDataBySQL(String sql) {
+ // 1. 执行查询
+ SqlRowSet sqlRowSet = jdbcTemplate.queryForRowSet(sql);
+
+ // 2. 构建返回结果
+ GoViewDataRespVO respVO = new GoViewDataRespVO();
+ // 2.1 解析元数据
+ SqlRowSetMetaData metaData = sqlRowSet.getMetaData();
+ String[] columnNames = metaData.getColumnNames();
+ respVO.setDimensions(Arrays.asList(columnNames));
+ // 2.2 解析数据明细
+ respVO.setSource(new LinkedList<>()); // 由于数据量不确认，使用 LinkedList 虽然内存占用大一点，但是不存在扩容复制的问题
+ while (sqlRowSet.next()) {
+ Map data = Maps.newHashMapWithExpectedSize(columnNames.length);
+ for (String columnName : columnNames) {
+ data.put(columnName, sqlRowSet.getObject(columnName));
+ }
+ respVO.getSource().add(data);
+ }
+ return respVO;
+ }
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectService.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectService.java
new file mode 100644
index 000000000..b171c5905
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectService.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.report.service.goview;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO;
+import cn.iocoder.yudao.module.report.dal.dataobject.goview.GoViewProjectDO;
+
+import javax.validation.Valid;
+
+/**
+ * GoView 项目 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface GoViewProjectService {
+
+ /**
+ * 创建项目
+ *
+ * @param createReqVO 创建信息
+ * @return 编号
+ */
+ Long createProject(@Valid GoViewProjectCreateReqVO createReqVO);
+
+ /**
+ * 更新项目
+ *
+ * @param updateReqVO 更新信息
+ */
+ void updateProject(@Valid GoViewProjectUpdateReqVO updateReqVO);
+
+ /**
+ * 删除项目
+ *
+ * @param id 编号
+ */
+ void deleteProject(Long id);
+
+ /**
+ * 获得项目
+ *
+ * @param id 编号
+ * @return 项目
+ */
+ GoViewProjectDO getProject(Long id);
+
+ /**
+ * 获得我的项目分页
+ *
+ * @param pageReqVO 分页查询
+ * @param userId 用户编号
+ * @return GoView 项目分页
+ */
+ PageResult getMyProjectPage(PageParam pageReqVO, Long userId);
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImpl.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImpl.java
new file mode 100644
index 000000000..2b05052f7
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImpl.java
@@ -0,0 +1,74 @@
+package cn.iocoder.yudao.module.report.service.goview;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO;
+import cn.iocoder.yudao.module.report.convert.goview.GoViewProjectConvert;
+import cn.iocoder.yudao.module.report.dal.dataobject.goview.GoViewProjectDO;
+import cn.iocoder.yudao.module.report.dal.mysql.goview.GoViewProjectMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.report.enums.ErrorCodeConstants.GO_VIEW_PROJECT_NOT_EXISTS;
+
+/**
+ * GoView 项目 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class GoViewProjectServiceImpl implements GoViewProjectService {
+
+ @Resource
+ private GoViewProjectMapper goViewProjectMapper;
+
+ @Override
+ public Long createProject(GoViewProjectCreateReqVO createReqVO) {
+ // 插入
+ GoViewProjectDO goViewProject = GoViewProjectConvert.INSTANCE.convert(createReqVO)
+ .setStatus(CommonStatusEnum.DISABLE.getStatus());
+ goViewProjectMapper.insert(goViewProject);
+ // 返回
+ return goViewProject.getId();
+ }
+
+ @Override
+ public void updateProject(GoViewProjectUpdateReqVO updateReqVO) {
+ // 校验存在
+ validateProjectExists(updateReqVO.getId());
+ // 更新
+ GoViewProjectDO updateObj = GoViewProjectConvert.INSTANCE.convert(updateReqVO);
+ goViewProjectMapper.updateById(updateObj);
+ }
+
+ @Override
+ public void deleteProject(Long id) {
+ // 校验存在
+ validateProjectExists(id);
+ // 删除
+ goViewProjectMapper.deleteById(id);
+ }
+
+ private void validateProjectExists(Long id) {
+ if (goViewProjectMapper.selectById(id) == null) {
+ throw exception(GO_VIEW_PROJECT_NOT_EXISTS);
+ }
+ }
+
+ @Override
+ public GoViewProjectDO getProject(Long id) {
+ return goViewProjectMapper.selectById(id);
+ }
+
+ @Override
+ public PageResult getMyProjectPage(PageParam pageReqVO, Long userId) {
+ return goViewProjectMapper.selectPage(pageReqVO, userId);
+ }
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/application-dev.yaml b/yudao-module-report/yudao-module-report-biz/src/main/resources/application-dev.yaml
new file mode 100644
index 000000000..5ed5d4db2
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/resources/application-dev.yaml
@@ -0,0 +1,101 @@
+--- #################### 数据库相关配置 ####################
+spring:
+ # 数据源配置项
+ autoconfigure:
+ exclude:
+ - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源
+ datasource:
+ druid: # Druid 【监控】相关的全局配置
+ web-stat-filter:
+ enabled: true
+ stat-view-servlet:
+ enabled: true
+ allow: # 设置白名单，不填则允许所有访问
+ url-pattern: /druid/*
+ login-username: # 控制台管理用户名和密码
+ login-password:
+ filter:
+ stat:
+ enabled: true
+ log-slow-sql: true # 慢 SQL 记录
+ slow-sql-millis: 100
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
+ dynamic: # 多数据源配置
+ druid: # Druid 【连接池】相关的全局配置
+ initial-size: 5 # 初始连接数
+ min-idle: 10 # 最小连接池数量
+ max-active: 20 # 最大连接池数量
+ max-wait: 600000 # 配置获取连接等待超时的时间，单位：毫秒
+ time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位：毫秒
+ min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间，单位：毫秒
+ max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间，单位：毫秒
+ validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效
+ test-while-idle: true
+ test-on-borrow: false
+ test-on-return: false
+ primary: master
+ datasource:
+ master:
+ name: ruoyi-vue-pro
+ url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: 3WLiVUBEwTbvAfsh
+ slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
+ name: ruoyi-vue-pro
+ url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: 3WLiVUBEwTbvAfsh
+
+ # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
+ redis:
+ host: 400-infra.server.iocoder.cn # 地址
+ port: 6379 # 端口
+ database: 1 # 数据库索引
+# password: 123456 # 密码，建议生产环境开启
+
+--- #################### MQ 消息队列相关配置 ####################
+
+--- #################### 定时任务相关配置 ####################
+
+--- #################### 服务保障相关配置 ####################
+
+# Lock4j 配置项
+lock4j:
+ acquire-timeout: 3000 # 获取分布式锁超时时间，默认为 3000 毫秒
+ expire: 30000 # 分布式锁的超时时间，默认为 30 毫秒
+
+--- #################### 监控相关配置 ####################
+
+# Actuator 监控端点的配置项
+management:
+ endpoints:
+ web:
+ base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator
+ exposure:
+ include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
+
+# Spring Boot Admin 配置项
+spring:
+ boot:
+ admin:
+ # Spring Boot Admin Client 客户端的相关配置
+ client:
+ url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
+ instance:
+ service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
+
+--- #################### 芋道相关配置 ####################
+
+# 芋道配置项，设置当前项目所有自定义的配置
+yudao:
+ xss:
+ enable: false
+ exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系
+ - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
+ - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
+ demo: true # 开启演示模式
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/application-local.yaml b/yudao-module-report/yudao-module-report-biz/src/main/resources/application-local.yaml
new file mode 100644
index 000000000..f2759d1fe
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/resources/application-local.yaml
@@ -0,0 +1,126 @@
+--- #################### 数据库相关配置 ####################
+spring:
+
+ # 数据源配置项
+ autoconfigure:
+ exclude:
+ - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源
+ datasource:
+ druid: # Druid 【监控】相关的全局配置
+ web-stat-filter:
+ enabled: true
+ stat-view-servlet:
+ enabled: true
+ allow: # 设置白名单，不填则允许所有访问
+ url-pattern: /druid/*
+ login-username: # 控制台管理用户名和密码
+ login-password:
+ filter:
+ stat:
+ enabled: true
+ log-slow-sql: true # 慢 SQL 记录
+ slow-sql-millis: 100
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
+ dynamic: # 多数据源配置
+ druid: # Druid 【连接池】相关的全局配置
+ initial-size: 5 # 初始连接数
+ min-idle: 10 # 最小连接池数量
+ max-active: 20 # 最大连接池数量
+ max-wait: 600000 # 配置获取连接等待超时的时间，单位：毫秒
+ time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位：毫秒
+ min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间，单位：毫秒
+ max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间，单位：毫秒
+ validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效
+ test-while-idle: true
+ test-on-borrow: false
+ test-on-return: false
+ primary: master
+ datasource:
+ master:
+ name: ruoyi-vue-pro
+ url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+ # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
+ # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
+ # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
+ # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
+ username: root
+ password: 123456
+ # username: sa
+ # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
+ slave: # 模拟从库，可根据自己需要修改
+ name: ruoyi-vue-pro
+ url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+ # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
+ # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
+ # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
+ # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例
+ username: root
+ password: 123456
+ # username: sa
+ # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
+
+ # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
+ redis:
+ host: 127.0.0.1 # 地址
+ port: 6379 # 端口
+ database: 0 # 数据库索引
+# password: 123456 # 密码，建议生产环境开启
+
+--- #################### MQ 消息队列相关配置 ####################
+
+--- #################### 定时任务相关配置 ####################
+
+--- #################### 服务保障相关配置 ####################
+
+# Lock4j 配置项
+lock4j:
+ acquire-timeout: 3000 # 获取分布式锁超时时间，默认为 3000 毫秒
+ expire: 30000 # 分布式锁的超时时间，默认为 30 毫秒
+
+--- #################### 监控相关配置 ####################
+
+# Actuator 监控端点的配置项
+management:
+ endpoints:
+ web:
+ base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator
+ exposure:
+ include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
+
+# Spring Boot Admin 配置项
+spring:
+ boot:
+ admin:
+ # Spring Boot Admin Client 客户端的相关配置
+ client:
+ url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
+ instance:
+ service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
+
+# 日志文件配置
+logging:
+ level:
+ # 配置自己写的 MyBatis Mapper 打印日志
+ cn.iocoder.yudao.module.report.dal.mysql: debug
+
+--- #################### 芋道相关配置 ####################
+
+# 芋道配置项，设置当前项目所有自定义的配置
+yudao:
+ env: # 多环境的配置项
+ tag: ${HOSTNAME}
+ security:
+ mock-enable: true
+ xss:
+ enable: false
+ exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系
+ - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
+ - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
+ access-log: # 访问日志的配置项
+ enable: false
+ error-code: # 错误码相关配置项
+ enable: false
+ demo: false # 关闭演示模式
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/application.yaml b/yudao-module-report/yudao-module-report-biz/src/main/resources/application.yaml
new file mode 100644
index 000000000..ff1e97b31
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/resources/application.yaml
@@ -0,0 +1,83 @@
+spring:
+ main:
+ allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
+ allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务
+
+ # Servlet 配置
+ servlet:
+ # 文件上传相关配置项
+ multipart:
+ max-file-size: 16MB # 单个文件大小
+ max-request-size: 32MB # 设置总上传的文件大小
+ mvc:
+ pathmatch:
+ matching-strategy: ANT_PATH_MATCHER # 解决 SpringFox 与 SpringBoot 2.6.x 不兼容的问题，参见 SpringFoxHandlerProviderBeanPostProcessor 类
+
+ # Jackson 配置项
+ jackson:
+ serialization:
+ write-dates-as-timestamps: true # 设置 LocalDateTime 的格式，使用时间戳
+ write-date-timestamps-as-nanoseconds: false # 设置不使用 nanoseconds 的格式。例如说 1611460870.401，而是直接 1611460870401
+ write-durations-as-timestamps: true # 设置 Duration 的格式，使用时间戳
+ fail-on-empty-beans: false # 允许序列化无属性的 Bean
+
+ # Cache 配置项
+ cache:
+ type: REDIS
+ redis:
+ time-to-live: 1h # 设置过期时间为 1 小时
+
+# MyBatis Plus 的配置项
+mybatis-plus:
+ configuration:
+ map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
+ global-config:
+ db-config:
+ # 重要说明：如果将配置放到 Nacos 时，请注意将 id-type 设置为对应 DB 的类型，否则会报错；详细见 https://gitee.com/zhijiantianya/yudao-cloud/issues/I5W2N0 讨论
+ id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。
+# id-type: AUTO # 自增 ID，适合 MySQL 等直接自增的数据库
+# id-type: INPUT # 用户输入 ID，适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库
+# id-type: ASSIGN_ID # 分配 ID，默认使用雪花算法。注意，Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时，需要去除实体类上的 @KeySequence 注解
+ logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+ logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+ type-aliases-package: ${yudao.info.base-package}.dal.dataobject
+ encryptor:
+ password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成
+
+--- #################### RPC 远程调用相关配置 ####################
+dubbo:
+ scan:
+ base-packages: ${yudao.info.base-package}.api # 指定 Dubbo 服务实现类的扫描基准包
+ protocol:
+ name: dubbo # 协议名称
+ port: -1 # 协议端口，-1 表示自增端口，从 20880 开始
+ registry:
+ address: spring-cloud://localhost # 设置使用 Spring Cloud 注册中心
+ application:
+ id: report-server # TODO 一定要写么？
+
+--- #################### MQ 消息队列相关配置 ####################
+
+--- #################### 定时任务相关配置 ####################
+
+--- #################### 芋道相关配置 ####################
+
+yudao:
+ info:
+ version: 1.0.0
+ base-package: cn.iocoder.yudao.module.report
+ web:
+ admin-ui:
+ url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址
+ swagger:
+ title: 管理后台
+ description: 提供管理员管理的所有功能
+ version: ${yudao.info.version}
+ base-package: ${yudao.info.base-package}
+ error-code: # 错误码相关配置项
+ constants-class-list:
+ - cn.iocoder.yudao.module.report.enums.ErrorCodeConstants
+ tenant: # 多租户相关配置项
+ enable: true
+
+debug: false
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/bootstrap-local.yaml b/yudao-module-report/yudao-module-report-biz/src/main/resources/bootstrap-local.yaml
new file mode 100644
index 000000000..37204cde8
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/resources/bootstrap-local.yaml
@@ -0,0 +1,23 @@
+--- #################### 注册中心相关配置 ####################
+
+spring:
+ cloud:
+ nacos:
+ server-addr: 127.0.0.1:8848
+ discovery:
+ namespace: dev # 命名空间。这里使用 dev 开发环境
+ metadata:
+ version: 1.0.0 # 服务实例的版本号，可用于灰度发布
+
+--- #################### 配置中心相关配置 ####################
+
+spring:
+ cloud:
+ nacos:
+ # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类
+ config:
+ server-addr: 127.0.0.1:8848 # Nacos 服务器地址
+ namespace: dev # 命名空间。这里使用 dev 开发环境
+ group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
+ name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name
+ file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/bootstrap.yaml b/yudao-module-report/yudao-module-report-biz/src/main/resources/bootstrap.yaml
new file mode 100644
index 000000000..caf41b17b
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/resources/bootstrap.yaml
@@ -0,0 +1,14 @@
+spring:
+ application:
+ name: report-server
+
+ profiles:
+ active: local
+
+server:
+ port: 48084
+
+# 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件
+logging:
+ file:
+ name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径
diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/logback-spring.xml b/yudao-module-report/yudao-module-report-biz/src/main/resources/logback-spring.xml
new file mode 100644
index 000000000..5f4b30d04
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/main/resources/logback-spring.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${PATTERN_DEFAULT}
+
+
+
+
+
+
+
+
+
+ ${PATTERN_DEFAULT}
+
+
+
+ ${LOG_FILE}
+
+
+ ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
+
+ ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
+
+ ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
+
+ ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
+
+ ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+
+
+
+
+
+ 0
+
+ 256
+
+
+
+
+
+
+
+ ${PATTERN_DEFAULT}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java b/yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java
new file mode 100644
index 000000000..87b78b8b8
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java
@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.report.service.goview;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.data.GoViewDataRespVO;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Import;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.rowset.SqlRowSet;
+import org.springframework.jdbc.support.rowset.SqlRowSetMetaData;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@Import(GoViewDataServiceImpl.class)
+public class GoViewDataServiceImplTest extends BaseDbUnitTest {
+
+ @Resource
+ private GoViewDataServiceImpl goViewDataService;
+
+ @MockBean
+ private JdbcTemplate jdbcTemplate;
+
+ @Test
+ public void testGetDataBySQL() {
+ // 准备参数
+ String sql = "SELECT id, name FROM system_users";
+ // mock 方法
+ SqlRowSet sqlRowSet = mock(SqlRowSet.class);
+ when(jdbcTemplate.queryForRowSet(eq(sql))).thenReturn(sqlRowSet);
+ // mock 元数据
+ SqlRowSetMetaData metaData = mock(SqlRowSetMetaData.class);
+ when(sqlRowSet.getMetaData()).thenReturn(metaData);
+ when(metaData.getColumnNames()).thenReturn(new String[]{"id", "name"});
+ // mock 数据明细
+ when(sqlRowSet.next()).thenReturn(true).thenReturn(true).thenReturn(false);
+ when(sqlRowSet.getObject("id")).thenReturn(1L).thenReturn(2L);
+ when(sqlRowSet.getObject("name")).thenReturn("芋道源码").thenReturn("芋道");
+
+ // 调用
+ GoViewDataRespVO dataBySQL = goViewDataService.getDataBySQL(sql);
+ // 断言
+ assertEquals(Arrays.asList("id", "name"), dataBySQL.getDimensions());
+ assertEquals(2, dataBySQL.getDimensions().size());
+ assertEquals(2, dataBySQL.getSource().get(0).size());
+ assertEquals(1L, dataBySQL.getSource().get(0).get("id"));
+ assertEquals("芋道源码", dataBySQL.getSource().get(0).get("name"));
+ assertEquals(2, dataBySQL.getSource().get(1).size());
+ assertEquals(2L, dataBySQL.getSource().get(1).get("id"));
+ assertEquals("芋道", dataBySQL.getSource().get(1).get("name"));
+ }
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImplTest.java b/yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImplTest.java
new file mode 100644
index 000000000..2f6bfae7b
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImplTest.java
@@ -0,0 +1,135 @@
+package cn.iocoder.yudao.module.report.service.goview;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO;
+import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO;
+import cn.iocoder.yudao.module.report.dal.dataobject.goview.GoViewProjectDO;
+import cn.iocoder.yudao.module.report.dal.mysql.goview.GoViewProjectMapper;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static cn.iocoder.yudao.module.report.enums.ErrorCodeConstants.GO_VIEW_PROJECT_NOT_EXISTS;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * {@link GoViewProjectServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(GoViewProjectServiceImpl.class)
+public class GoViewProjectServiceImplTest extends BaseDbUnitTest {
+
+ @Resource
+ private GoViewProjectServiceImpl goViewProjectService;
+
+ @Resource
+ private GoViewProjectMapper goViewProjectMapper;
+
+ @Test
+ public void testCreateProject_success() {
+ // 准备参数
+ GoViewProjectCreateReqVO reqVO = randomPojo(GoViewProjectCreateReqVO.class);
+
+ // 调用
+ Long goViewProjectId = goViewProjectService.createProject(reqVO);
+ // 断言
+ assertNotNull(goViewProjectId);
+ // 校验记录的属性是否正确
+ GoViewProjectDO goViewProject = goViewProjectMapper.selectById(goViewProjectId);
+ assertPojoEquals(reqVO, goViewProject);
+ }
+
+ @Test
+ public void testUpdateProject_success() {
+ // mock 数据
+ GoViewProjectDO dbGoViewProject = randomPojo(GoViewProjectDO.class);
+ goViewProjectMapper.insert(dbGoViewProject);// @Sql: 先插入出一条存在的数据
+ // 准备参数
+ GoViewProjectUpdateReqVO reqVO = randomPojo(GoViewProjectUpdateReqVO.class, o -> {
+ o.setId(dbGoViewProject.getId()); // 设置更新的 ID
+ o.setStatus(randomCommonStatus());
+ });
+
+ // 调用
+ goViewProjectService.updateProject(reqVO);
+ // 校验是否更新正确
+ GoViewProjectDO goViewProject = goViewProjectMapper.selectById(reqVO.getId()); // 获取最新的
+ assertPojoEquals(reqVO, goViewProject);
+ }
+
+ @Test
+ public void testUpdateProject_notExists() {
+ // 准备参数
+ GoViewProjectUpdateReqVO reqVO = randomPojo(GoViewProjectUpdateReqVO.class);
+
+ // 调用, 并断言异常
+ assertServiceException(() -> goViewProjectService.updateProject(reqVO), GO_VIEW_PROJECT_NOT_EXISTS);
+ }
+
+ @Test
+ public void testDeleteProject_success() {
+ // mock 数据
+ GoViewProjectDO dbGoViewProject = randomPojo(GoViewProjectDO.class);
+ goViewProjectMapper.insert(dbGoViewProject);// @Sql: 先插入出一条存在的数据
+ // 准备参数
+ Long id = dbGoViewProject.getId();
+
+ // 调用
+ goViewProjectService.deleteProject(id);
+ // 校验数据不存在了
+ assertNull(goViewProjectMapper.selectById(id));
+ }
+
+ @Test
+ public void testDeleteProject_notExists() {
+ // 准备参数
+ Long id = randomLongId();
+
+ // 调用, 并断言异常
+ assertServiceException(() -> goViewProjectService.deleteProject(id), GO_VIEW_PROJECT_NOT_EXISTS);
+ }
+
+ @Test
+ public void testGetProject() {
+ // mock 数据
+ GoViewProjectDO dbGoViewProject = randomPojo(GoViewProjectDO.class);
+ goViewProjectMapper.insert(dbGoViewProject);// @Sql: 先插入出一条存在的数据
+ // 准备参数
+ Long id = dbGoViewProject.getId();
+
+ // 调用
+ GoViewProjectDO goViewProject = goViewProjectService.getProject(id);
+ // 断言
+ assertPojoEquals(dbGoViewProject, goViewProject);
+ }
+
+ @Test
+ public void testGetMyGoViewProjectPage() {
+ // mock 数据
+ GoViewProjectDO dbGoViewProject = randomPojo(GoViewProjectDO.class, o -> { // 等会查询到
+ o.setCreator("1");
+ });
+ goViewProjectMapper.insert(dbGoViewProject);
+ // 测试 userId 不匹配
+ goViewProjectMapper.insert(cloneIgnoreId(dbGoViewProject, o -> o.setCreator("2")));
+ // 准备参数
+ PageParam reqVO = new PageParam();
+ Long userId = 1L;
+
+ // 调用
+ PageResult pageResult = goViewProjectService.getMyProjectPage(reqVO, userId);
+ // 断言
+ assertEquals(1, pageResult.getTotal());
+ assertEquals(1, pageResult.getList().size());
+ assertPojoEquals(dbGoViewProject, pageResult.getList().get(0));
+ }
+
+}
diff --git a/yudao-module-report/yudao-module-report-biz/src/test/resources/application-unit-test.yaml b/yudao-module-report/yudao-module-report-biz/src/test/resources/application-unit-test.yaml
new file mode 100644
index 000000000..93e037aab
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/test/resources/application-unit-test.yaml
@@ -0,0 +1,53 @@
+spring:
+ main:
+ lazy-initialization: true # 开启懒加载，加快速度
+ banner-mode: off # 单元测试，禁用 Banner
+
+--- #################### 数据库相关配置 ####################
+
+spring:
+ # 数据源配置项
+ datasource:
+ name: ruoyi-vue-pro
+ url: jdbc:h2:mem:testdb;MODE=MYSQL;DATABASE_TO_UPPER=false;NON_KEYWORDS=value; # MODE 使用 MySQL 模式；DATABASE_TO_UPPER 配置表和字段使用小写
+ driver-class-name: org.h2.Driver
+ username: sa
+ password:
+ druid:
+ async-init: true # 单元测试，异步初始化 Druid 连接池，提升启动速度
+ initial-size: 1 # 单元测试，配置为 1，提升启动速度
+ sql:
+ init:
+ schema-locations: classpath:/sql/create_tables.sql
+
+ # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
+ redis:
+ host: 127.0.0.1 # 地址
+ port: 16379 # 端口（单元测试，使用 16379 端口）
+ database: 0 # 数据库索引
+
+mybatis-plus:
+ lazy-initialization: true # 单元测试，设置 MyBatis Mapper 延迟加载，加速每个单元测试
+ type-aliases-package: ${yudao.info.base-package}.module.*.dal.dataobject
+ global-config:
+ db-config:
+ id-type: AUTO # H2 主键递增
+
+--- #################### 定时任务相关配置 ####################
+
+--- #################### 配置中心相关配置 ####################
+
+--- #################### 服务保障相关配置 ####################
+
+# Lock4j 配置项（单元测试，禁用 Lock4j）
+
+# Resilience4j 配置项
+
+--- #################### 监控相关配置 ####################
+
+--- #################### 芋道相关配置 ####################
+
+# 芋道配置项，设置当前项目所有自定义的配置
+yudao:
+ info:
+ base-package: cn.iocoder.yudao
diff --git a/yudao-module-report/yudao-module-report-biz/src/test/resources/logback.xml b/yudao-module-report/yudao-module-report-biz/src/test/resources/logback.xml
new file mode 100644
index 000000000..daf756bff
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/test/resources/logback.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/yudao-module-report/yudao-module-report-biz/src/test/resources/sql/clean.sql b/yudao-module-report/yudao-module-report-biz/src/test/resources/sql/clean.sql
new file mode 100644
index 000000000..4a0268afc
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/test/resources/sql/clean.sql
@@ -0,0 +1 @@
+DELETE FROM "report_go_view_project";
diff --git a/yudao-module-report/yudao-module-report-biz/src/test/resources/sql/create_tables.sql b/yudao-module-report/yudao-module-report-biz/src/test/resources/sql/create_tables.sql
new file mode 100644
index 000000000..a77397fea
--- /dev/null
+++ b/yudao-module-report/yudao-module-report-biz/src/test/resources/sql/create_tables.sql
@@ -0,0 +1,14 @@
+CREATE TABLE IF NOT EXISTS "report_go_view_project" (
+ "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+ "name" varchar NOT NULL,
+ "pic_url" varchar,
+ "content" varchar,
+ "status" varchar NOT NULL,
+ "remark" varchar,
+ "creator" varchar DEFAULT '',
+ "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ "updater" varchar DEFAULT '',
+ "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ "deleted" bit NOT NULL DEFAULT FALSE,
+ PRIMARY KEY ("id")
+) COMMENT 'GoView 项目表';
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java
index b52346a77..b9e417541 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java
@@ -30,12 +30,12 @@ public interface DeptApi {
@GetMapping(PREFIX + "/list")
@ApiOperation("获得部门信息数组")
@ApiImplicitParam(name = "ids", value = "部门编号数组", example = "1,2", required = true, allowMultiple = true)
- CommonResult> getDepts(@RequestParam("ids") Collection ids);
+ CommonResult> getDeptList(@RequestParam("ids") Collection ids);
@GetMapping(PREFIX + "/valid")
@ApiOperation("校验部门是否合法")
@ApiImplicitParam(name = "ids", value = "部门编号数组", example = "1,2", required = true, allowMultiple = true)
- CommonResult validDepts(@RequestParam("ids") Collection ids);
+ CommonResult validateDeptList(@RequestParam("ids") Collection ids);
/**
* 获得指定编号的部门 Map
@@ -44,7 +44,7 @@ public interface DeptApi {
* @return 部门 Map
*/
default Map getDeptMap(Set ids) {
- return CollectionUtils.convertMap(getDepts(ids).getCheckedData(), DeptRespDTO::getId);
+ return CollectionUtils.convertMap(getDeptList(ids).getCheckedData(), DeptRespDTO::getId);
}
}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApi.java
index 18a65f945..1cd8fc71c 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApi.java
@@ -20,6 +20,6 @@ public interface PostApi {
@GetMapping(PREFIX + "/valid")
@ApiOperation("校验岗位是否合法")
@ApiImplicitParam(name = "ids", value = "岗位编号数组", example = "1,2", required = true, allowMultiple = true)
- CommonResult validPosts(@RequestParam("ids") Collection ids);
+ CommonResult validPostList(@RequestParam("ids") Collection ids);
}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java
index 13834f926..0b53c3137 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java
@@ -25,8 +25,8 @@ public interface DictDataApi {
@ApiImplicitParam(name = "dictType", value = "字典类型", example = "SEX", required = true, dataTypeClass = String.class),
@ApiImplicitParam(name = "values", value = "字典数据值的数组", example = "1,2", required = true, allowMultiple = true)
})
- CommonResult validDictDatas(@RequestParam("dictType") String dictType,
- @RequestParam("values") Collection values);
+ CommonResult validateDictDatas(@RequestParam("dictType") String dictType,
+ @RequestParam("values") Collection values);
@GetMapping(PREFIX + "/get")
@ApiOperation("获得指定的字典数据")
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java
index 88e55ded0..0abc37a24 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java
@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import javax.validation.Valid;
import java.time.LocalDateTime;
-import java.util.Date;
import java.util.List;
@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
@@ -27,7 +26,7 @@ public interface ErrorCodeApi {
@PostMapping(PREFIX + "/auto-generate")
@ApiOperation("自动创建错误码")
- CommonResult autoGenerateErrorCodes(@Valid @RequestBody List autoGenerateDTOs);
+ CommonResult autoGenerateErrorCodeList(@Valid @RequestBody List autoGenerateDTOs);
@GetMapping(PREFIX + "/list")
@ApiOperation(value = "增量获得错误码数组", notes = "如果 minUpdateTime 为空时，则获取所有错误码")
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java
new file mode 100644
index 000000000..ded07635a
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.system.api.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.system.api.mail.dto.MailSendSingleToUserReqDTO;
+import cn.iocoder.yudao.module.system.enums.ApiConstants;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import javax.validation.Valid;
+
+@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
+@Api(tags = "RPC 服务 - 邮件发送")
+public interface MailSendApi {
+
+ String PREFIX = ApiConstants.PREFIX + "/mail/send";
+
+ @PostMapping(PREFIX + "/send-single-admin")
+ @ApiOperation(value = "发送单条邮件给 Admin 用户", notes = "在 mail 为空时，使用 userId 加载对应 Admin 的邮箱")
+ CommonResult sendSingleMailToAdmin(@Valid MailSendSingleToUserReqDTO reqDTO);
+
+ @PostMapping(PREFIX + "/send-single-member")
+ @ApiOperation(value = "发送单条邮件给 Member 用户", notes = "在 mail 为空时，使用 userId 加载对应 Member 的邮箱")
+ CommonResult sendSingleMailToMember(@Valid MailSendSingleToUserReqDTO reqDTO);
+
+}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
new file mode 100644
index 000000000..57c07cef4
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.system.api.mail.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotNull;
+import java.util.Map;
+
+@ApiModel("RPC 服务 - 邮件发送给 Admin 或者 Member 用户 Request DTO")
+@Data
+public class MailSendSingleToUserReqDTO {
+
+ @ApiModelProperty(value = "用户编号", example = "1024")
+ private Long userId;
+ @ApiModelProperty(value = "手机号", required = true, example = "15601691300")
+ @Email
+ private String mail;
+
+ @ApiModelProperty(value = "邮件模板编号", required = true, example = "USER_SEND")
+ @NotNull(message = "邮件模板编号不能为空")
+ private String templateCode;
+ @ApiModelProperty(value = "邮件模板参数")
+ private Map templateParams;
+
+}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java
new file mode 100644
index 000000000..781a792ad
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.system.api.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
+import cn.iocoder.yudao.module.system.enums.ApiConstants;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import javax.validation.Valid;
+
+@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
+@Api(tags = "RPC 服务 - 站内信发送")
+public interface NotifyMessageSendApi {
+
+ String PREFIX = ApiConstants.PREFIX + "/notify/send";
+
+ @PostMapping(PREFIX + "/send-single-admin")
+ @ApiOperation(value = "发送单条站内信给 Admin 用户")
+ CommonResult sendSingleMessageToAdmin(@Valid NotifySendSingleToUserReqDTO reqDTO);
+
+ @PostMapping(PREFIX + "/send-single-member")
+ @ApiOperation(value = "发送单条站内信给 Member 用户")
+ CommonResult sendSingleMessageToMember(@Valid NotifySendSingleToUserReqDTO reqDTO);
+
+}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java
new file mode 100644
index 000000000..124b9c74a
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.system.api.notify.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Map;
+
+@ApiModel("RPC 服务 - 站内信发送给 Admin 或者 Member 用户 Request DTO")
+@Data
+public class NotifySendSingleToUserReqDTO {
+
+ @ApiModelProperty(value = "用户编号", required = true, example = "1024")
+ @NotNull(message = "用户编号不能为空")
+ private Long userId;
+
+ @ApiModelProperty(value = "站内信模板编号", required = true, example = "USER_SEND")
+ @NotEmpty(message = "站内信模板编号不能为空")
+ private String templateCode;
+ @ApiModelProperty(value = "邮件模板参数")
+ private Map templateParams;
+}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/RoleApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/RoleApi.java
index bbc74fe53..84a5b1966 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/RoleApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/RoleApi.java
@@ -20,6 +20,6 @@ public interface RoleApi {
@GetMapping(PREFIX + "/valid")
@ApiOperation("校验角色是否合法")
@ApiImplicitParam(name = "ids", value = "角色编号数组", example = "1,2", required = true, allowMultiple = true)
- CommonResult validRoles(@RequestParam("ids") Collection ids);
+ CommonResult validRoleList(@RequestParam("ids") Collection ids);
}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApi.java
index 381450e66..ca4830ecf 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApi.java
@@ -1,7 +1,7 @@
package cn.iocoder.yudao.module.system.api.sms;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeCheckReqDTO;
+import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeValidateReqDTO;
import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO;
import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
import cn.iocoder.yudao.module.system.enums.ApiConstants;
@@ -29,8 +29,8 @@ public interface SmsCodeApi {
@ApiOperation("验证短信验证码，并进行使用")
CommonResult useSmsCode(@Valid @RequestBody SmsCodeUseReqDTO reqDTO);
- @GetMapping(PREFIX + "/check")
+ @GetMapping(PREFIX + "/validate")
@ApiOperation("检查验证码是否有效")
- CommonResult checkSmsCode(@Valid @RequestBody SmsCodeCheckReqDTO reqDTO);
+ CommonResult validateSmsCode(@Valid @RequestBody SmsCodeValidateReqDTO reqDTO);
}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeCheckReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java
similarity index 96%
rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeCheckReqDTO.java
rename to yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java
index 99107492e..c96d3fa83 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeCheckReqDTO.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java
@@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull;
@ApiModel("RPC 服务 - 短信验证码的校验 Request DTO")
@Data
-public class SmsCodeCheckReqDTO {
+public class SmsCodeValidateReqDTO {
@ApiModelProperty(value = "手机号", required = true, example = "15601691300")
@Mobile
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
index 31d6f5b90..683e1f633 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
@@ -18,7 +18,8 @@ public class SmsSendSingleToUserReqDTO {
@ApiModelProperty(value = "手机号", required = true, example = "15601691300")
@Mobile
private String mobile;
- @ApiModelProperty(value = "用户编号", required = true, example = "USER_SEND")
+
+ @ApiModelProperty(value = "短信模板编号", required = true, example = "USER_SEND")
@NotEmpty(message = "短信模板编号不能为空")
private String templateCode;
@ApiModelProperty(value = "短信模板参数")
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
index c096ed51c..f5e0b5ef2 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
@@ -19,7 +19,7 @@ public interface SocialUserApi {
String PREFIX = ApiConstants.PREFIX + "/social-user";
- @GetMapping("/get-authorize-url")
+ @GetMapping(PREFIX + "/get-authorize-url")
@ApiOperation("获得社交平台的授权 URL")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "社交平台的类型", example = "1", required = true, dataTypeClass = Integer.class),
@@ -28,15 +28,15 @@ public interface SocialUserApi {
CommonResult getAuthorizeUrl(@RequestParam("type") Integer type,
@RequestParam("redirectUri") String redirectUri);
- @PostMapping("/bind")
+ @PostMapping(PREFIX + "/bind")
@ApiOperation("绑定社交用户")
CommonResult bindSocialUser(@Valid @RequestBody SocialUserBindReqDTO reqDTO);
- @DeleteMapping("/unbind")
+ @DeleteMapping(PREFIX + "/unbind")
@ApiOperation("取消绑定社交用户")
CommonResult unbindSocialUser(@Valid @RequestBody SocialUserUnbindReqDTO reqDTO);
- @GetMapping("/get-bind-user-id")
+ @GetMapping(PREFIX + "/get-bind-user-id")
@ApiOperation("获得社交用户的绑定用户编号")
@ApiImplicitParams({
@ApiImplicitParam(name = "userType", value = "用户类型", example = "2", required = true, dataTypeClass = Integer.class),
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java
index ef3166650..f5371432a 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java
@@ -19,7 +19,7 @@ public interface TenantApi {
@GetMapping(PREFIX + "/id-list")
@ApiOperation("获得所有租户编号")
- CommonResult> getTenantIds();
+ CommonResult> getTenantIdList();
@GetMapping(PREFIX + "/valid")
@ApiOperation("校验租户是否合法")
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
index 86fe82c7e..721c309a4 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
@@ -30,17 +30,17 @@ public interface AdminUserApi {
@GetMapping(PREFIX + "/list")
@ApiOperation("通过用户 ID 查询用户们")
@ApiImplicitParam(name = "ids", value = "部门编号数组", example = "1,2", required = true, allowMultiple = true)
- CommonResult> getUsers(@RequestParam("ids") Collection ids);
+ CommonResult> getUserList(@RequestParam("ids") Collection ids);
@GetMapping(PREFIX + "/list-by-dept-id")
@ApiOperation("获得指定部门的用户数组")
@ApiImplicitParam(name = "deptIds", value = "部门编号数组", example = "1,2", required = true, allowMultiple = true)
- CommonResult> getUsersByDeptIds(@RequestParam("deptIds") Collection deptIds);
+ CommonResult> getUserListByDeptIds(@RequestParam("deptIds") Collection deptIds);
@GetMapping(PREFIX + "/list-by-post-id")
@ApiOperation("获得指定岗位的用户数组")
@ApiImplicitParam(name = "postIds", value = "岗位编号数组", example = "2,3", required = true, allowMultiple = true)
- CommonResult> getUsersByPostIds(@RequestParam("postIds") Collection postIds);
+ CommonResult> getUserListByPostIds(@RequestParam("postIds") Collection postIds);
/**
* 获得用户 Map
@@ -49,12 +49,12 @@ public interface AdminUserApi {
* @return 用户 Map
*/
default Map getUserMap(Collection ids) {
- return CollectionUtils.convertMap(getUsers(ids).getCheckedData(), AdminUserRespDTO::getId);
+ return CollectionUtils.convertMap(getUserList(ids).getCheckedData(), AdminUserRespDTO::getId);
}
@GetMapping(PREFIX + "/valid")
@ApiOperation("校验用户们是否有效")
@ApiImplicitParam(name = "ids", value = "用户编号数组", example = "3,5", required = true)
- CommonResult validUsers(@RequestParam("ids") Set ids);
+ CommonResult validUserList(@RequestParam("ids") Set ids);
}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index e5e416d0e..8a54ba92e 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -50,7 +50,7 @@ public interface ErrorCodeConstants {
ErrorCode DEPT_EXITS_CHILDREN = new ErrorCode(1002004003, "存在子部门，无法删除");
ErrorCode DEPT_PARENT_ERROR = new ErrorCode(1002004004, "不能设置自己为父部门");
ErrorCode DEPT_EXISTS_USER = new ErrorCode(1002004005, "部门中存在员工，无法删除");
- ErrorCode DEPT_NOT_ENABLE = new ErrorCode(1002004006, "部门不处于开启状态，不允许选择");
+ ErrorCode DEPT_NOT_ENABLE = new ErrorCode(1002004006, "部门({})不处于开启状态，不允许选择");
ErrorCode DEPT_PARENT_IS_CHILD = new ErrorCode(1002004007, "不能设置自己的子部门为父部门");
// ========== 岗位模块 1002005000 ==========
@@ -141,4 +141,25 @@ public interface ErrorCodeConstants {
ErrorCode OAUTH2_CODE_NOT_EXISTS = new ErrorCode(1002022000, "code 不存在");
ErrorCode OAUTH2_CODE_EXPIRE = new ErrorCode(1002022001, "code 已过期");
+ // ========== 邮箱账号 1002023000 ==========
+ ErrorCode MAIL_ACCOUNT_NOT_EXISTS = new ErrorCode(1002023000, "邮箱账号不存在");
+ ErrorCode MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS = new ErrorCode(1002023001, "无法删除，该邮箱账号还有邮件模板");
+
+ // ========== 邮件模版 1002024000 ==========
+ ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002024000, "邮件模版不存在");
+ ErrorCode MAIL_TEMPLATE_CODE_EXISTS = new ErrorCode(1002024001, "邮件模版 code({}) 已存在");
+
+ // ========== 邮件发送 1002025000 ==========
+ ErrorCode MAIL_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002025000, "模板参数({})缺失");
+ ErrorCode MAIL_SEND_MAIL_NOT_EXISTS = new ErrorCode(1002025000, "邮箱不存在");
+
+ // ========== 站内信模版 1002026000 ==========
+ ErrorCode NOTIFY_TEMPLATE_NOT_EXISTS = new ErrorCode(1002026000, "站内信模版不存在");
+ ErrorCode NOTIFY_TEMPLATE_CODE_DUPLICATE = new ErrorCode(1002026001, "已经存在编码为【{}】的站内信模板");
+
+ // ========== 站内信模版 1002027000 ==========
+
+ // ========== 站内信发送 1002028000 ==========
+ ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002025000, "模板参数({})缺失");
+
}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java
new file mode 100644
index 000000000..7cb16edef
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.system.enums.mail;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 邮件的发送状态枚举
+ *
+ * @author wangjingyi
+ * @since 2022/4/10 13:39
+ */
+@Getter
+@AllArgsConstructor
+public enum MailSendStatusEnum {
+
+ INIT(0), // 初始化
+ SUCCESS(10), // 发送成功
+ FAILURE(20), // 发送失败
+ IGNORE(30), // 忽略，即不发送
+ ;
+
+ private final int status;
+
+}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/MenuIdEnum.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/MenuIdEnum.java
deleted file mode 100644
index fc2b72ac4..000000000
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/MenuIdEnum.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.system.enums.permission;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * Menu 编号枚举
- */
-@Getter
-@AllArgsConstructor
-public enum MenuIdEnum {
-
- /**
- * 根节点
- */
- ROOT(0L);
-
- private final Long id;
-
-}
diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml
index d6f977809..dd80676e4 100644
--- a/yudao-module-system/yudao-module-system-biz/pom.xml
+++ b/yudao-module-system/yudao-module-system-biz/pom.xml
@@ -150,6 +150,11 @@
yudao-spring-boot-starter-captcha