规范化代码格式-传输类修改3.0

This commit is contained in:
zjh 2026-01-21 18:05:32 +08:00
parent 19b473bad9
commit 86b2b12889
41 changed files with 879 additions and 91 deletions

View File

@ -1,3 +1,9 @@
/**
* 审批流程表单用于接收审批流程相关的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import lombok.Data; import lombok.Data;
@ -7,6 +13,12 @@ import javax.validation.constraints.NotBlank;
@Data @Data
public class ApprovalFlowForm { public class ApprovalFlowForm {
@NotBlank(message = "流程不能为空") @NotBlank(message = "流程不能为空")
/**
* 流程ID
*/
private String flowId; private String flowId;
/**
* 模板ID
*/
private String templateId; private String templateId;
} }

View File

@ -1,3 +1,9 @@
/**
* 审批列表表单类用于接收审批列表相关的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import lombok.Data; import lombok.Data;
@ -8,16 +14,37 @@ import javax.validation.constraints.NotNull;
@Data @Data
public class ApprovalListForm { public class ApprovalListForm {
/**
* 模板名称
*/
private String templateName; private String templateName;
/**
* 用户名
*/
private String username; private String username;
/**
* 创建日期
*/
private String createDate; private String createDate;
/**
* 状态
*/
private String status; private String status;
/**
* 用户ID
*/
@NotBlank(message = "用户不能为空") @NotBlank(message = "用户不能为空")
private String userId; private String userId;
/**
* 页码
*/
@NotNull(message = "页码不能为空") @NotNull(message = "页码不能为空")
@Min(value = 1, message = "页码不能小于1") @Min(value = 1, message = "页码不能小于1")
private Integer pageNumber; private Integer pageNumber;
/**
* 每页大小
*/
@NotNull(message = "每页条数不能为空") @NotNull(message = "每页条数不能为空")
@Min(value = 1, message = "每页条数不能小于1") @Min(value = 1, message = "每页条数不能小于1")
private Integer pageSize; private Integer pageSize;

View File

@ -1,3 +1,9 @@
/**
* 部门用户表单类用于接收部门用户相关的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import lombok.Data; import lombok.Data;
@ -6,7 +12,13 @@ import javax.validation.constraints.NotBlank;
@Data @Data
public class DepartmentUserForm { public class DepartmentUserForm {
/**
* 部门ID
*/
@NotBlank @NotBlank
private String departmentId; private String departmentId;
/**
* 关键字
*/
private String key; private String key;
} }

View File

@ -1,9 +1,21 @@
/**
* 导出模板表单类用于接收导出模板相关的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import lombok.Data; import lombok.Data;
@Data @Data
public class ExportTemplateForm { public class ExportTemplateForm {
/**
* 模板行ID
*/
private String templateRowId; private String templateRowId;
/**
* 模板是否为空
*/
private boolean templateEmpty; private boolean templateEmpty;
} }

View File

@ -1,3 +1,9 @@
/**
* 填写人员表单类用于接收填写人员相关的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import lombok.Data; import lombok.Data;
@ -6,14 +12,29 @@ import javax.validation.constraints.NotBlank;
@Data @Data
public class FilledPersonForm { public class FilledPersonForm {
/**
* 部门ID
*/
@NotBlank(message = "部门不能为空") @NotBlank(message = "部门不能为空")
private String departmentId; private String departmentId;
/**
* 用户ID
*/
@NotBlank(message = "用户不能为空") @NotBlank(message = "用户不能为空")
private String userId; private String userId;
/**
* 部门名称
*/
@NotBlank(message = "部门名不能为空") @NotBlank(message = "部门名不能为空")
private String department; private String department;
/**
* 子系统名称
*/
@NotBlank(message = "子系统不能为空") @NotBlank(message = "子系统不能为空")
private String subsystem; private String subsystem;
/**
* 零部件名称
*/
@NotBlank(message = "零部件名不能为空") @NotBlank(message = "零部件名不能为空")
private String partsName; private String partsName;
} }

View File

@ -1,3 +1,9 @@
/**
* 插入模板表单类用于接收插入模板相关的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import lombok.Data; import lombok.Data;
@ -6,9 +12,15 @@ import javax.validation.constraints.NotBlank;
@Data @Data
public class InsertTemplateForm { public class InsertTemplateForm {
/**
* 用户ID
*/
@NotBlank(message = "用户不能为空") @NotBlank(message = "用户不能为空")
private String userId; private String userId;
/**
* 模板名称
*/
@NotBlank(message = "模板名不能为空") @NotBlank(message = "模板名不能为空")
private String templateName; private String templateName;
} }

View File

@ -1,3 +1,9 @@
/**
* 模型公共参数类用于存储模型公共参数的基本信息
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import lombok.Data; import lombok.Data;
@ -6,7 +12,16 @@ import java.util.List;
@Data @Data
public class ModelCommon { public class ModelCommon {
private String commonName; /**
private String commonId; * 子系统列表
*/
List<ModelCommonItem> subsystems; List<ModelCommonItem> subsystems;
/**
* 公共名称
*/
private String commonName;
/**
* 公共ID
*/
private String commonId;
} }

