aiotagro/aiotagro-mini
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug
Some checks failed
aagro-ui-admin CI / build (14.x) (push) Has been cancelled
Details
aagro-ui-admin CI / build (16.x) (push) Has been cancelled
Details
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
ylweng
2025-10-06 15:21:03 +08:00
parent f8f3cc8277
commit faad389e82
1682 changed files with 8962 additions and 48880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
aagro-module-infra/pom.xml
View File

@@ -3,9 +3,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>cn.aagro.gg</groupId>
<artifactId>aiot</artifactId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aiotagro</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>aagro-module-infra</artifactId>
@@ -21,24 +22,24 @@
<dependencies>
<!-- 业务组件 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-biz-tenant</artifactId>
</dependency>
<!-- Web 相关 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-websocket</artifactId>
</dependency>
<!-- DB 相关 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-mybatis</artifactId>
</dependency>
<dependency>
@@ -47,7 +48,7 @@
</dependency>
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-redis</artifactId>
</dependency>
@@ -55,19 +56,21 @@
<!-- Job 定时任务相关 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-job</artifactId>
</dependency>
<!-- 消息队列相关 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-mq</artifactId>
</dependency>
<!-- Test 测试相关 -->
<!-- 工具类相关 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-excel</artifactId>
</dependency>
@@ -78,7 +81,7 @@
<!-- 监控相关 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-monitor</artifactId>
</dependency>

