zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
This commit is contained in:
chenbowen
2025-12-29 17:58:07 +08:00
parent 146f59c091 1ece64e911
commit 52a97db86e
60 changed files with 270 additions and 2650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
base-server/pom.xml
View File

@@ -82,6 +82,12 @@
</exclusion>
</exclusions>
</dependency>
<!-- Seata 达梦数据库补丁，必须最先引入以覆盖 seata-all 中的类 -->
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>zt-spring-boot-starter-seata-dm</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>

8
zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java
View File

@@ -22,15 +22,7 @@ public interface ErrorCodeConstants {
ErrorCode WAREHOUSE_CODE_EXISTS = new ErrorCode(1_001_000_002, "库位编码已存在");
ErrorCode FACTORY_NOT_EXISTS = new ErrorCode(1_001_000_001, "工厂不存在");
ErrorCode TAX_NOT_EXISTS = new ErrorCode(1_001_000_001, "公司关系不存在");
ErrorCode BUSINESS_RULE_NOT_EXISTS = new ErrorCode(1_027_100_001, "规则模型不存在");
ErrorCode BUSINESS_ALGORITHM_NOT_EXISTS = new ErrorCode(1_027_100_002, "算法模型不存在");
ErrorCode BUSINESS_DIMENSION_NOT_EXISTS = new ErrorCode(1_027_200_001, "经营指标维度不存在");
ErrorCode BUSINESS_INDICATOR_NOT_EXISTS = new ErrorCode(1_027_200_002, "经营指标不存在");
ErrorCode BUSINESS_DICTIONARY_TYPE_NOT_EXISTS = new ErrorCode(1_027_200_003, "业务字典类型不存在");
ErrorCode BUSINESS_DEPARTMENT_INDICATOR_NOT_EXISTS = new ErrorCode(1_027_200_004, "部门持有指标不存在");
// ========== 模板文档管理系统 1-006-xxx-xxx ==========
// 模板分类 1-006-001-xxx
ErrorCode TEMPLATE_CATEGORY_NOT_EXISTS = new ErrorCode(1_006_001_001, "模板分类不存在");

106
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/businessalgorithm/BusinessAlgorithmController.java
View File

File diff suppressed because it is too large Load Diff

23
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/businessalgorithm/vo/BusinessAlgorithmPageReqVO.java
View File

@@ -1,23 +0,0 @@
package com.zt.plat.module.base.controller.admin.businessalgorithm.vo;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
@Schema(description = "管理后台 - 业务算法分页 Request VO")
@Data
public class BusinessAlgorithmPageReqVO extends PageParam {
@Schema(description = "类型")
private String typeValue;
@Schema(description = "状态")
private String statusValue;
@Schema(description = "算法编码")
private String code;
@Schema(description = "算法名称", example = "王五")
private String name;
}

45
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/businessalgorithm/vo/BusinessAlgorithmRespVO.java
View File

@@ -1,45 +0,0 @@
package com.zt.plat.module.base.controller.admin.businessalgorithm.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 业务算法 Response VO")
@Data
@ExcelIgnoreUnannotated
public class BusinessAlgorithmRespVO {
@Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24454")
@ExcelProperty("主键ID")
private Long id;
@Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("类型")
private String typeValue;
@Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("状态")
private String statusValue;
@Schema(description = "算法编码", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("算法编码")
private String code;
@Schema(description = "算法名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
@ExcelProperty("算法名称")
private String name;
@Schema(description = "算法描述", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("算法描述")
private String description;
@Schema(description = "算法代码")
@ExcelProperty("算法代码")
private String coding;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

37
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/businessalgorithm/vo/BusinessAlgorithmSaveReqVO.java
View File

@@ -1,37 +0,0 @@
package com.zt.plat.module.base.controller.admin.businessalgorithm.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 业务算法新增/修改 Request VO")
@Data
public class BusinessAlgorithmSaveReqVO {
@Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24454")
private Long id;
@Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "类型不能为空")
private String typeValue;
@Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "状态不能为空")
private String statusValue;
@Schema(description = "算法编码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "算法编码不能为空")
private String code;
@Schema(description = "算法名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
@NotEmpty(message = "算法名称不能为空")
private String name;
@Schema(description = "算法描述", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "算法描述不能为空")
private String description;
@Schema(description = "算法代码")
private String coding;
}

107
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/businessdepartmentindicator/BusinessDepartmentIndicatorController.java
View File

File diff suppressed because it is too large Load Diff

17
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/businessdepartmentindicator/vo/BusinessDepartmentIndicatorPageReqVO.java
View File

@@ -1,17 +0,0 @@
package com.zt.plat.module.base.controller.admin.businessdepartmentindicator.vo;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
@Schema(description = "管理后台 - 部门持有指标分页 Request VO")
@Data
public class BusinessDepartmentIndicatorPageReqVO extends PageParam {
@Schema(description = "指标ID", example = "11268")
private Long indicatorId;
@Schema(description = "是否关键指标")
private Integer isKey;
}

59
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/businessdepartmentindicator/vo/BusinessDepartmentIndicatorRespVO.java
View File

@@ -1,59 +0,0 @@
package com.zt.plat.module.base.controller.admin.businessdepartmentindicator.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 部门持有指标 Response VO")
@Data
@ExcelIgnoreUnannotated
public class BusinessDepartmentIndicatorRespVO {
@Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32066")
@ExcelProperty("主键ID")
private Long id;
@Schema(description = "指标ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11268")
@ExcelProperty("指标ID")
private Long indicatorId;
@Schema(description = "计量单位ID", example = "16200")
@ExcelProperty("计量单位ID")
private Long unitId;
@Schema(description = "规则ID", example = "11174")
@ExcelProperty("规则ID")
private Long ruleId;
@Schema(description = "算法ID", example = "20986")
@ExcelProperty("算法ID")
private Long algorithmId;
@Schema(description = "实体ID", example = "2678")
@ExcelProperty("实体ID")
private Long entityId;
@Schema(description = "值")
@ExcelProperty("值")
private String value;
@Schema(description = "是否关键指标")
@ExcelProperty("是否关键指标")
private Integer isKey;
@Schema(description = "排序号")
@ExcelProperty("排序号")
private Long sort;
@Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("备注")
private String remark;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

43
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/businessdepartmentindicator/vo/BusinessDepartmentIndicatorSaveReqVO.java
View File

@@ -1,43 +0,0 @@
package com.zt.plat.module.base.controller.admin.businessdepartmentindicator.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 部门持有指标新增/修改 Request VO")
@Data
public class BusinessDepartmentIndicatorSaveReqVO {
@Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32066")
private Long id;
@Schema(description = "指标ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11268")
@NotNull(message = "指标ID不能为空")
private Long indicatorId;
@Schema(description = "计量单位ID", example = "16200")
private Long unitId;
@Schema(description = "规则ID", example = "11174")
private Long ruleId;
@Schema(description = "算法ID", example = "20986")
private Long algorithmId;
@Schema(description = "实体ID", example = "2678")
private Long entityId;
@Schema(description = "值")
private String value;
@Schema(description = "是否关键指标")
private Integer isKey;
@Schema(description = "排序号")
private Long sort;
@Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "备注不能为空")
private String remark;
}

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