View File

@ -1,3 +1,9 @@
/**
* 模型公共项类用于存储模型公共项的相关信息
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import com.xdap.self_development.domain.view.ParametersView; import com.xdap.self_development.domain.view.ParametersView;
@ -7,6 +13,12 @@ import java.util.List;
@Data @Data
public class ModelCommonItem { public class ModelCommonItem {
private String subsystem; /**
* 参数视图列表
*/
List<ParametersView> parameters; List<ParametersView> parameters;
/**
* 子系统名称
*/
private String subsystem;
} }

View File

@ -1,13 +1,34 @@
/**
* 选项表单类用于接收选项相关的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import lombok.Data; import lombok.Data;
@Data @Data
public class OptionForm { public class OptionForm {
/**
* 模板名称
*/
private String templateName; private String templateName;
/**
* 模板是否为空
*/
private Boolean templateEmpty; private Boolean templateEmpty;
/**
* 参数类型
*/
private String parameterType; private String parameterType;
/**
* 零部件名称
*/
private String partsName; private String partsName;
/**
* 参数名称
*/
private String parameterName; private String parameterName;
} }

View File

@ -1,40 +1,81 @@
/**
* 参数表单用于接收参数相关的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import lombok.Data; import lombok.Data;
import org.springframework.web.bind.annotation.RequestParam;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
@Data @Data
public class ParameterForm { public class ParameterForm {
/**
* 参数ID
*/
private String parameterId; private String parameterId;
/**
* 参数序号
*/
private Integer parameterNumber; private Integer parameterNumber;
/**
* 子系统名称
*/
@NotBlank(message = "子系统不能为空") @NotBlank(message = "子系统不能为空")
private String subsystemName; private String subsystemName;
/**
* 参数类型
*/
@NotBlank(message = "类型不能为空") @NotBlank(message = "类型不能为空")
private String parameterType; private String parameterType;
/**
* 零部件名称
*/
@NotBlank(message = "零部件名称不能为空") @NotBlank(message = "零部件名称不能为空")
private String partsName; private String partsName;
/**
* 参数名称
*/
@NotBlank(message = "参数名不能为空") @NotBlank(message = "参数名不能为空")
private String parameterName; private String parameterName;
/**
* 单位
*/
private String unit; private String unit;
/**
* 参数来源
*/
@NotBlank(message = "参数来源不能为空") @NotBlank(message = "参数来源不能为空")
private String parameterSource; private String parameterSource;
/**
* 编号或公式
*/
private String numberOrFormula; private String numberOrFormula;
/**
* 部门
*/
@NotBlank(message = "部门不能为空") @NotBlank(message = "部门不能为空")
private String department; private String department;
/**
* 备注
*/
private String remarks; private String remarks;
/**
* 操作
*/
private String operation; private String operation;
} }

View File

@ -1,3 +1,9 @@
/**
* 开始审批请求表单用于接收启动审批流程的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import com.xdap.self_development.domain.dto.ApprovalNodeDTO; import com.xdap.self_development.domain.dto.ApprovalNodeDTO;
@ -10,14 +16,28 @@ import java.util.List;
@Data @Data
public class StartApprovalRequest { public class StartApprovalRequest {
@NotBlank(message = "用户不能为空") @NotBlank(message = "用户不能为空")
/**
* 用户ID
*/
private String userId; private String userId;
@NotBlank(message = "流程标题不能为空") @NotBlank(message = "流程标题不能为空")
/**
* 流程标题
*/
private String processTitle; private String processTitle;
@NotBlank(message = "请选择审核内容") @NotBlank(message = "请选择审核内容")
/**
* 模板行ID
*/
private String templateRowId; private String templateRowId;
// 审批环节配置列表 /**
* 审批环节配置列表
*/
@NotEmpty(message = "环节不能为空") @NotEmpty(message = "环节不能为空")
private List<ApprovalNodeDTO> nodeList; private List<ApprovalNodeDTO> nodeList;
/**
* 说明
*/
private String explanation; private String explanation;
} }

View File

@ -1,3 +1,9 @@
/**
* 模板表单类用于接收模板相关的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import lombok.Data; import lombok.Data;
@ -5,25 +11,73 @@ import lombok.Data;
@Data @Data
public class TemplateForm { public class TemplateForm {
// 通用 // 通用
/**
* 子系统名称
*/
private String subsystemName; private String subsystemName;
/**
* 参数类型
*/
private String parameterType; private String parameterType;
/**
* 零部件名称
*/
private String partsName; private String partsName;
/**
* 参数名称
*/
private String parameterName; private String parameterName;
/**
* 单位
*/
private String unit; private String unit;
/**
* 参数来源
*/
private String parameterSource; private String parameterSource;
/**
* 计算公式
*/
private String calculationFormula; private String calculationFormula;
/**
* 部门
*/
private String department; private String department;
/**
* 备注
*/
private String remarks; private String remarks;
// 额外 // 额外
/**
* 参数模板名称
*/
private String parameterTemplateName; private String parameterTemplateName;
/**
* 数据源
*/
private String dataSource; private String dataSource;
/**
* 分类编号
*/
private Long classificationNumber; private Long classificationNumber;
/**
* 是否公告参数
*/
private String isAnnouncementParameters; private String isAnnouncementParameters;
/**
* 类型
*/
private String type; private String type;
/**
* 编号或公式
*/
private String numberOrFormula; private String numberOrFormula;
// 模板名称暂时为sheet页名称 // 模板名称暂时为sheet页名称
/**
* 模板名称
*/
private String templateName; private String templateName;

