diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysAuditLog.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysAuditLog.java index 271e4a64c..82d451329 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysAuditLog.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysAuditLog.java @@ -28,8 +28,8 @@ import java.time.LocalDateTime; /** * 审计记录表 * - * @author pigx code generator - * @date 2023-02-27 22:33:30 + * @author PIG + * @date 2023-02-28 20:12:23 */ @Data @TableName("sys_audit_log") @@ -80,21 +80,20 @@ public class SysAuditLog extends Model { * 操作时间 */ @Schema(description = "操作时间") - @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 删除标记 */ - @TableLogic @Schema(description = "删除标记") + @TableLogic @TableField(fill = FieldFill.INSERT) private String delFlag; /** * 租户ID */ - @Schema(description = "租户ID", hidden = true) + @Schema(description = "租户ID") private Long tenantId; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysI18nEntity.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysI18nEntity.java new file mode 100644 index 000000000..c358add4f --- /dev/null +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysI18nEntity.java @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ + +package com.pig4cloud.pigx.admin.api.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.time.LocalDateTime; + +/** + * 系统表-国际化 + * + * @author PIG + * @date 2023-02-14 09:07:01 + */ +@Data +@TableName("sys_i18n") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "系统表-国际化") +public class SysI18nEntity extends Model { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "id") + private Long id; + + /** + * key + */ + @Schema(description = "name") + private String name; + + /** + * 中文 + */ + @Schema(description = "中文") + private String zhCn; + + /** + * 英文 + */ + @Schema(description = "英文") + private String en; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建时间") + private LocalDateTime createTime; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description = "修改人") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description = "更新时间") + private LocalDateTime updateTime; + + /** + * 删除标记 + */ + @TableLogic + @Schema(description = "删除标记") + private String delFlag; + +} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java index 9e9987c02..167733eb9 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java @@ -83,6 +83,12 @@ public class SysMenu extends Model { @Schema(description = "前端路由标识路径") private String path; + /** + * 菜单显示隐藏控制 + */ + @Schema(description = "菜单是否显示") + private String visible; + /** * 排序值 */ @@ -102,11 +108,8 @@ public class SysMenu extends Model { @Schema(description = "路由缓冲") private String keepAlive; - /** - * 菜单显示隐藏控制 - */ - @Schema(description = "菜单是否显示") - private String visible; + @Schema(description = "菜单是否内嵌") + private String embedded; /** * 创建人 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java index 8273833aa..44c3284f2 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java @@ -17,7 +17,9 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; @@ -83,32 +85,16 @@ public class SysRouteConf extends Model { @Schema(description = "元数据") private String metadata; - /** - * 创建人 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description = "创建人") - private String createBy; - - /** - * 修改人 - */ - @TableField(fill = FieldFill.UPDATE) - @Schema(description = "修改人") - private String updateBy; - /** * 创建时间 */ @Schema(description = "创建时间") - @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 修改时间 */ @Schema(description = "修改时间") - @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; /** @@ -116,7 +102,6 @@ public class SysRouteConf extends Model { */ @TableLogic @Schema(description = "删除标记,1:已删除,0:正常") - @TableField(fill = FieldFill.INSERT) private String delFlag; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysScheduleEntity.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysScheduleEntity.java new file mode 100644 index 000000000..dc62458e4 --- /dev/null +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysScheduleEntity.java @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ + +package com.pig4cloud.pigx.admin.api.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; + +/** + * 日程 + * + * @author aeizzz + * @date 2023-03-06 14:26:23 + */ +@Data +@TableName("sys_schedule") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "日程") +public class SysScheduleEntity extends Model { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "id") + private Long id; + + /** + * 标题 + */ + @Schema(description = "标题") + private String title; + + /** + * 日程类型 + */ + @Schema(description = "日程类型") + private String type; + + /** + * 状态 + */ + @Schema(description = "状态") + private String state; + + /** + * 内容 + */ + @Schema(description = "内容") + private String content; + + /** + * 时间 + */ + @Schema(description = "时间") + private LocalTime time; + + /** + * 日期 + */ + @Schema(description = "日期") + private LocalDate date; + + /** + * 创建人 + */ + @Schema(description = "创建人") + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @Schema(description = "创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改人 + */ + @Schema(description = "修改人") + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @Schema(description = "更新时间") + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** + * 删除标记 + */ + @TableLogic + @Schema(description = "删除标记") + @TableField(fill = FieldFill.INSERT) + private String delFlag; + +} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java index e7b7d3d96..31be48661 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.admin.api.entity; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.v3.oas.annotations.media.Schema; @@ -43,45 +44,53 @@ public class SysTenant extends Model { */ @TableId(type = IdType.ASSIGN_ID) @Schema(description = "租户id") + @ExcelProperty("租户id") private Long id; /** * 租户名称 */ @Schema(description = "租户名称") + @ExcelProperty("租户名称") private String name; /** * 租户编号 */ @Schema(description = "租户编号") + @ExcelProperty("租户编号") private String code; /** * 租户域名 */ @Schema(description = "租户域名") + @ExcelProperty("租户域名") private String tenantDomain; /** * 开始时间 */ @Schema(description = "开始时间") + @ExcelProperty("开始时间") private LocalDateTime startTime; /** * 结束时间 */ @Schema(description = "结束时间") + @ExcelProperty("结束时间") private LocalDateTime endTime; /** * 0正常 9-冻结 */ @Schema(description = "租户冻结标记,9:冻结,0:正常") + @ExcelProperty("租户冻结") private String status; @Schema(description = "租户菜单ID") + @ExcelProperty("租户菜单ID") private String menuId; /** diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java index 1913a96ed..175d58880 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java @@ -23,6 +23,8 @@ import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.javers.core.metamodel.annotation.DiffInclude; +import org.javers.core.metamodel.annotation.PropertyName; import java.io.Serializable; import java.time.LocalDateTime; @@ -112,6 +114,8 @@ public class SysUser implements Serializable { /** * 手机号 */ + @DiffInclude + @PropertyName("手机号") @Schema(description = "手机号") private String phone; @@ -178,6 +182,8 @@ public class SysUser implements Serializable { /** * 邮箱 */ + @DiffInclude + @PropertyName("邮箱") @Schema(description = "邮箱") private String email; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserExcelVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserExcelVO.java index 0195f3302..dc1e3f7cb 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserExcelVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserExcelVO.java @@ -84,6 +84,13 @@ public class UserExcelVO implements Serializable { @ExcelProperty("角色") private String roleNameList; + /** + * 角色列表 + */ + @NotBlank(message = "岗位不能为空") + @ExcelProperty("岗位名称") + private String postNameList; + /** * 锁定标记 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java index f4b1feea3..b356bdb27 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java @@ -76,6 +76,18 @@ public class UserVO implements Serializable { @Schema(description = "qq open id") private String qqOpenid; + /** + * gitee openid + */ + @Schema(description = "gitee open id") + private String giteeOpenId; + + /** + * 开源中国 openid + */ + @Schema(description = "开源中国 open id") + private String oscOpenId; + /** * 创建时间 */ diff --git a/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.factories b/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.factories index e2e005862..187003309 100755 --- a/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.factories +++ b/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.factories @@ -1,4 +1,3 @@ -# 配置 feignclient 的全类名路径， 避免包名不规范无法扫描问题 com.pig4cloud.pigx.common.feign.PigxFeignAutoConfiguration=\ com.pig4cloud.pigx.admin.api.feign.RemoteDataScopeService,\ com.pig4cloud.pigx.admin.api.feign.RemoteClientDetailsService,\