From 18b76f38743adf5c550098c658447693c2f4dbbd Mon Sep 17 00:00:00 2001 From: yanyujia <3406185119@qq.com> Date: Tue, 6 Dec 2022 11:13:56 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=B9=B3=E5=8F=B0-=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 6 +++--- .../cn/estsh/i3plus/pojo/model/common/ExportDataModel.java | 5 +++++ .../cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java | 11 +++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 0a61ed0..b5cab40 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -584,9 +584,9 @@ public class CommonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LOCK_TYPE { - NOT_LOGGED_A_LONG_TIME(1, "not logger a long time", "长时间未登录锁定"), - LOGGER_TOO_MANY_FAILURES(2, "logger too many failures", "登录失败次数过多锁定"), - ADMIN_HAND_MOVEMENT_LOCKING(3, "admin hand movement locking", "管理员手动锁定"); + NOT_LOGIN_A_LONG_TIME(1, "not login a long time", "禁用-长时间未登录"), + LOGGER_TOO_MANY_FAILURES(2, "logger too many failures", "锁定-登录失败次数过多"), + ADMIN_HAND_MOVEMENT_LOCKING(3, "admin hand movement locking", "锁定-管理员手动锁定"); private int value; private String code; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java index 16c6a0f..24211f4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java @@ -22,4 +22,9 @@ public class ExportDataModel { private Integer module; + //**************************************冗余字段***************************************** + private String startDate; + + private String endDate; + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java index 61f629e..b94ef6f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; @@ -42,6 +43,16 @@ public class SysLogRoleChange extends BaseBean { @ApiModelProperty(value = "用户名", access = "用户名") private String userName; + /********************************** 导出冗余信息 ********************************/ + @Column(name = "USER_LOGIN_NAME") + @ApiModelProperty(value = "登录名", access = "登录名") + private String userLoginName; + + @Column(name = "DEPARTMENT_NAME_RDD") + @ApiParam(value = "部门名称", access = "部门名称") + private String departmentNameRdd; + /********************************** 完 ********************************/ + @Column(name = "PREVIOUS_ROLES",columnDefinition = "TEXT") @ApiModelProperty(value = "之前的角色", access = "之前的角色") private String previousRoles; From e6166ab73085c5e0dd2ca70e6a6ecb7e05dbb89c Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Sun, 11 Dec 2022 10:00:28 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=AE=B0=E5=BD=95=E9=97=AE=E9=A2=98---fixbug?= =?UTF-8?q?=2028898?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 1 + .../pojo/platform/model/SysVersionExportModel.java | 22 +++++++++++++++ .../pojo/platform/model/SysVersionModel.java | 33 ++++++++++++++++++++++ .../repository/SysOrderNoRuleRepository.java | 2 ++ 4 files changed, 58 insertions(+) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionExportModel.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionModel.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index fd2f42a..c877076 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -130,6 +130,7 @@ public class SysUser extends BaseBean { @Column(name = "RESET_PASSWORD_TIME") @ApiParam(value = "重置密码的时间") private String resetPasswordTime; + /********************************** 关系信息 ********************************/ @Column(name = "DEPARTMENT_ID") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionExportModel.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionExportModel.java new file mode 100644 index 0000000..e8fd6a0 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionExportModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.platform.model; + +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/12/10 18:04 + * @Modify: + **/ +@Data +public class SysVersionExportModel { + + private String startDate; + + private String endDate; + + private String userName; + + private Long roleId; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionModel.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionModel.java new file mode 100644 index 0000000..3e7bd09 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.platform.model; + +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/12/10 15:56 + * @Modify: + **/ +@Data +public class SysVersionModel { + /** + * sys_version_plan_id + */ + private Long planId; + + private String modifyDateTimeStart; + + private String modifyDateTimeEnd; + /** + * 差异 + */ + private String pojoCompare; + + private Long refId; + + /** + * 角色id + */ + private Long roleId; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRuleRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRuleRepository.java index b5569fa..24e293b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRuleRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRuleRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; +import org.springframework.stereotype.Repository; /** * @Description : 单号规则 @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; * @CreateDate : 2018-11-21 17:15 * @Modify: **/ +@Repository public interface SysOrderNoRuleRepository extends BaseRepository { } From 84da0b941d0135bfe5199df4d1c0c3a2ec2730a4 Mon Sep 17 00:00:00 2001 From: yanyujia <3406185119@qq.com> Date: Sun, 11 Dec 2022 10:21:07 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=99=BB=E5=BD=95-?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 5 +- .../pojo/platform/bean/SysLogRoleOperate.java | 46 ++++++++++++++ .../pojo/platform/bean/SysLogUserStatus.java | 73 ++++++++++++++++++++++ .../estsh/i3plus/pojo/platform/bean/SysUser.java | 8 +++ .../repository/SysLogRoleOperateRepository.java | 14 +++++ .../repository/SysLogUserStatusRepository.java | 14 +++++ 6 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleOperate.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserStatus.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogRoleOperateRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogUserStatusRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index b5cab40..0aaedf4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -526,7 +526,10 @@ public class CommonEnumUtil { // EXPIRE(5, "服务到期", "服务到期_EXPIRE"), LOCKING(3, "fa cell-fa fa-lock", "锁定"), ENABLE(1, "fa fa-success cell-fa fa-check", "启用"), - DISABLE(2, "fa fa-disabled cell-fa fa-times-circle", "禁用"); + DISABLE(2, "fa fa-disabled cell-fa fa-times-circle", "禁用"), + //冗余枚举字段，只作为记录日志状态，不用于用户状态 + ESTABLISH(4, "fa fa-establish cell-fa", "创建"), + DELETE(5, "fa fa-delete cell-fa", "删除"); private int value; private String code; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleOperate.java new file mode 100644 index 0000000..bf7d8c4 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleOperate.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : + * @CreateDate : 2022-12-09 15:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_LOG_ROLE_OPERATE") +@ApiModel(value="角色变更操作记录",description = "角色变更操作记录") +public class SysLogRoleOperate extends BaseBean { + + private static final long serialVersionUID = 4665598896654312569L; + @Column(name="ROLE_ID") + @ApiModelProperty(value ="角色ID" , access ="角色ID") + @AnnoOutputColumn(hidden = true) + private Long roleId; + + @Column(name = "OPERATE") + @ApiParam(value = "操作", access = "操作") + private String operate; + + @Column(name = "OPERATE_CONTEXT") + @ApiParam(value = "操作内容", access = "操作内容") + private String operateContext; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserStatus.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserStatus.java new file mode 100644 index 0000000..cf3a3f8 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserStatus.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : + * @Reference : + * @Author : + * @CreateDate : 2022-12-07 20:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_LOG_USER_STATUS") +@ApiModel(value="用户状态变更记录",description = "用户状态变更记录") +public class SysLogUserStatus extends BaseBean { + + private static final long serialVersionUID = 4665598896654312569L; + @Column(name="USER_ID") + @ApiModelProperty(value ="用户ID" , access ="用户ID") + @AnnoOutputColumn(hidden = true) + private Long userId; + + @Column(name = "USER_NAME") + @ApiParam(value = "用户名称", access = "账号名称") + private String userName; + + @Column(name="LOG_LOGIN_NAME") + @ApiModelProperty(value ="登录名称" , access ="登录名称") + private String logLoginName; + + @Column(name = "DEPARTMENT_NAME_RDD") + @ApiParam(value = "部门名称", access = "部门名称") + private String departmentNameRdd; + + @Column(name = "DEPARTMENT_ID") + @ApiParam(value = "部门ID", access = "部门ID") + private Long departmentId; + + @Column(name = "ROLE_ID") + @ApiParam(value = "用户角色ID逗号分割") + private String roleId; + + @Column(name = "ROLE_NAME") + @ApiParam(value = "用户角色名称逗号分割") + private String roleName; + + @Column(name="USER_STATUS") + @ApiModelProperty(value ="账号状态" , example ="1") + @AnnoOutputColumn(refClass = CommonEnumUtil.USER_LOGIN_STATUS.class) + private Integer userStatus; + + @Column(name="USER_STATUS_RDD") + @ApiModelProperty(value ="账号状态描述") + private String userStatusRdd; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index fd2f42a..5c46be7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -208,6 +208,14 @@ public class SysUser extends BaseBean { @ApiParam(value = "账号所有操作权限信息") private List menuList; + @Transient + @ApiParam(value = "用户角色逗号分割") + private String roleMessage; + + @Transient + @ApiParam(value = "用户状态描述") + private String userStatusRdd; + /*** test ***/ // @Lob // @Basic(fetch=FetchType.LAZY) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogRoleOperateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogRoleOperateRepository.java new file mode 100644 index 0000000..72e670c --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogRoleOperateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysLogRoleOperate; + +/** + * @Description : 用户角色操作变更日志 + * @Reference : + * @Author : yujia + * @CreateDate : 2022-12-10 15:07 + * @Modify: + **/ +public interface SysLogRoleOperateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogUserStatusRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogUserStatusRepository.java new file mode 100644 index 0000000..bc5971e --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogUserStatusRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysLogUserStatus; + +/** + * @Description : 账号状态变更日志 + * @Reference : + * @Author : yujia + * @CreateDate : 2022-12-09 15:34 + * @Modify: + **/ +public interface SysLogUserStatusRepository extends BaseRepository { +} From 6858fdd151306a2ad42a637a5cace5677457a181 Mon Sep 17 00:00:00 2001 From: yanyujia <3406185119@qq.com> Date: Thu, 15 Dec 2022 11:09:30 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96--=E6=96=B0=E5=A2=9E=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=97=A5=E5=BF=97=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/platform/bean/SysLogRoleMenuChange.java | 50 ++++++++++++++++++++++ .../repository/SysLogRoleMenuChangeRepository.java | 14 ++++++ 2 files changed, 64 insertions(+) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleMenuChange.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogRoleMenuChangeRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleMenuChange.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleMenuChange.java new file mode 100644 index 0000000..b02317a --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleMenuChange.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : + * @CreateDate : 2022-12-12 14:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_LOG_ROLE_MENU_CHANGE") +@ApiModel(value = "角色权限变更日志", description = "角色权限变更日志") +public class SysLogRoleMenuChange extends BaseBean { + + private static final long serialVersionUID = 4665598896654312569L; + @Column(name="ROLE_ID") + @ApiModelProperty(value ="角色ID" , access ="角色ID") + @AnnoOutputColumn(hidden = true) + private Long roleId; + + @Column(name = "ROLE_NAME") + @ApiParam(value = "角色名称", access = "角色名称") + private String roleName; + + @Column(name="NEW_AUTHORITY") + @ApiModelProperty(value ="新增菜单权限" , access ="新增菜单权限") + private String newAuthority; + + @Column(name = "DEL_AUTHORITY") + @ApiParam(value = "删除菜单权限", access = "删除菜单权限") + private String delAuthority; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogRoleMenuChangeRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogRoleMenuChangeRepository.java new file mode 100644 index 0000000..5e3ed7f --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogRoleMenuChangeRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysLogRoleMenuChange; + +/** + * @Description : 角色权限变更日志 + * @Reference : + * @Author : yujia + * @CreateDate : 2022-12-12 15:29 + * @Modify: + **/ +public interface SysLogRoleMenuChangeRepository extends BaseRepository { +} From 93fd64c9b5e49bfcf536d8b9b2a25d0867977302 Mon Sep 17 00:00:00 2001 From: yanyujia <3406185119@qq.com> Date: Fri, 13 Jan 2023 14:46:19 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=AE=B0=E5=BD=95=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java index b94ef6f..7ff14cc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java @@ -61,4 +61,8 @@ public class SysLogRoleChange extends BaseBean { @ApiModelProperty(value = "当前的角色", access = "当前的角色") private String currentRoles; + @Column(name = "CHANGE_DETAIL", columnDefinition = "TEXT") + @ApiModelProperty(value = "修改内容", access = "修改内容") + private String changeDetail; + } From 8a0cf782d4dd80b92639c1d523fb8e629a32b92c Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 13 Jan 2023 14:54:03 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E9=92=BB=E5=8F=96=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 864ad93..03ccb75 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -164,6 +164,14 @@ public class BfElementProperty extends BaseBean { @ApiParam(value ="元素样式") private String propertyCssStyle; + @Column(name = "DRILL_TARGET_MENU_CODE") + @ApiParam(value = "钻取目标功能") + private String drillTargetMenuCode; + + @Column(name = "DRILL_TARGET_ELEMENT_PROPERTY_CODE") + @ApiParam(value = "钻取目标关联的元素属性code") + private String drillTargetElementPropertyCode; + @Transient @ApiParam(value ="元素值") private transient Object propertyFormValue; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java index f12fc60..6d887e5 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java @@ -100,4 +100,12 @@ public class BfMenu extends BaseBean { @Transient @ApiParam(value = "菜单子集") private List bfMenuList; + + public BfMenu(String menuName, String menuCode) { + this.menuName = menuName; + this.menuCode = menuCode; + } + + public BfMenu() { + } } From 27195ab5e97120b7ce4d47d97e7fd4100b57f246 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 1 Feb 2023 12:57:24 +0800 Subject: [PATCH 07/10] =?UTF-8?q?baseBean=E5=A2=9E=E5=8A=A04=E4=B8=AA?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5=E7=B1=BB=EF=BC=8C=E5=88=86?= =?UTF-8?q?=E5=88=AB=E6=89=A9=E5=B1=9510=EF=BC=8C20,30,40=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean10.java | 207 +++++++++++++ .../cn/estsh/i3plus/pojo/base/bean/BaseBean20.java | 247 +++++++++++++++ .../cn/estsh/i3plus/pojo/base/bean/BaseBean30.java | 289 ++++++++++++++++++ .../cn/estsh/i3plus/pojo/base/bean/BaseBean40.java | 330 +++++++++++++++++++++ 4 files changed, 1073 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean10.java create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean20.java create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean30.java create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean40.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean10.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean10.java new file mode 100644 index 0000000..79fc093 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean10.java @@ -0,0 +1,207 @@ +package cn.estsh.i3plus.pojo.base.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2023/2/1 10:12 + * @Modify: + **/ +@Data +@MappedSuperclass +//对象状态监听 +@EntityListeners(BaseBeanListener.class) +public class BaseBean10 implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * //此处使用hibernate的主键策略方式 + * //手动设置,使用iplus-platform-common中的idtool生成 + * //将Long类型系列化成String避免精度丢失 + */ + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + public Long id; + + /** + * get单独处理 + */ + public Long getId() { + if (id != null) { + return id.longValue(); + } else { + return id; + } + } + + /** + * MonogoDB _id映射 + * + * @param id + */ + @JSONField(name = "_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name = "ORGANIZE_CODE") + @ApiParam(value = "组织代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) + public String organizeCode; + + @Column(name = "IS_VALID", columnDefinition = "int default 1") + @ApiParam(value = "有效性", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) + public Integer isValid; + + @Column(name = "IS_DELETED", columnDefinition = "int default 2") + @ApiParam(value = "是否已删除", example = "2") + @AnnoOutputColumn(hidden = true) + public Integer isDeleted; + + @Column(name = "CREATE_USER", updatable = false) + @ApiParam(value = "创建用户") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String createUser; + + @Column(name = "CREATE_DATE_TIME", updatable = false) + @ApiParam(value = "创建日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String createDatetime; + + @Column(name = "MODIFY_USER") + @ApiParam(value = "修改人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String modifyUser; + + @Column(name = "MODIFY_DATE_TIME") + @ApiParam(value = "修改日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String modifyDatetime; + + @Transient + @ApiParam(value = "创建日期查询用，查询起始日期", example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String createDateTimeStart; + + @Transient + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String createDateTimeEnd; + + @Transient + @ApiParam(value = "修改日期查询用，查询起始日期", example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeStart; + + @Transient + @ApiParam(value = "修改日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeEnd; + + @Transient + @ApiParam(value = "排序属性") + @AnnoOutputColumn(hidden = true) + public String orderByParam = ""; + + @Transient + @ApiParam(value = "排序类型，1 正序，2 倒序", example = "1") + @AnnoOutputColumn(hidden = true) + public transient Integer ascOrDesc = 1; + + public int getIsValidVal() { + return this.isValid == null ? 0 : this.isValid; + } + + public int getIsDeletedVal() { + return this.isDeleted == null ? 0 : this.isDeleted; + } + + //排序方式 + public String orderBy() { + String result = ""; + if (orderByParam != null && orderByParam.trim().length() > 0) { + result = " order by " + orderByParam; + if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + } else { + result += " desc"; + } + } + return result; + } + + /*** + * 扩展字段10 + * 5个String + * 1个text + * 1个int + * 1个long + * 2个bigDecimal + */ + @Column(name = "EXTEND1") + @ApiParam(value = "扩展1") + public String extend1; + + @Column(name = "EXTEND2") + @ApiParam(value = "扩展2") + public String extend2; + + @Column(name = "EXTEND3") + @ApiParam(value = "扩展3") + public String extend3; + + @Column(name = "EXTEND4") + @ApiParam(value = "扩展4") + public String extend4; + + @Column(name = "EXTEND5") + @ApiParam(value = "扩展5") + public String extend5; + + @Column(name = "EXTEND6",columnDefinition = "text") + @ApiParam(value = "扩展6") + public String extend6; + + @Column(name = "EXTEND7") + @ApiParam(value = "扩展7") + public Integer extend7; + + @Column(name = "EXTEND8") + @ApiParam(value = "扩展8") + public Long extend8; + + @Column(name = "EXTEND9") + @ApiParam(value = "扩展9") + public BigDecimal extend9; + + @Column(name = "EXTEND10") + @ApiParam(value = "扩展10") + public BigDecimal extend10; +} + diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean20.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean20.java new file mode 100644 index 0000000..dceab6f --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean20.java @@ -0,0 +1,247 @@ +package cn.estsh.i3plus.pojo.base.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2023/2/1 10:12 + * @Modify: + **/ +@Data +@MappedSuperclass +//对象状态监听 +@EntityListeners(BaseBeanListener.class) +public class BaseBean20 implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * //此处使用hibernate的主键策略方式 + * //手动设置,使用iplus-platform-common中的idtool生成 + * //将Long类型系列化成String避免精度丢失 + */ + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + public Long id; + + /** + * get单独处理 + */ + public Long getId() { + if (id != null) { + return id.longValue(); + } else { + return id; + } + } + + /** + * MonogoDB _id映射 + * + * @param id + */ + @JSONField(name = "_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name = "ORGANIZE_CODE") + @ApiParam(value = "组织代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) + public String organizeCode; + + @Column(name = "IS_VALID", columnDefinition = "int default 1") + @ApiParam(value = "有效性", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) + public Integer isValid; + + @Column(name = "IS_DELETED", columnDefinition = "int default 2") + @ApiParam(value = "是否已删除", example = "2") + @AnnoOutputColumn(hidden = true) + public Integer isDeleted; + + @Column(name = "CREATE_USER", updatable = false) + @ApiParam(value = "创建用户") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String createUser; + + @Column(name = "CREATE_DATE_TIME", updatable = false) + @ApiParam(value = "创建日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String createDatetime; + + @Column(name = "MODIFY_USER") + @ApiParam(value = "修改人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String modifyUser; + + @Column(name = "MODIFY_DATE_TIME") + @ApiParam(value = "修改日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String modifyDatetime; + + @Transient + @ApiParam(value = "创建日期查询用，查询起始日期", example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String createDateTimeStart; + + @Transient + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String createDateTimeEnd; + + @Transient + @ApiParam(value = "修改日期查询用，查询起始日期", example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeStart; + + @Transient + @ApiParam(value = "修改日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeEnd; + + @Transient + @ApiParam(value = "排序属性") + @AnnoOutputColumn(hidden = true) + public String orderByParam = ""; + + @Transient + @ApiParam(value = "排序类型，1 正序，2 倒序", example = "1") + @AnnoOutputColumn(hidden = true) + public transient Integer ascOrDesc = 1; + + public int getIsValidVal() { + return this.isValid == null ? 0 : this.isValid; + } + + public int getIsDeletedVal() { + return this.isDeleted == null ? 0 : this.isDeleted; + } + + //排序方式 + public String orderBy() { + String result = ""; + if (orderByParam != null && orderByParam.trim().length() > 0) { + result = " order by " + orderByParam; + if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + } else { + result += " desc"; + } + } + return result; + } + + /*** + * 扩展字段20 + * 12个String + * 2个text + * 1个int + * 2个long + * 3个bigDecimal + */ + @Column(name = "EXTEND1") + @ApiParam(value = "扩展1") + public String extend1; + + @Column(name = "EXTEND2") + @ApiParam(value = "扩展2") + public String extend2; + + @Column(name = "EXTEND3") + @ApiParam(value = "扩展3") + public String extend3; + + @Column(name = "EXTEND4") + @ApiParam(value = "扩展4") + public String extend4; + + @Column(name = "EXTEND5") + @ApiParam(value = "扩展5") + public String extend5; + + @Column(name = "EXTEND6") + @ApiParam(value = "扩展6") + public String extend6; + + @Column(name = "EXTEND7") + @ApiParam(value = "扩展7") + public String extend7; + + @Column(name = "EXTEND8") + @ApiParam(value = "扩展8") + public String extend8; + + @Column(name = "EXTEND9") + @ApiParam(value = "扩展9") + public String extend9; + + @Column(name = "EXTEND10") + @ApiParam(value = "扩展10") + public String extend10; + + @Column(name = "EXTEND11") + @ApiParam(value = "扩展11") + public String extend11; + + @Column(name = "EXTEND12") + @ApiParam(value = "扩展12") + public String extend12; + + @Column(name = "EXTEND13",columnDefinition = "text") + @ApiParam(value = "扩展13") + public String extend13; + + @Column(name = "EXTEND14",columnDefinition = "text") + @ApiParam(value = "扩展14") + public String extend14; + + @Column(name = "EXTEND15") + @ApiParam(value = "扩展15") + public Integer extend15; + + @Column(name = "EXTEND16") + @ApiParam(value = "扩展16") + public Long extend16; + + @Column(name = "EXTEND17") + @ApiParam(value = "扩展17") + public Long extend17; + + @Column(name = "EXTEND18") + @ApiParam(value = "扩展18") + public BigDecimal extend18; + + @Column(name = "EXTEND19") + @ApiParam(value = "扩展19") + public BigDecimal extend19; + + @Column(name = "EXTEND20") + @ApiParam(value = "扩展20") + public BigDecimal extend20; +} + diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean30.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean30.java new file mode 100644 index 0000000..ee9313d --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean30.java @@ -0,0 +1,289 @@ +package cn.estsh.i3plus.pojo.base.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2023/2/1 10:12 + * @Modify: + **/ +@Data +@MappedSuperclass +//对象状态监听 +@EntityListeners(BaseBeanListener.class) +public class BaseBean30 implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * //此处使用hibernate的主键策略方式 + * //手动设置,使用iplus-platform-common中的idtool生成 + * //将Long类型系列化成String避免精度丢失 + */ + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + public Long id; + + /** + * get单独处理 + */ + public Long getId() { + if (id != null) { + return id.longValue(); + } else { + return id; + } + } + + /** + * MonogoDB _id映射 + * + * @param id + */ + @JSONField(name = "_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name = "ORGANIZE_CODE") + @ApiParam(value = "组织代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) + public String organizeCode; + + @Column(name = "IS_VALID", columnDefinition = "int default 1") + @ApiParam(value = "有效性", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) + public Integer isValid; + + @Column(name = "IS_DELETED", columnDefinition = "int default 2") + @ApiParam(value = "是否已删除", example = "2") + @AnnoOutputColumn(hidden = true) + public Integer isDeleted; + + @Column(name = "CREATE_USER", updatable = false) + @ApiParam(value = "创建用户") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String createUser; + + @Column(name = "CREATE_DATE_TIME", updatable = false) + @ApiParam(value = "创建日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String createDatetime; + + @Column(name = "MODIFY_USER") + @ApiParam(value = "修改人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String modifyUser; + + @Column(name = "MODIFY_DATE_TIME") + @ApiParam(value = "修改日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String modifyDatetime; + + @Transient + @ApiParam(value = "创建日期查询用，查询起始日期", example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String createDateTimeStart; + + @Transient + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String createDateTimeEnd; + + @Transient + @ApiParam(value = "修改日期查询用，查询起始日期", example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeStart; + + @Transient + @ApiParam(value = "修改日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeEnd; + + @Transient + @ApiParam(value = "排序属性") + @AnnoOutputColumn(hidden = true) + public String orderByParam = ""; + + @Transient + @ApiParam(value = "排序类型，1 正序，2 倒序", example = "1") + @AnnoOutputColumn(hidden = true) + public transient Integer ascOrDesc = 1; + + public int getIsValidVal() { + return this.isValid == null ? 0 : this.isValid; + } + + public int getIsDeletedVal() { + return this.isDeleted == null ? 0 : this.isDeleted; + } + + //排序方式 + public String orderBy() { + String result = ""; + if (orderByParam != null && orderByParam.trim().length() > 0) { + result = " order by " + orderByParam; + if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + } else { + result += " desc"; + } + } + return result; + } + + /*** + * 扩展字段30 + * 18个String + * 2个text + * 2个int + * 3个long + * 5个bigDecimal + */ + @Column(name = "EXTEND1") + @ApiParam(value = "扩展1") + public String extend1; + + @Column(name = "EXTEND2") + @ApiParam(value = "扩展2") + public String extend2; + + @Column(name = "EXTEND3") + @ApiParam(value = "扩展3") + public String extend3; + + @Column(name = "EXTEND4") + @ApiParam(value = "扩展4") + public String extend4; + + @Column(name = "EXTEND5") + @ApiParam(value = "扩展5") + public String extend5; + + @Column(name = "EXTEND6") + @ApiParam(value = "扩展6") + public String extend6; + + @Column(name = "EXTEND7") + @ApiParam(value = "扩展7") + public String extend7; + + @Column(name = "EXTEND8") + @ApiParam(value = "扩展8") + public String extend8; + + @Column(name = "EXTEND9") + @ApiParam(value = "扩展9") + public String extend9; + + @Column(name = "EXTEND10") + @ApiParam(value = "扩展10") + public String extend10; + + @Column(name = "EXTEND11") + @ApiParam(value = "扩展11") + public String extend11; + + @Column(name = "EXTEND12") + @ApiParam(value = "扩展12") + public String extend12; + + @Column(name = "EXTEND13") + @ApiParam(value = "扩展13") + public String extend13; + + @Column(name = "EXTEND14") + @ApiParam(value = "扩展14") + public String extend14; + + @Column(name = "EXTEND15") + @ApiParam(value = "扩展15") + public String extend15; + + + @Column(name = "EXTEND16") + @ApiParam(value = "扩展16") + public String extend16; + + @Column(name = "EXTEND17") + @ApiParam(value = "扩展17") + public String extend17; + + @Column(name = "EXTEND18") + @ApiParam(value = "扩展18") + public String extend18; + + + @Column(name = "EXTEND19",columnDefinition = "text") + @ApiParam(value = "扩展19") + public String extend19; + + @Column(name = "EXTEND20",columnDefinition = "text") + @ApiParam(value = "扩展20") + public String extend20; + + @Column(name = "EXTEND21") + @ApiParam(value = "扩展21") + public Integer extend21; + + @Column(name = "EXTEND22") + @ApiParam(value = "扩展22") + public Integer extend22; + + @Column(name = "EXTEND23") + @ApiParam(value = "扩展23") + public Long extend23; + + @Column(name = "EXTEND24") + @ApiParam(value = "扩展24") + public Long extend24; + + @Column(name = "EXTEND25") + @ApiParam(value = "扩展25") + public Long extend25; + + @Column(name = "EXTEND26") + @ApiParam(value = "扩展26") + public BigDecimal extend26; + + @Column(name = "EXTEND27") + @ApiParam(value = "扩展27") + public BigDecimal extend27; + + @Column(name = "EXTEND28") + @ApiParam(value = "扩展28") + public BigDecimal extend28; + + @Column(name = "EXTEND29") + @ApiParam(value = "扩展29") + public BigDecimal extend29; + + @Column(name = "EXTEND30") + @ApiParam(value = "扩展30") + public BigDecimal extend30; +} + diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean40.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean40.java new file mode 100644 index 0000000..d8a2b81 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean40.java @@ -0,0 +1,330 @@ +package cn.estsh.i3plus.pojo.base.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2023/2/1 10:12 + * @Modify: + **/ +@Data +@MappedSuperclass +//对象状态监听 +@EntityListeners(BaseBeanListener.class) +public class BaseBean40 implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * //此处使用hibernate的主键策略方式 + * //手动设置,使用iplus-platform-common中的idtool生成 + * //将Long类型系列化成String避免精度丢失 + */ + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + public Long id; + + /** + * get单独处理 + */ + public Long getId() { + if (id != null) { + return id.longValue(); + } else { + return id; + } + } + + /** + * MonogoDB _id映射 + * + * @param id + */ + @JSONField(name = "_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name = "ORGANIZE_CODE") + @ApiParam(value = "组织代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) + public String organizeCode; + + @Column(name = "IS_VALID", columnDefinition = "int default 1") + @ApiParam(value = "有效性", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) + public Integer isValid; + + @Column(name = "IS_DELETED", columnDefinition = "int default 2") + @ApiParam(value = "是否已删除", example = "2") + @AnnoOutputColumn(hidden = true) + public Integer isDeleted; + + @Column(name = "CREATE_USER", updatable = false) + @ApiParam(value = "创建用户") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String createUser; + + @Column(name = "CREATE_DATE_TIME", updatable = false) + @ApiParam(value = "创建日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String createDatetime; + + @Column(name = "MODIFY_USER") + @ApiParam(value = "修改人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String modifyUser; + + @Column(name = "MODIFY_DATE_TIME") + @ApiParam(value = "修改日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String modifyDatetime; + + @Transient + @ApiParam(value = "创建日期查询用，查询起始日期", example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String createDateTimeStart; + + @Transient + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String createDateTimeEnd; + + @Transient + @ApiParam(value = "修改日期查询用，查询起始日期", example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeStart; + + @Transient + @ApiParam(value = "修改日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeEnd; + + @Transient + @ApiParam(value = "排序属性") + @AnnoOutputColumn(hidden = true) + public String orderByParam = ""; + + @Transient + @ApiParam(value = "排序类型，1 正序，2 倒序", example = "1") + @AnnoOutputColumn(hidden = true) + public transient Integer ascOrDesc = 1; + + public int getIsValidVal() { + return this.isValid == null ? 0 : this.isValid; + } + + public int getIsDeletedVal() { + return this.isDeleted == null ? 0 : this.isDeleted; + } + + //排序方式 + public String orderBy() { + String result = ""; + if (orderByParam != null && orderByParam.trim().length() > 0) { + result = " order by " + orderByParam; + if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + } else { + result += " desc"; + } + } + return result; + } + + /*** + * 扩展字段40 + * 23个String + * 2个text + * 5个int + * 5个long + * 5个bigDecimal + */ + @Column(name = "EXTEND1") + @ApiParam(value = "扩展1") + public String extend1; + + @Column(name = "EXTEND2") + @ApiParam(value = "扩展2") + public String extend2; + + @Column(name = "EXTEND3") + @ApiParam(value = "扩展3") + public String extend3; + + @Column(name = "EXTEND4") + @ApiParam(value = "扩展4") + public String extend4; + + @Column(name = "EXTEND5") + @ApiParam(value = "扩展5") + public String extend5; + + @Column(name = "EXTEND6") + @ApiParam(value = "扩展6") + public String extend6; + + @Column(name = "EXTEND7") + @ApiParam(value = "扩展7") + public String extend7; + + @Column(name = "EXTEND8") + @ApiParam(value = "扩展8") + public String extend8; + + @Column(name = "EXTEND9") + @ApiParam(value = "扩展9") + public String extend9; + + @Column(name = "EXTEND10") + @ApiParam(value = "扩展10") + public String extend10; + + @Column(name = "EXTEND11") + @ApiParam(value = "扩展11") + public String extend11; + + @Column(name = "EXTEND12") + @ApiParam(value = "扩展12") + public String extend12; + + @Column(name = "EXTEND13") + @ApiParam(value = "扩展13") + public String extend13; + + @Column(name = "EXTEND14") + @ApiParam(value = "扩展14") + public String extend14; + + @Column(name = "EXTEND15") + @ApiParam(value = "扩展15") + public String extend15; + + + @Column(name = "EXTEND16") + @ApiParam(value = "扩展16") + public String extend16; + + @Column(name = "EXTEND17") + @ApiParam(value = "扩展17") + public String extend17; + + @Column(name = "EXTEND18") + @ApiParam(value = "扩展18") + public String extend18; + + @Column(name = "EXTEND19") + @ApiParam(value = "扩展19") + public String extend19; + + @Column(name = "EXTEND20") + @ApiParam(value = "扩展20") + public String extend20; + + @Column(name = "EXTEND21") + @ApiParam(value = "扩展21") + public String extend21; + + @Column(name = "EXTEND22") + @ApiParam(value = "扩展22") + public String extend22; + + @Column(name = "EXTEND23") + @ApiParam(value = "扩展23") + public String extend23; + + + @Column(name = "EXTEND24", columnDefinition = "text") + @ApiParam(value = "扩展24") + public String extend24; + + @Column(name = "EXTEND25", columnDefinition = "text") + @ApiParam(value = "扩展25") + public String extend25; + + @Column(name = "EXTEND26") + @ApiParam(value = "扩展26") + public Integer extend26; + + @Column(name = "EXTEND27") + @ApiParam(value = "扩展27") + public Integer extend27; + + @Column(name = "EXTEND28") + @ApiParam(value = "扩展28") + public Integer extend28; + + @Column(name = "EXTEND29") + @ApiParam(value = "扩展29") + public Integer extend29; + + @Column(name = "EXTEND30") + @ApiParam(value = "扩展30") + public Integer extend30; + + @Column(name = "EXTEND31") + @ApiParam(value = "扩展31") + public BigDecimal extend31; + + @Column(name = "EXTEND32") + @ApiParam(value = "扩展32") + public BigDecimal extend32; + + @Column(name = "EXTEND33") + @ApiParam(value = "扩展33") + public BigDecimal extend33; + + @Column(name = "EXTEND34") + @ApiParam(value = "扩展34") + public BigDecimal extend34; + + @Column(name = "EXTEND35") + @ApiParam(value = "扩展35") + public BigDecimal extend35; + + + @Column(name = "EXTEND36") + @ApiParam(value = "扩展36") + public Long extend36; + + @Column(name = "EXTEND37") + @ApiParam(value = "扩展37") + public Long extend37; + + @Column(name = "EXTEND38") + @ApiParam(value = "扩展38") + public Long extend38; + + @Column(name = "EXTEND39") + @ApiParam(value = "扩展39") + public Long extend39; + + @Column(name = "EXTEND40") + @ApiParam(value = "扩展40") + public Long extend40; +} + From e513e1442fd423c263b9d4b3e01103c7c134e924 Mon Sep 17 00:00:00 2001 From: yanyujia <3406185119@qq.com> Date: Thu, 2 Feb 2023 16:30:21 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=A4=A7=E6=95=B0=E6=8D=AE=E9=87=8F=E5=AF=BC=E5=87=BAmodel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/common/BigExportDataModel.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/BigExportDataModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/BigExportDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/BigExportDataModel.java new file mode 100644 index 0000000..7137f66 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/BigExportDataModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.model.common; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 大数据量导出model + * @Reference : + * @Author : yujia + * @CreateDate : 2022-11-14 14:17 + * @Modify: + **/ +@Data +public class BigExportDataModel { + + private String className; + + private String httpUrl; + + private String exportCol; + + private String title; + + private Integer currentPage; + + private Integer pageSize; + + private Integer totalPages; + + private String enumList; +} From 2a7060484bc455880d05bf02118f571d0369be11 Mon Sep 17 00:00:00 2001 From: yanyujia <3406185119@qq.com> Date: Mon, 6 Feb 2023 15:40:41 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java | 5 +++++ .../cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java | 9 +++++---- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java index e0d0faa..0eb082d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; @@ -36,6 +37,10 @@ public class SysLogUserLogin extends BaseBean { @AnnoOutputColumn(hidden = true) private Long userId; + @Column(name = "USER_NAME_RDD") + @ApiParam(value = "用户名称", access = "账号名称") + private String logUserName; + @Column(name="LOG_LOGIN_NAME") @ApiModelProperty(value ="登录名称" , access ="登录名称") private String logLoginName; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java index 4c305e4..5a7535c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java @@ -11,10 +11,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : @@ -67,4 +64,8 @@ public class SysPojoVersionDetail extends BaseBean { @Column(name="POJO_COMPARE_TXT",length = 5000) @ApiParam(value ="记录对象对比差异") private String pojoCompareTxt; + + @Transient + @ApiParam(value = "角色Id关联查询") + private Long roleId; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 6869a04..0947747 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.platform.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -86,6 +88,7 @@ public class SysUser extends BaseBean { @Column(name = "USER_STATUS") @ApiParam(value = "账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)", example = "-1") + @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class,refForeignKey = "value", value = "description") private Integer userStatus; @Column(name = "USER_LOGIN_NUM") From 7523b53bbe523c839b8d9f70f747898f12c56bf0 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Thu, 9 Feb 2023 10:26:42 +0800 Subject: [PATCH 10/10] =?UTF-8?q?mes=E6=94=AF=E6=8C=81=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 34e5995..474f024 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -9,6 +9,7 @@ import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; +import cn.estsh.i3plus.pojo.mes.engine.script.EngineScriptPersistence; import cn.estsh.i3plus.pojo.mes.model.MgnPaintPolishingReportModel; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -3843,4 +3844,17 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesFailureModeParts.getIsValid(), "isValid", packBean); return packBean; } + + public static DdlPackBean packEngineScriptPersistence(EngineScriptPersistence scriptPersistence) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(scriptPersistence.getScriptNo(), "scriptNo", packBean); + DdlPreparedPack.getStringRightLikerPack(scriptPersistence.getScriptName(), "scriptName", packBean); + DdlPreparedPack.getNumEqualPack(scriptPersistence.getScriptType(), "scriptType", packBean); + DdlPreparedPack.getNumEqualPack(scriptPersistence.getLanguageType(), "languageType", packBean); + + getStringBuilderPack(scriptPersistence, packBean); + + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean); + return packBean; + } }