View File

@ -1,3 +1,9 @@
/**
* 更新填写人员表单类用于接收更新填写人员相关的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import lombok.Data; import lombok.Data;
@ -6,16 +12,34 @@ import javax.validation.constraints.NotBlank;
@Data @Data
public class UpdateFilledPersonForm { public class UpdateFilledPersonForm {
/**
* 行ID
*/
@NotBlank @NotBlank
private String rowId; private String rowId;
/**
* 部门ID
*/
@NotBlank(message = "部门不能为空") @NotBlank(message = "部门不能为空")
private String departmentId; private String departmentId;
/**
* 用户ID
*/
@NotBlank(message = "用户不能为空") @NotBlank(message = "用户不能为空")
private String userId; private String userId;
/**
* 部门名称
*/
@NotBlank(message = "部门名不能为空") @NotBlank(message = "部门名不能为空")
private String department; private String department;
/**
* 子系统名称
*/
@NotBlank(message = "子系统不能为空") @NotBlank(message = "子系统不能为空")
private String subsystem; private String subsystem;
/**
* 零部件名称
*/
@NotBlank(message = "零部件名不能为空") @NotBlank(message = "零部件名不能为空")
private String partsName; private String partsName;
} }

View File

@ -1,3 +1,9 @@
/**
* 更新参数表单类用于接收更新参数相关的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.form; package com.xdap.self_development.controller.form;
import lombok.Data; import lombok.Data;
@ -9,10 +15,19 @@ import java.util.List;
@Data @Data
public class UpdateParameterForm { public class UpdateParameterForm {
/**
* 模板行ID
*/
@NotBlank(message = "模板不能为空") @NotBlank(message = "模板不能为空")
private String templateRowId; private String templateRowId;
/**
* 参数表单列表
*/
@Valid @NotEmpty(message = "请至少修改一项参数") @Valid @NotEmpty(message = "请至少修改一项参数")
private List<ParameterForm> parameterForms; private List<ParameterForm> parameterForms;
/**
* 用户ID
*/
@NotBlank(message = "用户不能为空") @NotBlank(message = "用户不能为空")
private String userId; private String userId;
} }

View File