4
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/api/config/ConfigApi.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/api/config/ConfigApi.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.infra.api.config;
package cn.aagro.ag.module.infra.api.config;
/**
* 参数配置 API 接口
*
* @author 芋道源码
* @author AIOTAGRO
*/
public interface ConfigApi {

11
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/api/config/ConfigApiImpl.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/api/config/ConfigApiImpl.java
View File

@@ -1,16 +1,15 @@
package cn.aagro.pp.module.infra.api.config;
package cn.aagro.ag.module.infra.api.config;
import cn.aagro.pp.module.infra.dal.dataobject.config.ConfigDO;
import cn.aagro.pp.module.infra.service.config.ConfigService;
import cn.aagro.ag.module.infra.dal.dataobject.config.ConfigDO;
import cn.aagro.ag.module.infra.service.config.ConfigService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
/**
* 参数配置 API 实现类
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Service
@Validated

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/api/file/FileApi.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/api/file/FileApi.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.infra.api.file;
package cn.aagro.ag.module.infra.api.file;
import javax.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotEmpty;
/**
* 文件 API 接口
*
* @author 芋道源码
* @author AIOTAGRO
*/
public interface FileApi {

9
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/api/file/FileApiImpl.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/api/file/FileApiImpl.java
View File

@@ -1,15 +1,14 @@
package cn.aagro.pp.module.infra.api.file;
package cn.aagro.ag.module.infra.api.file;
import cn.aagro.pp.module.infra.service.file.FileService;
import cn.aagro.ag.module.infra.service.file.FileService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
/**
* 文件 API 实现类
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Service
@Validated

13
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/api/logger/ApiAccessLogApiImpl.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/api/logger/ApiAccessLogApiImpl.java
View File

@@ -1,17 +1,16 @@
package cn.aagro.pp.module.infra.api.logger;
package cn.aagro.ag.module.infra.api.logger;
import cn.aagro.pp.framework.common.biz.infra.logger.ApiAccessLogCommonApi;
import cn.aagro.pp.framework.common.biz.infra.logger.dto.ApiAccessLogCreateReqDTO;
import cn.aagro.pp.module.infra.service.logger.ApiAccessLogService;
import cn.aagro.ag.framework.common.biz.infra.logger.ApiAccessLogCommonApi;
import cn.aagro.ag.framework.common.biz.infra.logger.dto.ApiAccessLogCreateReqDTO;
import cn.aagro.ag.module.infra.service.logger.ApiAccessLogService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
/**
* API 访问日志的 API 实现类
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Service
@Validated

12
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/api/logger/ApiErrorLogApiImpl.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/api/logger/ApiErrorLogApiImpl.java
View File

@@ -1,17 +1,17 @@
package cn.aagro.pp.module.infra.api.logger;
package cn.aagro.ag.module.infra.api.logger;
import cn.aagro.pp.framework.common.biz.infra.logger.ApiErrorLogCommonApi;
import cn.aagro.pp.framework.common.biz.infra.logger.dto.ApiErrorLogCreateReqDTO;
import cn.aagro.pp.module.infra.service.logger.ApiErrorLogService;
import cn.aagro.ag.framework.common.biz.infra.logger.ApiErrorLogCommonApi;
import cn.aagro.ag.framework.common.biz.infra.logger.dto.ApiErrorLogCreateReqDTO;
import cn.aagro.ag.module.infra.service.logger.ApiErrorLogService;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
/**
* API 访问日志的 API 接口
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Service
@Validated

2
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/api/package-info.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/api/package-info.java
View File

@@ -1,4 +1,4 @@
/**
* infra API 包，定义并实现提供给其它模块的 API
*/
package cn.aagro.pp.module.infra.api;
package cn.aagro.ag.module.infra.api;

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/api/websocket/WebSocketSenderApi.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/api/websocket/WebSocketSenderApi.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.api.websocket;
package cn.aagro.ag.module.infra.api.websocket;
import cn.aagro.pp.framework.common.util.json.JsonUtils;
import cn.aagro.ag.framework.common.util.json.JsonUtils;
/**
* WebSocket 发送器的 API 接口
*
* 对 WebSocketMessageSender 进行封装，提供给其它模块使用
*
* @author 芋道源码
* @author AIOTAGRO
*/
public interface WebSocketSenderApi {

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/api/websocket/WebSocketSenderApiImpl.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/api/websocket/WebSocketSenderApiImpl.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.api.websocket;
package cn.aagro.ag.module.infra.api.websocket;
import cn.aagro.pp.framework.websocket.core.sender.WebSocketMessageSender;
import cn.aagro.ag.framework.websocket.core.sender.WebSocketMessageSender;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* WebSocket 发送器的 API 实现类
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Component
public class WebSocketSenderApiImpl implements WebSocketSenderApi {

44
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/codegen/CodegenController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/codegen/CodegenController.java
View File

@@ -1,41 +1,41 @@
package cn.aagro.pp.module.infra.controller.admin.codegen;
package cn.aagro.ag.module.infra.controller.admin.codegen;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.ZipUtil;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.CodegenCreateListReqVO;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.CodegenDetailRespVO;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.CodegenPreviewRespVO;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.CodegenUpdateReqVO;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.table.CodegenTablePageReqVO;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.table.DatabaseTableRespVO;
import cn.aagro.pp.module.infra.convert.codegen.CodegenConvert;
import cn.aagro.pp.module.infra.dal.dataobject.codegen.CodegenColumnDO;
import cn.aagro.pp.module.infra.dal.dataobject.codegen.CodegenTableDO;
import cn.aagro.pp.module.infra.service.codegen.CodegenService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.CodegenCreateListReqVO;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.CodegenDetailRespVO;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.CodegenPreviewRespVO;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.CodegenUpdateReqVO;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.table.CodegenTablePageReqVO;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.table.DatabaseTableRespVO;
import cn.aagro.ag.module.infra.convert.codegen.CodegenConvert;
import cn.aagro.ag.module.infra.dal.dataobject.codegen.CodegenColumnDO;
import cn.aagro.ag.module.infra.dal.dataobject.codegen.CodegenTableDO;
import cn.aagro.ag.module.infra.service.codegen.CodegenService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
import static cn.aagro.pp.module.infra.framework.file.core.utils.FileTypeUtils.writeAttachment;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
import static cn.aagro.ag.module.infra.framework.file.core.utils.FileTypeUtils.writeAttachment;
@Tag(name = "管理后台 - 代码生成器")
@RestController
@@ -51,7 +51,7 @@ public class CodegenController {
@Parameters({
@Parameter(name = "dataSourceConfigId", description = "数据源配置的编号", required = true, example = "1"),
@Parameter(name = "name", description = "表名，模糊匹配", example = "aagro"),
@Parameter(name = "comment", description = "描述，模糊匹配", example = "芋道")
@Parameter(name = "comment", description = "描述，模糊匹配", example = "AIOTAGRO")
})
@PreAuthorize("@ss.hasPermission('infra:codegen:query')")
public CommonResult<List<DatabaseTableRespVO>> getDatabaseTableList(

4
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.infra.controller.admin.codegen.vo;
package cn.aagro.ag.module.infra.controller.admin.codegen.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.util.List;

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.infra.controller.admin.codegen.vo;
package cn.aagro.ag.module.infra.controller.admin.codegen.vo;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.column.CodegenColumnRespVO;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.column.CodegenColumnRespVO;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

4
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.infra.controller.admin.codegen.vo;
package cn.aagro.ag.module.infra.controller.admin.codegen.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -7,7 +7,7 @@ import lombok.Data;
@Data
public class CodegenPreviewRespVO {
@Schema(description = "文件路径", requiredMode = Schema.RequiredMode.REQUIRED, example = "java/cn.aagro.pp/adminserver/modules/system/controller/test/SysTestDemoController.java")
@Schema(description = "文件路径", requiredMode = Schema.RequiredMode.REQUIRED, example = "java/cn.aagro.ag/adminserver/modules/system/controller/test/SysTestDemoController.java")
private String filePath;
@Schema(description = "代码", requiredMode = Schema.RequiredMode.REQUIRED, example = "Hello World")

10
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java
View File

@@ -1,10 +1,10 @@
package cn.aagro.pp.module.infra.controller.admin.codegen.vo;
package cn.aagro.ag.module.infra.controller.admin.codegen.vo;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.column.CodegenColumnSaveReqVO;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.table.CodegenTableSaveReqVO;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.column.CodegenColumnSaveReqVO;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.table.CodegenTableSaveReqVO;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.util.List;

2
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.infra.controller.admin.codegen.vo.column;
package cn.aagro.ag.module.infra.controller.admin.codegen.vo.column;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

4
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.infra.controller.admin.codegen.vo.column;
package cn.aagro.ag.module.infra.controller.admin.codegen.vo.column;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Schema(description = "管理后台 - 代码生成字段定义创建/修改 Request VO")

8
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.controller.admin.codegen.vo.table;
package cn.aagro.ag.module.infra.controller.admin.codegen.vo.table;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 表定义分页 Request VO")
@Data
@@ -16,7 +16,7 @@ public class CodegenTablePageReqVO extends PageParam {
@Schema(description = "表名称，模糊匹配", example = "aagro")
private String tableName;
@Schema(description = "表描述，模糊匹配", example = "芋道")
@Schema(description = "表描述，模糊匹配", example = "AIOTAGRO")
private String tableComment;
@Schema(description = "实体，模糊匹配", example = "Aagro")

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.infra.controller.admin.codegen.vo.table;
package cn.aagro.ag.module.infra.controller.admin.codegen.vo.table;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -18,7 +18,7 @@ public class CodegenTableRespVO {
@Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "aagro")
private String tableName;
@Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
@Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
private String tableComment;
@Schema(description = "备注", example = "我是备注")
@@ -36,7 +36,7 @@ public class CodegenTableRespVO {
@Schema(description = "类描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "代码生成器的表定义")
private String classComment;
@Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
@Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
private String author;
@Schema(description = "模板类型，参见 CodegenTemplateTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

15
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java
View File

@@ -1,15 +1,14 @@
package cn.aagro.pp.module.infra.controller.admin.codegen.vo.table;
package cn.aagro.ag.module.infra.controller.admin.codegen.vo.table;
import cn.hutool.core.util.ObjectUtil;
import cn.aagro.pp.module.infra.enums.codegen.CodegenSceneEnum;
import cn.aagro.pp.module.infra.enums.codegen.CodegenTemplateTypeEnum;
import cn.aagro.ag.module.infra.enums.codegen.CodegenSceneEnum;
import cn.aagro.ag.module.infra.enums.codegen.CodegenTemplateTypeEnum;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.AssertTrue;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import javax.validation.constraints.AssertTrue;
import javax.validation.constraints.NotNull;
@Schema(description = "管理后台 - 代码生成表定义创建/修改 Response VO")
@Data
public class CodegenTableSaveReqVO {
@@ -25,7 +24,7 @@ public class CodegenTableSaveReqVO {
@NotNull(message = "表名称不能为空")
private String tableName;
@Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
@Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
@NotNull(message = "表描述不能为空")
private String tableComment;
@@ -48,7 +47,7 @@ public class CodegenTableSaveReqVO {
@NotNull(message = "类描述不能为空")
private String classComment;
@Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
@Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
@NotNull(message = "作者不能为空")
private String author;

4
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.infra.controller.admin.codegen.vo.table;
package cn.aagro.ag.module.infra.controller.admin.codegen.vo.table;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -10,7 +10,7 @@ public class DatabaseTableRespVO {
@Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "yuanma")
private String name;
@Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
@Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
private String comment;
}

38
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/config/ConfigController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/config/ConfigController.java
View File

@@ -1,33 +1,33 @@
package cn.aagro.pp.module.infra.controller.admin.config;
package cn.aagro.ag.module.infra.controller.admin.config;
import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
import cn.aagro.pp.module.infra.controller.admin.config.vo.ConfigPageReqVO;
import cn.aagro.pp.module.infra.controller.admin.config.vo.ConfigRespVO;
import cn.aagro.pp.module.infra.controller.admin.config.vo.ConfigSaveReqVO;
import cn.aagro.pp.module.infra.convert.config.ConfigConvert;
import cn.aagro.pp.module.infra.dal.dataobject.config.ConfigDO;
import cn.aagro.pp.module.infra.enums.ErrorCodeConstants;
import cn.aagro.pp.module.infra.service.config.ConfigService;
import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
import cn.aagro.ag.module.infra.controller.admin.config.vo.ConfigPageReqVO;
import cn.aagro.ag.module.infra.controller.admin.config.vo.ConfigRespVO;
import cn.aagro.ag.module.infra.controller.admin.config.vo.ConfigSaveReqVO;
import cn.aagro.ag.module.infra.convert.config.ConfigConvert;
import cn.aagro.ag.module.infra.dal.dataobject.config.ConfigDO;
import cn.aagro.ag.module.infra.enums.ErrorCodeConstants;
import cn.aagro.ag.module.infra.service.config.ConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.pp.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.ag.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 参数配置")
@RestController

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/config/vo/ConfigPageReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/config/vo/ConfigPageReqVO.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.controller.admin.config.vo;
package cn.aagro.ag.module.infra.controller.admin.config.vo;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 参数配置分页 Request VO")
@Data

8
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/config/vo/ConfigRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/config/vo/ConfigRespVO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.infra.controller.admin.config.vo;
package cn.aagro.ag.module.infra.controller.admin.config.vo;
import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
import cn.aagro.pp.framework.excel.core.convert.DictConvert;
import cn.aagro.pp.module.infra.enums.DictTypeConstants;
import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
import cn.aagro.ag.framework.excel.core.convert.DictConvert;
import cn.aagro.ag.module.infra.enums.DictTypeConstants;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;

11
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/config/vo/ConfigSaveReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/config/vo/ConfigSaveReqVO.java
View File

@@ -1,13 +1,12 @@
package cn.aagro.pp.module.infra.controller.admin.config.vo;
package cn.aagro.ag.module.infra.controller.admin.config.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
@Schema(description = "管理后台 - 参数配置创建/修改 Request VO")
@Data
public class ConfigSaveReqVO {

20
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/db/DataSourceConfigController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/db/DataSourceConfigController.java
View File

@@ -1,23 +1,23 @@
package cn.aagro.pp.module.infra.controller.admin.db;
package cn.aagro.ag.module.infra.controller.admin.db;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.module.infra.controller.admin.db.vo.DataSourceConfigRespVO;
import cn.aagro.pp.module.infra.controller.admin.db.vo.DataSourceConfigSaveReqVO;
import cn.aagro.pp.module.infra.dal.dataobject.db.DataSourceConfigDO;
import cn.aagro.pp.module.infra.service.db.DataSourceConfigService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.module.infra.controller.admin.db.vo.DataSourceConfigRespVO;
import cn.aagro.ag.module.infra.controller.admin.db.vo.DataSourceConfigSaveReqVO;
import cn.aagro.ag.module.infra.dal.dataobject.db.DataSourceConfigDO;
import cn.aagro.ag.module.infra.service.db.DataSourceConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
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 java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 数据源配置")
@RestController

2
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.infra.controller.admin.db.vo;
package cn.aagro.ag.module.infra.controller.admin.db.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

5
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/db/vo/DataSourceConfigSaveReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/db/vo/DataSourceConfigSaveReqVO.java
View File

@@ -1,10 +1,9 @@
package cn.aagro.pp.module.infra.controller.admin.db.vo;
package cn.aagro.ag.module.infra.controller.admin.db.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Schema(description = "管理后台 - 数据源配置创建/修改 Request VO")
@Data
public class DataSourceConfigSaveReqVO {

34
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo01/Demo01ContactController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
View File

@@ -1,31 +1,31 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo01;
package cn.aagro.ag.module.infra.controller.admin.demo.demo01;
import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
import cn.aagro.pp.module.infra.controller.admin.demo.demo01.vo.Demo01ContactPageReqVO;
import cn.aagro.pp.module.infra.controller.admin.demo.demo01.vo.Demo01ContactRespVO;
import cn.aagro.pp.module.infra.controller.admin.demo.demo01.vo.Demo01ContactSaveReqVO;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo01.Demo01ContactDO;
import cn.aagro.pp.module.infra.service.demo.demo01.Demo01ContactService;
import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
import cn.aagro.ag.module.infra.controller.admin.demo.demo01.vo.Demo01ContactPageReqVO;
import cn.aagro.ag.module.infra.controller.admin.demo.demo01.vo.Demo01ContactRespVO;
import cn.aagro.ag.module.infra.controller.admin.demo.demo01.vo.Demo01ContactSaveReqVO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo01.Demo01ContactDO;
import cn.aagro.ag.module.infra.service.demo.demo01.Demo01ContactService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 示例联系人")
@RestController

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo01.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo01.vo;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 示例联系人分页 Request VO")
@Data

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo01/vo/Demo01ContactRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo01/vo/Demo01ContactRespVO.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo01.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo01.vo;
import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
import cn.aagro.pp.framework.excel.core.convert.DictConvert;
import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
import cn.aagro.ag.framework.excel.core.convert.DictConvert;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo01/vo/Demo01ContactSaveReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo01/vo/Demo01ContactSaveReqVO.java
View File

@@ -1,10 +1,10 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo01.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo01.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 示例联系人新增/修改 Request VO")

30
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java
View File

@@ -1,29 +1,29 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo02;
package cn.aagro.ag.module.infra.controller.admin.demo.demo02;
import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
import cn.aagro.pp.module.infra.controller.admin.demo.demo02.vo.Demo02CategoryListReqVO;
import cn.aagro.pp.module.infra.controller.admin.demo.demo02.vo.Demo02CategoryRespVO;
import cn.aagro.pp.module.infra.controller.admin.demo.demo02.vo.Demo02CategorySaveReqVO;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo02.Demo02CategoryDO;
import cn.aagro.pp.module.infra.service.demo.demo02.Demo02CategoryService;
import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
import cn.aagro.ag.module.infra.controller.admin.demo.demo02.vo.Demo02CategoryListReqVO;
import cn.aagro.ag.module.infra.controller.admin.demo.demo02.vo.Demo02CategoryRespVO;
import cn.aagro.ag.module.infra.controller.admin.demo.demo02.vo.Demo02CategorySaveReqVO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo02.Demo02CategoryDO;
import cn.aagro.ag.module.infra.service.demo.demo02.Demo02CategoryService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 示例分类")
@RestController

4
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryListReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryListReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo02.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo02.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -6,7 +6,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 示例分类列表 Request VO")
@Data

2
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo02.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo02.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;

7
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java
View File

@@ -1,11 +1,10 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo02.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo02.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Schema(description = "管理后台 - 示例分类新增/修改 Request VO")
@Data
public class Demo02CategorySaveReqVO {

38
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo03/erp/Demo03StudentErpController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo03/erp/Demo03StudentErpController.java
View File

@@ -1,33 +1,33 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo03.erp;
package cn.aagro.ag.module.infra.controller.admin.demo.demo03.erp;
import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
import cn.aagro.pp.module.infra.controller.admin.demo.demo03.erp.vo.Demo03StudentErpPageReqVO;
import cn.aagro.pp.module.infra.controller.admin.demo.demo03.erp.vo.Demo03StudentErpRespVO;
import cn.aagro.pp.module.infra.controller.admin.demo.demo03.erp.vo.Demo03StudentErpSaveReqVO;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo03.Demo03CourseDO;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo03.Demo03GradeDO;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo03.Demo03StudentDO;
import cn.aagro.pp.module.infra.service.demo.demo03.erp.Demo03StudentErpService;
import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
import cn.aagro.ag.module.infra.controller.admin.demo.demo03.erp.vo.Demo03StudentErpPageReqVO;
import cn.aagro.ag.module.infra.controller.admin.demo.demo03.erp.vo.Demo03StudentErpRespVO;
import cn.aagro.ag.module.infra.controller.admin.demo.demo03.erp.vo.Demo03StudentErpSaveReqVO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo03.Demo03CourseDO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo03.Demo03GradeDO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo03.Demo03StudentDO;
import cn.aagro.ag.module.infra.service.demo.demo03.erp.Demo03StudentErpService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 学生")
@RestController

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo03/erp/vo/Demo03StudentErpPageReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo03/erp/vo/Demo03StudentErpPageReqVO.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo03.erp.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo03.erp.vo;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 学生分页 Request VO")
@Data

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo03/erp/vo/Demo03StudentErpRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo03/erp/vo/Demo03StudentErpRespVO.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo03.erp.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo03.erp.vo;
import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
import cn.aagro.pp.framework.excel.core.convert.DictConvert;
import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
import cn.aagro.ag.framework.excel.core.convert.DictConvert;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo03/erp/vo/Demo03StudentErpSaveReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo03/erp/vo/Demo03StudentErpSaveReqVO.java
View File

@@ -1,10 +1,10 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo03.erp.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo03.erp.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 学生新增/修改 Request VO")

38
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo03/inner/Demo03StudentInnerController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo03/inner/Demo03StudentInnerController.java
View File

@@ -1,33 +1,33 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo03.inner;
package cn.aagro.ag.module.infra.controller.admin.demo.demo03.inner;
import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
import cn.aagro.pp.module.infra.controller.admin.demo.demo03.inner.vo.Demo03StudentInnerPageReqVO;
import cn.aagro.pp.module.infra.controller.admin.demo.demo03.inner.vo.Demo03StudentInnerRespVO;
import cn.aagro.pp.module.infra.controller.admin.demo.demo03.inner.vo.Demo03StudentInnerSaveReqVO;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo03.Demo03CourseDO;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo03.Demo03GradeDO;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo03.Demo03StudentDO;
import cn.aagro.pp.module.infra.service.demo.demo03.inner.Demo03StudentInnerService;
import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
import cn.aagro.ag.module.infra.controller.admin.demo.demo03.inner.vo.Demo03StudentInnerPageReqVO;
import cn.aagro.ag.module.infra.controller.admin.demo.demo03.inner.vo.Demo03StudentInnerRespVO;
import cn.aagro.ag.module.infra.controller.admin.demo.demo03.inner.vo.Demo03StudentInnerSaveReqVO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo03.Demo03CourseDO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo03.Demo03GradeDO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo03.Demo03StudentDO;
import cn.aagro.ag.module.infra.service.demo.demo03.inner.Demo03StudentInnerService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 学生")
@RestController

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo03/inner/vo/Demo03StudentInnerPageReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo03/inner/vo/Demo03StudentInnerPageReqVO.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo03.inner.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo03.inner.vo;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 学生分页 Request VO")
@Data

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo03/inner/vo/Demo03StudentInnerRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo03/inner/vo/Demo03StudentInnerRespVO.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo03.inner.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo03.inner.vo;
import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
import cn.aagro.pp.framework.excel.core.convert.DictConvert;
import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
import cn.aagro.ag.framework.excel.core.convert.DictConvert;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;

10
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo03/inner/vo/Demo03StudentInnerSaveReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo03/inner/vo/Demo03StudentInnerSaveReqVO.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo03.inner.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo03.inner.vo;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo03.Demo03CourseDO;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo03.Demo03GradeDO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo03.Demo03CourseDO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo03.Demo03GradeDO;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;

38
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo03/normal/Demo03StudentNormalController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo03/normal/Demo03StudentNormalController.java
View File

@@ -1,33 +1,33 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo03.normal;
package cn.aagro.ag.module.infra.controller.admin.demo.demo03.normal;
import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
import cn.aagro.pp.module.infra.controller.admin.demo.demo03.normal.vo.Demo03StudentNormalPageReqVO;
import cn.aagro.pp.module.infra.controller.admin.demo.demo03.normal.vo.Demo03StudentNormalRespVO;
import cn.aagro.pp.module.infra.controller.admin.demo.demo03.normal.vo.Demo03StudentNormalSaveReqVO;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo03.Demo03CourseDO;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo03.Demo03GradeDO;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo03.Demo03StudentDO;
import cn.aagro.pp.module.infra.service.demo.demo03.normal.Demo03StudentNormalService;
import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
import cn.aagro.ag.module.infra.controller.admin.demo.demo03.normal.vo.Demo03StudentNormalPageReqVO;
import cn.aagro.ag.module.infra.controller.admin.demo.demo03.normal.vo.Demo03StudentNormalRespVO;
import cn.aagro.ag.module.infra.controller.admin.demo.demo03.normal.vo.Demo03StudentNormalSaveReqVO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo03.Demo03CourseDO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo03.Demo03GradeDO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo03.Demo03StudentDO;
import cn.aagro.ag.module.infra.service.demo.demo03.normal.Demo03StudentNormalService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 学生")
@RestController

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo03/normal/vo/Demo03StudentNormalPageReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo03/normal/vo/Demo03StudentNormalPageReqVO.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo03.normal.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo03.normal.vo;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 学生分页 Request VO")
@Data

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo03/normal/vo/Demo03StudentNormalRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo03/normal/vo/Demo03StudentNormalRespVO.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo03.normal.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo03.normal.vo;
import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
import cn.aagro.pp.framework.excel.core.convert.DictConvert;
import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
import cn.aagro.ag.framework.excel.core.convert.DictConvert;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;

10
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/demo03/normal/vo/Demo03StudentNormalSaveReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/demo03/normal/vo/Demo03StudentNormalSaveReqVO.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.infra.controller.admin.demo.demo03.normal.vo;
package cn.aagro.ag.module.infra.controller.admin.demo.demo03.normal.vo;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo03.Demo03CourseDO;
import cn.aagro.pp.module.infra.dal.dataobject.demo.demo03.Demo03GradeDO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo03.Demo03CourseDO;
import cn.aagro.ag.module.infra.dal.dataobject.demo.demo03.Demo03GradeDO;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;

2
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/demo/package-info.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/demo/package-info.java
View File

@@ -5,4 +5,4 @@
* 2. demo02：单表（树形结构）
* 3. demo03：主子表（标准模式）+ 主子表（ERP 模式）+ 主子表（内嵌模式）
*/
package cn.aagro.pp.module.infra.controller.admin.demo;
package cn.aagro.ag.module.infra.controller.admin.demo;

0
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/file/FileConfigController.http → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/file/FileConfigController.http
View File

24
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/file/FileConfigController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/file/FileConfigController.java
View File

@@ -1,25 +1,25 @@
package cn.aagro.pp.module.infra.controller.admin.file;
package cn.aagro.ag.module.infra.controller.admin.file;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO;
import cn.aagro.pp.module.infra.controller.admin.file.vo.config.FileConfigRespVO;
import cn.aagro.pp.module.infra.controller.admin.file.vo.config.FileConfigSaveReqVO;
import cn.aagro.pp.module.infra.dal.dataobject.file.FileConfigDO;
import cn.aagro.pp.module.infra.service.file.FileConfigService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO;
import cn.aagro.ag.module.infra.controller.admin.file.vo.config.FileConfigRespVO;
import cn.aagro.ag.module.infra.controller.admin.file.vo.config.FileConfigSaveReqVO;
import cn.aagro.ag.module.infra.dal.dataobject.file.FileConfigDO;
import cn.aagro.ag.module.infra.service.file.FileConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
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 java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 文件配置")
@RestController

30
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/file/FileController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/file/FileController.java
View File

@@ -1,19 +1,24 @@
package cn.aagro.pp.module.infra.controller.admin.file;
package cn.aagro.ag.module.infra.controller.admin.file;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.pp.module.infra.controller.admin.file.vo.file.*;
import cn.aagro.pp.module.infra.dal.dataobject.file.FileDO;
import cn.aagro.pp.module.infra.service.file.FileService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.ag.module.infra.controller.admin.file.vo.file.*;
import cn.aagro.ag.module.infra.dal.dataobject.file.FileDO;
import cn.aagro.ag.module.infra.service.file.FileService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -21,15 +26,10 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.module.infra.framework.file.core.utils.FileTypeUtils.writeAttachment;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.module.infra.framework.file.core.utils.FileTypeUtils.writeAttachment;
@Tag(name = "管理后台 - 文件存储")
@RestController

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.controller.admin.file.vo.config;
package cn.aagro.ag.module.infra.controller.admin.file.vo.config;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 文件配置分页 Request VO")
@Data

4
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.infra.controller.admin.file.vo.config;
package cn.aagro.ag.module.infra.controller.admin.file.vo.config;
import cn.aagro.pp.module.infra.framework.file.core.client.FileClientConfig;
import cn.aagro.ag.module.infra.framework.file.core.client.FileClientConfig;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

4
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/file/vo/config/FileConfigSaveReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/file/vo/config/FileConfigSaveReqVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.infra.controller.admin.file.vo.config;
package cn.aagro.ag.module.infra.controller.admin.file.vo.config;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.Map;
@Schema(description = "管理后台 - 文件配置创建/修改 Request VO")

5
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/file/vo/file/FileCreateReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/file/vo/file/FileCreateReqVO.java
View File

@@ -1,10 +1,9 @@
package cn.aagro.pp.module.infra.controller.admin.file.vo.file;
package cn.aagro.ag.module.infra.controller.admin.file.vo.file;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Schema(description = "管理后台 - 文件创建 Request VO")
@Data
public class FileCreateReqVO {

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/file/vo/file/FilePageReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/file/vo/file/FilePageReqVO.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.controller.admin.file.vo.file;
package cn.aagro.ag.module.infra.controller.admin.file.vo.file;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 文件分页 Request VO")
@Data

2
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.infra.controller.admin.file.vo.file;
package cn.aagro.ag.module.infra.controller.admin.file.vo.file;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

2
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/file/vo/file/FileRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/file/vo/file/FileRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.infra.controller.admin.file.vo.file;
package cn.aagro.ag.module.infra.controller.admin.file.vo.file;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

7
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java
View File

@@ -1,14 +1,13 @@
package cn.aagro.pp.module.infra.controller.admin.file.vo.file;
package cn.aagro.ag.module.infra.controller.admin.file.vo.file;
import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.AssertTrue;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.constraints.AssertTrue;
import javax.validation.constraints.NotNull;
@Schema(description = "管理后台 - 上传文件 Request VO")
@Data
public class FileUploadReqVO {

0
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/job/JobController.http → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/job/JobController.http
View File

36
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/job/JobController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/job/JobController.java
View File

@@ -1,36 +1,36 @@
package cn.aagro.pp.module.infra.controller.admin.job;
package cn.aagro.ag.module.infra.controller.admin.job;
import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
import cn.aagro.pp.framework.quartz.core.util.CronUtils;
import cn.aagro.pp.module.infra.controller.admin.job.vo.job.JobPageReqVO;
import cn.aagro.pp.module.infra.controller.admin.job.vo.job.JobRespVO;
import cn.aagro.pp.module.infra.controller.admin.job.vo.job.JobSaveReqVO;
import cn.aagro.pp.module.infra.dal.dataobject.job.JobDO;
import cn.aagro.pp.module.infra.service.job.JobService;
import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
import cn.aagro.ag.framework.quartz.core.util.CronUtils;
import cn.aagro.ag.module.infra.controller.admin.job.vo.job.JobPageReqVO;
import cn.aagro.ag.module.infra.controller.admin.job.vo.job.JobRespVO;
import cn.aagro.ag.module.infra.controller.admin.job.vo.job.JobSaveReqVO;
import cn.aagro.ag.module.infra.dal.dataobject.job.JobDO;
import cn.aagro.ag.module.infra.service.job.JobService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.quartz.SchedulerException;
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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 定时任务")
@RestController

32
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/job/JobLogController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/job/JobLogController.java
View File

@@ -1,18 +1,21 @@
package cn.aagro.pp.module.infra.controller.admin.job;
package cn.aagro.ag.module.infra.controller.admin.job;
import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
import cn.aagro.pp.module.infra.controller.admin.job.vo.log.JobLogPageReqVO;
import cn.aagro.pp.module.infra.controller.admin.job.vo.log.JobLogRespVO;
import cn.aagro.pp.module.infra.dal.dataobject.job.JobLogDO;
import cn.aagro.pp.module.infra.service.job.JobLogService;
import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
import cn.aagro.ag.module.infra.controller.admin.job.vo.log.JobLogPageReqVO;
import cn.aagro.ag.module.infra.controller.admin.job.vo.log.JobLogRespVO;
import cn.aagro.ag.module.infra.dal.dataobject.job.JobLogDO;
import cn.aagro.ag.module.infra.service.job.JobLogService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -20,14 +23,11 @@ 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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 定时任务日志")
@RestController

4
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/job/vo/job/JobPageReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/job/vo/job/JobPageReqVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.infra.controller.admin.job.vo.job;
package cn.aagro.ag.module.infra.controller.admin.job.vo.job;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

10
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/job/vo/job/JobRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/job/vo/job/JobRespVO.java
View File

@@ -1,14 +1,14 @@
package cn.aagro.pp.module.infra.controller.admin.job.vo.job;
package cn.aagro.ag.module.infra.controller.admin.job.vo.job;
import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
import cn.aagro.pp.framework.excel.core.convert.DictConvert;
import cn.aagro.pp.module.infra.enums.DictTypeConstants;
import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
import cn.aagro.ag.framework.excel.core.convert.DictConvert;
import cn.aagro.ag.module.infra.enums.DictTypeConstants;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 定时任务 Response VO")

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/job/vo/job/JobSaveReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/job/vo/job/JobSaveReqVO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.infra.controller.admin.job.vo.job;
package cn.aagro.ag.module.infra.controller.admin.job.vo.job;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Schema(description = "管理后台 - 定时任务创建/修改 Request VO")

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/job/vo/log/JobLogPageReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/job/vo/log/JobLogPageReqVO.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.controller.admin.job.vo.log;
package cn.aagro.ag.module.infra.controller.admin.job.vo.log;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 定时任务日志分页 Request VO")
@Data

8
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/job/vo/log/JobLogRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/job/vo/log/JobLogRespVO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.infra.controller.admin.job.vo.log;
package cn.aagro.ag.module.infra.controller.admin.job.vo.log;
import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
import cn.aagro.pp.framework.excel.core.convert.DictConvert;
import cn.aagro.pp.module.infra.enums.DictTypeConstants;
import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
import cn.aagro.ag.framework.excel.core.convert.DictConvert;
import cn.aagro.ag.module.infra.enums.DictTypeConstants;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;

32
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/logger/ApiAccessLogController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/logger/ApiAccessLogController.java
View File

@@ -1,31 +1,31 @@
package cn.aagro.pp.module.infra.controller.admin.logger;
package cn.aagro.ag.module.infra.controller.admin.logger;
import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
import cn.aagro.pp.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO;
import cn.aagro.pp.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogRespVO;
import cn.aagro.pp.module.infra.dal.dataobject.logger.ApiAccessLogDO;
import cn.aagro.pp.module.infra.service.logger.ApiAccessLogService;
import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
import cn.aagro.ag.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO;
import cn.aagro.ag.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogRespVO;
import cn.aagro.ag.module.infra.dal.dataobject.logger.ApiAccessLogDO;
import cn.aagro.ag.module.infra.service.logger.ApiAccessLogService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - API 访问日志")
@RestController

34
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/logger/ApiErrorLogController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/logger/ApiErrorLogController.java
View File

@@ -1,32 +1,32 @@
package cn.aagro.pp.module.infra.controller.admin.logger;
package cn.aagro.ag.module.infra.controller.admin.logger;
import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
import cn.aagro.pp.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO;
import cn.aagro.pp.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogRespVO;
import cn.aagro.pp.module.infra.dal.dataobject.logger.ApiErrorLogDO;
import cn.aagro.pp.module.infra.service.logger.ApiErrorLogService;
import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
import cn.aagro.ag.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO;
import cn.aagro.ag.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogRespVO;
import cn.aagro.ag.module.infra.dal.dataobject.logger.ApiErrorLogDO;
import cn.aagro.ag.module.infra.service.logger.ApiErrorLogService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "管理后台 - API 错误日志")
@RestController

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.controller.admin.logger.vo.apiaccesslog;
package cn.aagro.ag.module.infra.controller.admin.logger.vo.apiaccesslog;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - API 访问日志分页 Request VO")
@Data

12
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.infra.controller.admin.logger.vo.apiaccesslog;
package cn.aagro.ag.module.infra.controller.admin.logger.vo.apiaccesslog;
import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
import cn.aagro.pp.framework.excel.core.convert.DictConvert;
import cn.aagro.pp.module.infra.enums.DictTypeConstants;
import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
import cn.aagro.ag.framework.excel.core.convert.DictConvert;
import cn.aagro.ag.module.infra.enums.DictTypeConstants;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -70,7 +70,7 @@ public class ApiAccessLogRespVO {
@Schema(description = "操作分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty(value = "操作分类", converter = DictConvert.class)
@DictFormat(cn.aagro.pp.module.infra.enums.DictTypeConstants.OPERATE_TYPE)
@DictFormat(cn.aagro.ag.module.infra.enums.DictTypeConstants.OPERATE_TYPE)
private Integer operateType;
@Schema(description = "开始请求时间", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -89,7 +89,7 @@ public class ApiAccessLogRespVO {
@ExcelProperty("结果码")
private Integer resultCode;
@Schema(description = "结果提示", example = "芋道源码，牛逼！")
@Schema(description = "结果提示", example = "AIOTAGRO，牛逼！")
@ExcelProperty("结果提示")
private String resultMsg;

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.controller.admin.logger.vo.apierrorlog;
package cn.aagro.ag.module.infra.controller.admin.logger.vo.apierrorlog;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - API 错误日志分页 Request VO")
@Data

8
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.infra.controller.admin.logger.vo.apierrorlog;
package cn.aagro.ag.module.infra.controller.admin.logger.vo.apierrorlog;
import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
import cn.aagro.pp.framework.excel.core.convert.DictConvert;
import cn.aagro.pp.module.infra.enums.DictTypeConstants;
import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
import cn.aagro.ag.framework.excel.core.convert.DictConvert;
import cn.aagro.ag.module.infra.enums.DictTypeConstants;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;

0
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/redis/RedisController.http → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/redis/RedisController.http
View File

12
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/redis/RedisController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/redis/RedisController.java
View File

@@ -1,10 +1,11 @@
package cn.aagro.pp.module.infra.controller.admin.redis;
package cn.aagro.ag.module.infra.controller.admin.redis;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.infra.controller.admin.redis.vo.RedisMonitorRespVO;
import cn.aagro.pp.module.infra.convert.redis.RedisConvert;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.infra.controller.admin.redis.vo.RedisMonitorRespVO;
import cn.aagro.ag.module.infra.convert.redis.RedisConvert;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import org.springframework.data.redis.connection.RedisServerCommands;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -13,10 +14,9 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.Properties;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - Redis 监控")
@RestController

2
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.infra.controller.admin.redis.vo;
package cn.aagro.ag.module.infra.controller.admin.redis.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

21
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/app/file/AppFileController.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/app/file/AppFileController.java
View File

@@ -1,25 +1,24 @@
package cn.aagro.pp.module.infra.controller.app.file;
package cn.aagro.ag.module.infra.controller.app.file;
import cn.hutool.core.io.IoUtil;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.infra.controller.admin.file.vo.file.FileCreateReqVO;
import cn.aagro.pp.module.infra.controller.admin.file.vo.file.FilePresignedUrlRespVO;
import cn.aagro.pp.module.infra.controller.app.file.vo.AppFileUploadReqVO;
import cn.aagro.pp.module.infra.service.file.FileService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.infra.controller.admin.file.vo.file.FileCreateReqVO;
import cn.aagro.ag.module.infra.controller.admin.file.vo.file.FilePresignedUrlRespVO;
import cn.aagro.ag.module.infra.controller.app.file.vo.AppFileUploadReqVO;
import cn.aagro.ag.module.infra.service.file.FileService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.annotation.security.PermitAll;
import javax.validation.Valid;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "用户 App - 文件存储")
@RestController

7
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/app/file/vo/AppFileUploadReqVO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/app/file/vo/AppFileUploadReqVO.java
View File

@@ -1,14 +1,13 @@
package cn.aagro.pp.module.infra.controller.app.file.vo;
package cn.aagro.ag.module.infra.controller.app.file.vo;
import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.AssertTrue;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.constraints.AssertTrue;
import javax.validation.constraints.NotNull;
@Schema(description = "用户 App - 上传文件 Request VO")
@Data
public class AppFileUploadReqVO {

4
aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/app/package-info.java Normal file
View File

@@ -0,0 +1,4 @@
/**
* 占位
*/
package cn.aagro.ag.module.infra.controller.app;

2
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/controller/package-info.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/controller/package-info.java
View File

@@ -3,4 +3,4 @@
* 1. admin 包：提供给管理后台 aagro-ui-admin 前端项目
* 2. app 包：提供给用户 APP aagro-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分
*/
package cn.aagro.pp.module.infra.controller;
package cn.aagro.ag.module.infra.controller;

18
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/convert/codegen/CodegenConvert.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/convert/codegen/CodegenConvert.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.infra.convert.codegen;
package cn.aagro.ag.module.infra.convert.codegen;
import cn.aagro.pp.framework.common.util.collection.CollectionUtils;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.CodegenDetailRespVO;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.CodegenPreviewRespVO;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.column.CodegenColumnRespVO;
import cn.aagro.pp.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO;
import cn.aagro.pp.module.infra.dal.dataobject.codegen.CodegenColumnDO;
import cn.aagro.pp.module.infra.dal.dataobject.codegen.CodegenTableDO;
import cn.aagro.ag.framework.common.util.collection.CollectionUtils;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.CodegenDetailRespVO;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.CodegenPreviewRespVO;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.column.CodegenColumnRespVO;
import cn.aagro.ag.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO;
import cn.aagro.ag.module.infra.dal.dataobject.codegen.CodegenColumnDO;
import cn.aagro.ag.module.infra.dal.dataobject.codegen.CodegenTableDO;
import com.baomidou.mybatisplus.generator.config.po.TableField;
import com.baomidou.mybatisplus.generator.config.po.TableInfo;
import org.apache.ibatis.type.JdbcType;

10
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/convert/config/ConfigConvert.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/convert/config/ConfigConvert.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.infra.convert.config;
package cn.aagro.ag.module.infra.convert.config;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.infra.controller.admin.config.vo.ConfigRespVO;
import cn.aagro.pp.module.infra.controller.admin.config.vo.ConfigSaveReqVO;
import cn.aagro.pp.module.infra.dal.dataobject.config.ConfigDO;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.infra.controller.admin.config.vo.ConfigRespVO;
import cn.aagro.ag.module.infra.controller.admin.config.vo.ConfigSaveReqVO;
import cn.aagro.ag.module.infra.dal.dataobject.config.ConfigDO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;

8
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/convert/file/FileConfigConvert.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/convert/file/FileConfigConvert.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.infra.convert.file;
package cn.aagro.ag.module.infra.convert.file;
import cn.aagro.pp.module.infra.controller.admin.file.vo.config.FileConfigSaveReqVO;
import cn.aagro.pp.module.infra.dal.dataobject.file.FileConfigDO;
import cn.aagro.ag.module.infra.controller.admin.file.vo.config.FileConfigSaveReqVO;
import cn.aagro.ag.module.infra.dal.dataobject.file.FileConfigDO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
@@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers;
/**
* 文件配置 Convert
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Mapper
public interface FileConfigConvert {

2
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/convert/package-info.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/convert/package-info.java
View File

@@ -3,4 +3,4 @@
*
* 目前使用 MapStruct 框架
*/
package cn.aagro.pp.module.infra.convert;
package cn.aagro.ag.module.infra.convert;

4
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/convert/redis/RedisConvert.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/convert/redis/RedisConvert.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.infra.convert.redis;
package cn.aagro.ag.module.infra.convert.redis;
import cn.hutool.core.util.StrUtil;
import cn.aagro.pp.module.infra.controller.admin.redis.vo.RedisMonitorRespVO;
import cn.aagro.ag.module.infra.controller.admin.redis.vo.RedisMonitorRespVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

12
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/codegen/CodegenColumnDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/codegen/CodegenColumnDO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.infra.dal.dataobject.codegen;
package cn.aagro.ag.module.infra.dal.dataobject.codegen;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.pp.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.pp.module.infra.enums.codegen.CodegenColumnHtmlTypeEnum;
import cn.aagro.pp.module.infra.enums.codegen.CodegenColumnListConditionEnum;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.ag.module.infra.enums.codegen.CodegenColumnHtmlTypeEnum;
import cn.aagro.ag.module.infra.enums.codegen.CodegenColumnListConditionEnum;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -13,7 +13,7 @@ import lombok.Data;
/**
* 代码生成 column 字段定义
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName(value = "infra_codegen_column", autoResultMap = true)
@KeySequence("infra_codegen_column_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

16
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/codegen/CodegenTableDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/codegen/CodegenTableDO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.infra.dal.dataobject.codegen;
package cn.aagro.ag.module.infra.dal.dataobject.codegen;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.pp.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.pp.module.infra.dal.dataobject.db.DataSourceConfigDO;
import cn.aagro.pp.module.infra.enums.codegen.CodegenFrontTypeEnum;
import cn.aagro.pp.module.infra.enums.codegen.CodegenSceneEnum;
import cn.aagro.pp.module.infra.enums.codegen.CodegenTemplateTypeEnum;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.ag.module.infra.dal.dataobject.db.DataSourceConfigDO;
import cn.aagro.ag.module.infra.enums.codegen.CodegenFrontTypeEnum;
import cn.aagro.ag.module.infra.enums.codegen.CodegenSceneEnum;
import cn.aagro.ag.module.infra.enums.codegen.CodegenTemplateTypeEnum;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -15,7 +15,7 @@ import lombok.Data;
/**
* 代码生成 table 表定义
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName(value = "infra_codegen_table", autoResultMap = true)
@KeySequence("infra_codegen_table_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

10
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/config/ConfigDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/config/ConfigDO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.infra.dal.dataobject.config;
package cn.aagro.ag.module.infra.dal.dataobject.config;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.pp.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.pp.module.infra.enums.config.ConfigTypeEnum;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.ag.module.infra.enums.config.ConfigTypeEnum;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -13,7 +13,7 @@ import lombok.ToString;
/**
* 参数配置表
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName("infra_config")
@KeySequence("infra_config_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

10
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/db/DataSourceConfigDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/db/DataSourceConfigDO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.infra.dal.dataobject.db;
package cn.aagro.ag.module.infra.dal.dataobject.db;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.pp.framework.mybatis.core.type.EncryptTypeHandler;
import cn.aagro.pp.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.mybatis.core.type.EncryptTypeHandler;
import cn.aagro.ag.framework.tenant.core.aop.TenantIgnore;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -11,7 +11,7 @@ import lombok.Data;
/**
* 数据源配置
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName(value = "infra_data_source_config", autoResultMap = true)
@KeySequence("infra_data_source_config_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/demo/demo01/Demo01ContactDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/demo/demo01/Demo01ContactDO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.infra.dal.dataobject.demo.demo01;
package cn.aagro.ag.module.infra.dal.dataobject.demo.demo01;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
/**
* 示例联系人 DO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName("aagro_demo01_contact")
@KeySequence("aagro_demo01_contact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/demo/demo02/Demo02CategoryDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/demo/demo02/Demo02CategoryDO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.infra.dal.dataobject.demo.demo02;
package cn.aagro.ag.module.infra.dal.dataobject.demo.demo02;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +9,7 @@ import lombok.*;
/**
* 示例分类 DO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName("aagro_demo02_category")
@KeySequence("aagro_demo02_category_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/demo/demo03/Demo03CourseDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/demo/demo03/Demo03CourseDO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.infra.dal.dataobject.demo.demo03;
package cn.aagro.ag.module.infra.dal.dataobject.demo.demo03;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +9,7 @@ import lombok.*;
/**
* 学生课程 DO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName("aagro_demo03_course")
@KeySequence("aagro_demo03_course_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/demo/demo03/Demo03GradeDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/demo/demo03/Demo03GradeDO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.infra.dal.dataobject.demo.demo03;
package cn.aagro.ag.module.infra.dal.dataobject.demo.demo03;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +9,7 @@ import lombok.*;
/**
* 学生班级 DO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName("aagro_demo03_grade")
@KeySequence("aagro_demo03_grade_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

6
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/demo/demo03/Demo03StudentDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/demo/demo03/Demo03StudentDO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.infra.dal.dataobject.demo.demo03;
package cn.aagro.ag.module.infra.dal.dataobject.demo.demo03;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
/**
* 学生 DO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName("aagro_demo03_student")
@KeySequence("aagro_demo03_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

26
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/file/FileConfigDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/file/FileConfigDO.java
View File

@@ -1,16 +1,16 @@
package cn.aagro.pp.module.infra.dal.dataobject.file;
package cn.aagro.ag.module.infra.dal.dataobject.file;
import cn.hutool.core.util.StrUtil;
import cn.aagro.pp.framework.common.util.json.JsonUtils;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.pp.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.pp.module.infra.framework.file.core.client.FileClientConfig;
import cn.aagro.pp.module.infra.framework.file.core.client.db.DBFileClientConfig;
import cn.aagro.pp.module.infra.framework.file.core.client.ftp.FtpFileClientConfig;
import cn.aagro.pp.module.infra.framework.file.core.client.local.LocalFileClientConfig;
import cn.aagro.pp.module.infra.framework.file.core.client.s3.S3FileClientConfig;
import cn.aagro.pp.module.infra.framework.file.core.client.sftp.SftpFileClientConfig;
import cn.aagro.pp.module.infra.framework.file.core.enums.FileStorageEnum;
import cn.aagro.ag.framework.common.util.json.JsonUtils;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.ag.module.infra.framework.file.core.client.FileClientConfig;
import cn.aagro.ag.module.infra.framework.file.core.client.db.DBFileClientConfig;
import cn.aagro.ag.module.infra.framework.file.core.client.ftp.FtpFileClientConfig;
import cn.aagro.ag.module.infra.framework.file.core.client.local.LocalFileClientConfig;
import cn.aagro.ag.module.infra.framework.file.core.client.s3.S3FileClientConfig;
import cn.aagro.ag.module.infra.framework.file.core.client.sftp.SftpFileClientConfig;
import cn.aagro.ag.module.infra.framework.file.core.enums.FileStorageEnum;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -23,7 +23,7 @@ import java.lang.reflect.Field;
/**
* 文件配置表
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName(value = "infra_file_config", autoResultMap = true)
@KeySequence("infra_file_config_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@@ -79,7 +79,7 @@ public class FileConfigDO extends BaseDO {
@Override
public Object parse(String json) {
FileClientConfig config = JsonUtils.parseObjectQuietly(json, new TypeReference<FileClientConfig>() {
FileClientConfig config = JsonUtils.parseObjectQuietly(json, new TypeReference<>() {
});
if (config != null) {
return config;

10
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/file/FileContentDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/file/FileContentDO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.infra.dal.dataobject.file;
package cn.aagro.ag.module.infra.dal.dataobject.file;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.pp.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.pp.module.infra.framework.file.core.client.db.DBFileClient;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.ag.module.infra.framework.file.core.client.db.DBFileClient;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -13,7 +13,7 @@ import lombok.*;
*
* 专门用于存储 {@link DBFileClient} 的文件内容
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName("infra_file_content")
@KeySequence("infra_file_content_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

8
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/file/FileDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/file/FileDO.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.infra.dal.dataobject.file;
package cn.aagro.ag.module.infra.dal.dataobject.file;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.pp.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.tenant.core.aop.TenantIgnore;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
@@ -10,7 +10,7 @@ import lombok.*;
* 文件表
* 每次文件上传，都会记录一条记录到该表中
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName("infra_file")
@KeySequence("infra_file_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

10
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/job/JobDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/job/JobDO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.infra.dal.dataobject.job;
package cn.aagro.ag.module.infra.dal.dataobject.job;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.pp.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.pp.module.infra.enums.job.JobStatusEnum;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.ag.module.infra.enums.job.JobStatusEnum;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -11,7 +11,7 @@ import lombok.*;
/**
* 定时任务 DO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName("infra_job")
@KeySequence("infra_job_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

12
aagro-module-infra/src/main/java/cn/aagro/pp/module/infra/dal/dataobject/job/JobLogDO.java → aagro-module-infra/src/main/java/cn/aagro/ag/module/infra/dal/dataobject/job/JobLogDO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.infra.dal.dataobject.job;
package cn.aagro.ag.module.infra.dal.dataobject.job;
import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.pp.framework.quartz.core.handler.JobHandler;
import cn.aagro.pp.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.pp.module.infra.enums.job.JobLogStatusEnum;
import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
import cn.aagro.ag.framework.quartz.core.handler.JobHandler;
import cn.aagro.ag.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.ag.module.infra.enums.job.JobLogStatusEnum;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
/**
* 定时任务的执行日志
*
* @author 芋道源码
* @author AIOTAGRO
*/
@TableName("infra_job_log")
@KeySequence("infra_job_log_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

Some files were not shown because too many files have changed in this diff Show More