新增xispeak内常量类,新增DeptApproveDetailMap解决json反序列化时泛型擦除问题,xispeak实体类新增密级

This commit is contained in:
wsm
2026-05-22 16:28:02 +08:00
parent 69c3d05302
commit e3be62749d
5 changed files with 37 additions and 4 deletions
@@ -0,0 +1,18 @@
package org.jeecg.modules.bg.xispeak.constant;
/**
* 语音/演讲模块常量类
*/
public final class XiSpeakConstant {
// 1. 私有化构造器,不允许外部 new 实例化
private XiSpeakConstant() {
throw new UnsupportedOperationException("This is a constant class and cannot be instantiated");
}
// 3. 建议:使用内部类进行“业务分组”
public static final class CompletionStatus {
public static final int FINISHED = 1; // 已完成
public static final int UN_FINISHED = 0; // 未完成
}
}
@@ -82,6 +82,11 @@ public class BgXiSpeak implements Serializable {
@Excel(name = "学习传达研究部署情况", width = 15) @Excel(name = "学习传达研究部署情况", width = 15)
@Schema(description = "学习传达研究部署情况") @Schema(description = "学习传达研究部署情况")
private java.lang.String status; private java.lang.String status;
/**密级*/
@Excel(name = "密级", width = 15)
@Dict(dicCode = "secret_level")
@Schema(description = "密级")
private java.lang.String secretLevel;
/**责任人*/ /**责任人*/
@Excel(name = "责任人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") @Excel(name = "责任人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@@ -174,7 +179,7 @@ public class BgXiSpeak implements Serializable {
private java.util.Date deadline; private java.util.Date deadline;
@TableField(typeHandler = JacksonTypeHandler.class) @TableField(typeHandler = JacksonTypeHandler.class)
private Map<String, DeptApproveDetail> approveInfo; private DeptApproveDetailMap approveInfo;
/**督办次数*/ /**督办次数*/
@Excel(name = "发起类型", width = 15) @Excel(name = "发起类型", width = 15)
@@ -161,6 +161,6 @@ public class BgXiSpeakFeedback implements Serializable {
/**审批信息Map*/ /**审批信息Map*/
@TableField(typeHandler = JacksonTypeHandler.class) @TableField(typeHandler = JacksonTypeHandler.class)
private Map<String, DeptApproveDetail> approveInfo; private DeptApproveDetailMap approveInfo;
} }
@@ -1,17 +1,21 @@
package org.jeecg.modules.bg.xispeak.entity; package org.jeecg.modules.bg.xispeak.entity;
import com.fasterxml.jackson.annotation.JsonAlias;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.util.List; import java.util.List;
@Data @Data
@NoArgsConstructor // 必须确保有这个 @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class DeptApproveDetail { public class DeptApproveDetail {
private String deptId; // 部门ID private String deptId; // 部门ID
private String approverId; // 审批人ID(从监听器获取的) private String approverId; // 审批人ID(从监听器获取的)
private String approverName; // 审批人姓名(可选) private String approverName; // 审批人姓名(可选)
@JsonAlias("implUserId")
private List<String> implUserIdList; // 落实人Id private List<String> implUserIdList; // 落实人Id
@JsonAlias("implUserName")
private List<String> implUserNameList; // 落实人姓名 private List<String> implUserNameList; // 落实人姓名
} }
@@ -0,0 +1,6 @@
package org.jeecg.modules.bg.xispeak.entity;
import java.util.LinkedHashMap;
public class DeptApproveDetailMap extends LinkedHashMap<String, DeptApproveDetail> {
}