@ -1,24 +1,25 @@
package com.xdap.self_development.controller.request; package com.xdap.self_development.controller.request;
import com.definesys.mpaas.query.annotation.Table;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.List; import java.util.List;
/** /**
* <p> * 分析请求类用于接收数据分析相关的请求参数
* 待办事项表
* </p>
* *
* @author Lys111 * @version 1.0
* @since 2025-11-18 * @since 2025
*/ */
@Data @Data
public class AnalysisRequest{ public class AnalysisRequest{
/**
* 用户ID
*/
private String userID; private String userID;
/**
* 发动机型号ID
*/
private String engineModelID; private String engineModelID;
/** /**
* 子系统+零部件名称路径 * 子系统+零部件名称路径

View File

@ -1,21 +1,18 @@
/**
* 数据录入发动机型号Excel类用于处理发动机型号数据的Excel导入导出
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.request; package com.xdap.self_development.controller.request;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.definesys.mpaas.query.model.MpaasBasePojo;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
/**
* <p>
* 发动机型号数据表
* </p>
*
* @author Lys111
* @since 2025-11-12
*/
@Data @Data
public class DataEntryEngineModelExcel { public class DataEntryEngineModelExcel {
@ -81,19 +78,19 @@ public class DataEntryEngineModelExcel {
// @ExcelProperty("品牌") // @ExcelProperty("品牌")
private String brand; private String brand;
/** /**
* 品牌 * 排放
*/ */
@ExcelProperty("排放") @ExcelProperty("排放")
private String emission; private String emission;
/** /**
* 品牌 * 燃烧类型
*/ */
@ExcelProperty("燃烧类型") @ExcelProperty("燃烧类型")
private String burnType; private String burnType;
/** /**
* 品牌 * 排量
*/ */
@ExcelProperty("排量") @ExcelProperty("排量")
private String engineCapacity; private String engineCapacity;
@ -124,12 +121,12 @@ public class DataEntryEngineModelExcel {
// private String resPersonId; // private String resPersonId;
/** /**
* sheetName * sheet名称
*/ */
@ExcelIgnore @ExcelIgnore
private String sheetName; private String sheetName;
/** /**
* rowIndex * 行索引
*/ */
@ExcelIgnore @ExcelIgnore
private Integer rowIndex; private Integer rowIndex;

View File

@ -1,17 +1,15 @@
/**
* 引擎参数详情Excel类用于处理引擎参数详情的Excel导入导出
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.request; package com.xdap.self_development.controller.request;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data; import lombok.Data;
/**
* <p>
* 参数详情
* </p>
*
* @author Lys111
* @since 2025-11-13
*/
@Data @Data
public class EngineParamDetailExcel { public class EngineParamDetailExcel {
/** /**
@ -74,12 +72,12 @@ public class EngineParamDetailExcel {
@ExcelIgnore @ExcelIgnore
private String filledBy; private String filledBy;
/** /**
* sheetName * sheet名称
*/ */
@ExcelIgnore @ExcelIgnore
private String sheetName; private String sheetName;
/** /**
* rowIndex * 行索引
*/ */
@ExcelIgnore @ExcelIgnore
private Integer rowIndex; private Integer rowIndex;

View File

@ -1,9 +1,21 @@
/**
* 模型项请求类用于接收模型相关的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.request; package com.xdap.self_development.controller.request;
import lombok.Data; import lombok.Data;
@Data @Data
public class ModelItem { public class ModelItem {
/**
* 模型ID
*/
private String modelId; private String modelId;
/**
* 参数版本
*/
private String parameterVersion; private String parameterVersion;
} }

View File

@ -1,20 +1,17 @@
/**
* 待办任务请求类用于处理待办任务相关的请求参数
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.controller.request; package com.xdap.self_development.controller.request;
import com.definesys.mpaas.query.annotation.Table;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable; import java.io.Serializable;
/**
* <p>
* 待办事项表
* </p>
*
* @author Lys111
* @since 2025-11-18
*/
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class TodoTaskRequest implements Serializable { public class TodoTaskRequest implements Serializable {

View File

@ -1,3 +1,9 @@
/**
* 流程数据与记录传输对象用于存储流程审批的相关信息
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.dto; package com.xdap.self_development.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@ -10,15 +16,42 @@ import java.util.List;
@Data @Data
public class ActivitiDataAndRecordDTO { public class ActivitiDataAndRecordDTO {
/**
* 审批状态
*/
private String approvalStatus; private String approvalStatus;
/**
* 流程标题
*/
private String processTitle; private String processTitle;
/**
* 模型名称
*/
private String modelName; private String modelName;
/**
* 创建人
*/
private String createBy; private String createBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
/**
* 创建时间
*/
private Date createTime; private Date createTime;
/**
* 当前节点
*/
private String currentNode; private String currentNode;
/**
* 处理人
*/
private String processor; private String processor;
/**
* 流程数据传输对象列表
*/
private ArrayList<ActivitiDataDTO> activitiDataDTOS; private ArrayList<ActivitiDataDTO> activitiDataDTOS;
/**
* 流程节点列表
*/
private List<FlowNode> flowNodes; private List<FlowNode> flowNodes;
} }

View File

@ -1,3 +1,9 @@
/**
* 流程数据传输对象用于存储流程中涉及的产品参数信息
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.dto; package com.xdap.self_development.domain.dto;
import lombok.Data; import lombok.Data;
@ -18,7 +24,9 @@ public class ActivitiDataDTO {
* 类型 * 类型
*/ */
private String parameterType; private String parameterType;
//零部件 /**
* 零部件名称
*/
private String partsName; private String partsName;
/** /**
* 参数名称 * 参数名称

View File

@ -1,15 +1,42 @@
/**
* 应用令牌数据传输对象用于存储应用访问令牌信息
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.dto; package com.xdap.self_development.domain.dto;
import lombok.Data; import lombok.Data;
@Data @Data
public class AppTokenDTO { public class AppTokenDTO {
/**
* 访问令牌
*/
private String access_token; private String access_token;
/**
* 令牌类型
*/
private String token_type; private String token_type;
/**
* 过期时间
*/
private Integer expires_in; private Integer expires_in;
/**
* 权限范围
*/
private String scope; private String scope;
/**
* 租户ID
*/
private String tenant_id; private String tenant_id;
/**
* 应用ID
*/
private String app_id; private String app_id;
/**
* JWT标识符
*/
private String jti; private String jti;
} }

View File

@ -1,3 +1,9 @@
/**
* 审批节点数据传输对象用于存储审批流程中的节点信息
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.dto; package com.xdap.self_development.domain.dto;
import lombok.Data; import lombok.Data;
@ -6,7 +12,16 @@ import java.util.List;
@Data @Data
public class ApprovalNodeDTO { public class ApprovalNodeDTO {
/**
* 节点名称
*/
private String nodeName; private String nodeName;
/**
* 处理人列表
*/
private List<String> assignees; private List<String> assignees;
/**
* 节点顺序
*/
private Integer nodeOrder; private Integer nodeOrder;
} }

View File

@ -1,3 +1,9 @@
/**
* 审批节点列表数据传输对象用于存储多个审批节点的信息
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.dto; package com.xdap.self_development.domain.dto;
import com.xdap.self_development.controller.form.ApprovalUserNodeDTO; import com.xdap.self_development.controller.form.ApprovalUserNodeDTO;
@ -7,8 +13,20 @@ import java.util.List;
@Data @Data
public class ApprovalNodesDTO { public class ApprovalNodesDTO {
/**
* 流程标题
*/
private String processTitle; private String processTitle;
/**
* 节点列表
*/
private List<ApprovalUserNodeDTO> nodeList; private List<ApprovalUserNodeDTO> nodeList;
/**
* 说明
*/
private String explanation; private String explanation;
/**
* 流程ID
*/
private String flowId; private String flowId;
} }

View File

@ -1,3 +1,9 @@
/**
* 审批顺序枚举定义审批流程中各节点的顺序和类型
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.enums; package com.xdap.self_development.domain.enums;
import lombok.Getter; import lombok.Getter;
@ -5,12 +11,30 @@ import lombok.Getter;
@Getter @Getter
public enum ApprovalOrderEnum { public enum ApprovalOrderEnum {
/**
* 校对
*/
PROOFREAD(0,"校对"), PROOFREAD(0,"校对"),
/**
* 审核
*/
REVIEW(1,"审核"), REVIEW(1,"审核"),
/**
* 会签
*/
COUNTERSIGN(2,"会签"), COUNTERSIGN(2,"会签"),
/**
* 批准
*/
APPROVE(3,"批准"); APPROVE(3,"批准");
/**
* 编码
*/
private final Integer code; private final Integer code;
/**
* 描述
*/
private final String desc; private final String desc;
ApprovalOrderEnum(Integer code, String desc) { ApprovalOrderEnum(Integer code, String desc) {

View File

@ -1,3 +1,9 @@
/**
* 当前节点枚举定义流程中的不同节点类型
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.enums; package com.xdap.self_development.domain.enums;
import lombok.Getter; import lombok.Getter;
@ -5,9 +11,21 @@ import lombok.Getter;
@Getter @Getter
public enum CurrentNodeEnum { public enum CurrentNodeEnum {
/**
* 数据维护
*/
REPAIR("数据维护"), REPAIR("数据维护"),
/**
* 任务分解
*/
JOBSPLIT("任务分解"), JOBSPLIT("任务分解"),
/**
* 数据审批
*/
DATAAPPROVAL("数据审批"); DATAAPPROVAL("数据审批");
/**
* 描述
*/
private final String desc; private final String desc;
CurrentNodeEnum(String desc) { CurrentNodeEnum(String desc) {

View File

@ -1,3 +1,9 @@
/**
* 分发状态枚举定义数据分发的不同状态
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.enums; package com.xdap.self_development.domain.enums;
import lombok.Getter; import lombok.Getter;
@ -5,11 +11,26 @@ import lombok.Getter;
@Getter @Getter
public enum DistributeStatusEnum { public enum DistributeStatusEnum {
/**
* 已分发
*/
DISTRIBUTED(1, "已分发"), DISTRIBUTED(1, "已分发"),
/**
* 未分发
*/
UNDISTRIBUTED(2, "未分发"), UNDISTRIBUTED(2, "未分发"),
/**
* 部分分发
*/
PART(3, "部分分发"); PART(3, "部分分发");
/**
* 编码
*/
private final Integer code; private final Integer code;
/**
* 描述
*/
private final String desc; private final String desc;
DistributeStatusEnum(Integer code, String desc) { DistributeStatusEnum(Integer code, String desc) {

View File

@ -1,10 +1,22 @@
/**
* 参数操作枚举定义参数的各种操作类型
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.enums; package com.xdap.self_development.domain.enums;
public enum ParamOperationEnum { public enum ParamOperationEnum {
//新增 /**
* 新增
*/
INSERT, INSERT,
//修改 /**
* 修改
*/
UPDATE, UPDATE,
//删除 /**
* 删除
*/
DELETE DELETE
} }

View File

@ -1,3 +1,9 @@
/**
* 参数权限枚举定义参数操作的不同权限级别
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.enums; package com.xdap.self_development.domain.enums;
import lombok.Getter; import lombok.Getter;
@ -5,10 +11,22 @@ import lombok.Getter;
@Getter @Getter
public enum ParamPermissionEnum { public enum ParamPermissionEnum {
/**
* 查看
*/
REVIEW(1, "查看"), REVIEW(1, "查看"),
/**
* 编辑
*/
EDITOR(2, "编辑"); EDITOR(2, "编辑");
/**
* 编码
*/
private final Integer code; private final Integer code;
/**
* 描述
*/
private final String desc; private final String desc;
ParamPermissionEnum(Integer code, String desc) { ParamPermissionEnum(Integer code, String desc) {

View File

@ -1,3 +1,9 @@
/**
* 参数值版本枚举定义参数值的不同版本状态
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.enums; package com.xdap.self_development.domain.enums;
import lombok.Getter; import lombok.Getter;
@ -5,13 +11,34 @@ import lombok.Getter;
@Getter @Getter
public enum ParamValueVersionEnum { public enum ParamValueVersionEnum {
/**
* 已通过
*/
PASSED(0,"已通过"), PASSED(0,"已通过"),
/**
* 草稿
*/
DRAFT(1,"草稿"), DRAFT(1,"草稿"),
/**
* 审核中
*/
UNDER(2,"审核中"), UNDER(2,"审核中"),
/**
* 已撤回
*/
WITHDRAWN(3,"已撤回"), WITHDRAWN(3,"已撤回"),
/**
* 已拒绝
*/
REFUSE(4,"已拒绝"); REFUSE(4,"已拒绝");
/**
* 编码
*/
private final Integer code; private final Integer code;
/**
* 描述
*/
private final String desc; private final String desc;
ParamValueVersionEnum(Integer code, String desc) { ParamValueVersionEnum(Integer code, String desc) {

View File

@ -1,3 +1,9 @@
/**
* 参数操作枚举定义参数操作的不同类型
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.enums; package com.xdap.self_development.domain.enums;
import lombok.Getter; import lombok.Getter;
@ -6,12 +12,30 @@ import java.util.Arrays;
@Getter @Getter
public enum ParameterOperationEnum { public enum ParameterOperationEnum {
/**
* 新增
*/
INSERT("insert", "新增"), INSERT("insert", "新增"),
/**
* 更新
*/
UPDATE("update", "更新"), UPDATE("update", "更新"),
/**
* 删除
*/
DELETE("delete", "删除"), DELETE("delete", "删除"),
/**
* 未修改
*/
UNCHANGED("unchanged", "未修改"); UNCHANGED("unchanged", "未修改");
/**
* 编码
*/
private final String code; private final String code;
/**
* 描述
*/
private final String description; private final String description;
ParameterOperationEnum(String code, String description) { ParameterOperationEnum(String code, String description) {

View File

@ -9,26 +9,71 @@ import lombok.EqualsAndHashCode;
@SQL(view = "queryCommon", @SQL(view = "queryCommon",
sql = "select cp.*, c.common_name from yfsjglpt_common_parameter c left join yfsjglpt_analysis_common_parameters cp on c.id = cp.common_id where c.common_type = 2 and c.create_by = #userId") sql = "select cp.*, c.common_name from yfsjglpt_common_parameter c left join yfsjglpt_analysis_common_parameters cp on c.id = cp.common_id where c.common_type = 2 and c.create_by = #userId")
}) })
/**
* 分析公共参数实体类用于存储分析相关的公共参数信息
*
* @version 1.0
* @since 2025
*/
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@Table("yfsjglpt_analysis_common_parameters") @Table("yfsjglpt_analysis_common_parameters")
public class AnalysisCommonParametersPojo extends MpaasBasePojo { public class AnalysisCommonParametersPojo extends MpaasBasePojo {
@RowID(sequence = "analysis_common_parameters_s", type = RowIDType.UUID) @RowID(sequence = "analysis_common_parameters_s", type = RowIDType.UUID)
/**
* ID
*/
private String id; private String id;
/**
* 模型名称
*/
private String modelName; private String modelName;
/**
* 平台
*/
private String plate; private String plate;
/**
* 平台
*/
private String platform; private String platform;
/**
* 系列
*/
private String series; private String series;
/**
* 项目名称
*/
private String projectName; private String projectName;
/**
* 项目编号
*/
private String projectNumber; private String projectNumber;
/**
* 排放
*/
private Long emission; private Long emission;
/**
* 最小排量
*/
private Long displacementMin; private Long displacementMin;
/**
* 最大排量
*/
private Long displacementMax; private Long displacementMax;
/**
* 燃烧类型
*/
private String combustionType; private String combustionType;
/**
* 公共ID
*/
private String commonId; private String commonId;
@Column(type = ColumnType.CALCULATE) @Column(type = ColumnType.CALCULATE)
/**
* 公共名称
*/
private String commonName; private String commonName;
} }

View File

@ -11,12 +11,10 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* <p> * 审批配置实体类用于存储流程配置信息
* 流程配置表
* </p>
* *
* @author Lys111 * @version 1.0
* @since 2025-11-26 * @since 2025
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

View File

@ -1,3 +1,9 @@
/**
* 审批用户实体类用于存储审批流程中的用户信息
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.pojo; package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.Table; import com.definesys.mpaas.query.annotation.Table;
@ -9,6 +15,12 @@ import lombok.EqualsAndHashCode;
@Table("xdap_users") @Table("xdap_users")
@Data @Data
public class ApprovalXdapUsersPojo extends NoTenBasePojo { public class ApprovalXdapUsersPojo extends NoTenBasePojo {
/**
* 用户ID
*/
private String id; private String id;
/**
* 用户名
*/
private String username; private String username;
} }

View File

@ -13,35 +13,104 @@ import java.sql.Timestamp;
@SQL(view = "getReportById", @SQL(view = "getReportById",
sql = "SELECT ymbr.series, ymbr.id, ymbr.title, ymbr.manufacturer_name, ymbr.model_name, ymbr.module , ymbr.manufacturer_abbreviation, ymbr.model_abbreviation, ymbr.product_number, ymbr.plate, ymbr.platform , ymbr.market_segment, ymbr.project_name, ymbr.project_number, ymbr.upload_time, ymbr.file_path , ymbr.status, ymbr.file_name, xu.username AS create_by FROM yfsjglpt_model_benchmarking_report ymbr LEFT JOIN xdap_users xu ON xu.id = ymbr.create_by where ymbr.id = #reportId") sql = "SELECT ymbr.series, ymbr.id, ymbr.title, ymbr.manufacturer_name, ymbr.model_name, ymbr.module , ymbr.manufacturer_abbreviation, ymbr.model_abbreviation, ymbr.product_number, ymbr.plate, ymbr.platform , ymbr.market_segment, ymbr.project_name, ymbr.project_number, ymbr.upload_time, ymbr.file_path , ymbr.status, ymbr.file_name, xu.username AS create_by FROM yfsjglpt_model_benchmarking_report ymbr LEFT JOIN xdap_users xu ON xu.id = ymbr.create_by where ymbr.id = #reportId")
}) })
/**
* 对标报告实体类用于存储对标报告的基本信息
*
* @version 1.0
* @since 2025
*/
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@Table("yfsjglpt_model_benchmarking_report") @Table("yfsjglpt_model_benchmarking_report")
@NoArgsConstructor @NoArgsConstructor
public class BenchmarkingReportPojo extends MpaasBasePojo { public class BenchmarkingReportPojo extends MpaasBasePojo {
@RowID(sequence = "benchmarking_report_s", type = RowIDType.UUID) @RowID(sequence = "benchmarking_report_s", type = RowIDType.UUID)
/**
* ID
*/
private String id; private String id;
/**
* 标题
*/
private String title; private String title;
/**
* 制造商名称
*/
private String manufacturerName; private String manufacturerName;
/**
* 模型名称
*/
private String modelName; private String modelName;
/**
* 模块
*/
private String module; private String module;
/**
* 制造商简称
*/
private String manufacturerAbbreviation; private String manufacturerAbbreviation;
/**
* 模型简称
*/
private String modelAbbreviation; private String modelAbbreviation;
/**
* 产品编号
*/
private String productNumber; private String productNumber;
/**
* 平台
*/
private String plate; private String plate;
/**
* 平台
*/
private String platform; private String platform;
/**
* 系列
*/
private String series; private String series;
/**
* 市场细分
*/
private String marketSegment; private String marketSegment;
/**
* 项目名称
*/
private String projectName; private String projectName;
/**
* 项目编号
*/
private String projectNumber; private String projectNumber;
/**
* 退回次数
*/
private Integer returnNum; private Integer returnNum;
/**
* 创建人
*/
private String createBy; private String createBy;
/**
* 是否删除
*/
private Integer isDelete; private Integer isDelete;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
/**
* 上传时间
*/
private Timestamp uploadTime; private Timestamp uploadTime;
/**
* 文件路径
*/
private String filePath; private String filePath;
/**
* 文件名
*/
private String fileName; private String fileName;
/**
* 状态
*/
private String status; private String status;
} }

View File

@ -12,12 +12,10 @@ import lombok.EqualsAndHashCode;
import java.util.Date; import java.util.Date;
/** /**
* <p> * 数据录入发动机型号实体类用于存储发动机型号相关的基本信息
* 发动机型号数据表
* </p>
* *
* @author Lys111 * @version 1.0
* @since 2025-11-12 * @since 2025
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

View File

@ -10,12 +10,10 @@ import lombok.EqualsAndHashCode;
import java.util.Date; import java.util.Date;
/** /**
* <p> * 引擎参数详情实体类用于存储引擎参数的详细信息
* 参数详情
* </p>
* *
* @author Lys111 * @version 1.0
* @since 2025-11-13 * @since 2025
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

View File

@ -12,12 +12,10 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* <p> * 引擎审核列表实体类用于存储引擎审核流程的相关信息
* 发动机审核列表
* </p>
* *
* @author Lys111 * @version 1.0
* @since 2025-11-26 * @since 2025
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

View File

@ -1,3 +1,9 @@
/**
* 参数实体类用于存储模型参数的基本信息
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.pojo; package com.xdap.self_development.domain.pojo;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
@ -32,37 +38,79 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
public class ParameterPojo extends MpaasBasePojo { public class ParameterPojo extends MpaasBasePojo {
@RowID(sequence = "parameter_s", type = RowIDType.UUID) @RowID(sequence = "parameter_s", type = RowIDType.UUID)
/**
* 参数ID
*/
private String id; private String id;
@ExcelProperty("序号") @ExcelProperty("序号")
/**
* 参数序号
*/
private Integer parameterNumber; private Integer parameterNumber;
@ExcelProperty("子系统") @ExcelProperty("子系统")
/**
* 子系统名称
*/
private String subsystemName; private String subsystemName;
@ExcelProperty("类型") @ExcelProperty("类型")
/**
* 参数类型
*/
private String parameterType; private String parameterType;
@ExcelProperty("零部件名称") @ExcelProperty("零部件名称")
/**
* 零部件名称
*/
private String partsName; private String partsName;
@ExcelProperty("参数名称") @ExcelProperty("参数名称")
/**
* 参数名称
*/
private String parameterName; private String parameterName;
@ExcelProperty("单位") @ExcelProperty("单位")
/**
* 参数单位
*/
private String unit; private String unit;
@ExcelProperty("参数计划来源") @ExcelProperty("参数计划来源")
/**
* 参数来源
*/
private String parameterSource; private String parameterSource;
@ExcelProperty("当前可适用的分类属性表编号(需要修订)或公式") @ExcelProperty("当前可适用的分类属性表编号(需要修订)或公式")
/**
* 分类属性表编号或公式
*/
private String numberOrFormula; private String numberOrFormula;
@ExcelProperty("填写部门") @ExcelProperty("填写部门")
/**
* 填写部门
*/
private String department; private String department;
@ExcelProperty("备注") @ExcelProperty("备注")
/**
* 备注信息
*/
private String remarks; private String remarks;
@ExcelIgnore @ExcelIgnore
/**
* 创建者
*/
private String createdBy; private String createdBy;
@ExcelIgnore @ExcelIgnore
@Column(type=ColumnType.CALCULATE) @Column(type=ColumnType.CALCULATE)
/**
* 排序号
*/
private Integer orderNum; private Integer orderNum;
@ExcelIgnore @ExcelIgnore
@Column(value = "max_number",type=ColumnType.CALCULATE) @Column(value = "max_number",type=ColumnType.CALCULATE)
/**
* 最大序号
*/
private Integer maxNumber; private Integer maxNumber;
public ParameterPojo(Integer parameterNumber, String subsystemName, String parameterType, public ParameterPojo(Integer parameterNumber, String subsystemName, String parameterType,

View File

@ -1,3 +1,9 @@
/**
* 模板实体类用于存储模型模板的基本信息
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.pojo; package com.xdap.self_development.domain.pojo;
import com.definesys.mpaas.query.annotation.*; import com.definesys.mpaas.query.annotation.*;
@ -28,20 +34,49 @@ import java.sql.Timestamp;
@NoArgsConstructor @NoArgsConstructor
public class TemplatePojo extends MpaasBasePojo { public class TemplatePojo extends MpaasBasePojo {
@RowID(sequence = "template_s", type = RowIDType.UUID) @RowID(sequence = "template_s", type = RowIDType.UUID)
/**
* 模板ID
*/
private String id; private String id;
/**
* 模板名称
*/
private String templateName; private String templateName;
/**
* 版本号
*/
private Integer version; private Integer version;
//DRAFT(草稿)APPROVING审批中COMPLETE(已完成) /**
* 状态DRAFT草稿APPROVING审批中COMPLETE已完成
*/
private String status; private String status;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp createdTime; private Timestamp createdTime;
/**
* 发布时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp publishedTime; private Timestamp publishedTime;
/**
* 排序号
*/
private Long orderNum; private Long orderNum;
/**
* 创建者
*/
private String createBy; private String createBy;
/**
* 退回次数
*/
private Integer returnNum; private Integer returnNum;
@Column(type = ColumnType.CALCULATE) @Column(type = ColumnType.CALCULATE)
/**
* 最大排序号
*/
private Integer maxOrder; private Integer maxOrder;
public TemplatePojo(String templateName, Integer version, String status, public TemplatePojo(String templateName, Integer version, String status,

View File

@ -1,3 +1,9 @@
/**
* 分析模型参数视图用于展示分析模型的参数信息
*
* @version 1.0
* @since 2025
*/
package com.xdap.self_development.domain.view; package com.xdap.self_development.domain.view;
import com.xdap.self_development.domain.pojo.EngineParamDetailPojo; import com.xdap.self_development.domain.pojo.EngineParamDetailPojo;
@ -7,15 +13,48 @@ import java.util.List;
@Data @Data
public class AnalysisModelParamterView { public class AnalysisModelParamterView {
private String modelID; /**
private String modelName; * 引擎参数详情列表
private String plate; */
private String platform;
private String series;
private String projectName;
private String projectNumber;
private String emission;
private String burnType;
private String engineCapacity;
List<EngineParamDetailPojo> pojos; List<EngineParamDetailPojo> pojos;
/**
* 模型ID
*/
private String modelID;
/**
* 模型名称
*/
private String modelName;
/**
* 平台
*/
private String plate;
/**
* 平台
*/
private String platform;
/**
* 系列
*/
private String series;
/**
* 项目名称
*/
private String projectName;
/**
* 项目编号
*/
private String projectNumber;
/**
* 排放
*/
private String emission;
/**
* 燃烧类型
*/
private String burnType;
/**
* 发动机容量
*/
private String engineCapacity;
} }