From 1f9efacd1dce4fc3cb0c586665eaf4db4d9cd7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A2=E6=9C=AC=E4=BC=9F?= Date: Fri, 15 Apr 2022 15:32:46 +0800 Subject: [PATCH] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?= =?UTF-8?q?=E5=8C=96,=20=E6=B7=BB=E5=8A=A0=E5=AE=9E=E4=BD=93=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E5=AE=A1=E8=AE=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/MybatisPlusConfiguration.java | 16 + .../pigx/admin/api/entity/SysDept.java | 14 + .../pigx/admin/api/entity/SysDict.java | 14 + .../pigx/admin/api/entity/SysDictItem.java | 14 + .../pigx/admin/api/entity/SysMenu.java | 14 + .../api/entity/SysOauthClientDetails.java | 29 ++ .../pigx/admin/api/entity/SysPost.java | 16 +- .../pigx/admin/api/entity/SysPublicParam.java | 14 + .../pigx/admin/api/entity/SysRole.java | 14 + .../admin/api/entity/SysSocialDetails.java | 14 + .../pigx/admin/api/entity/SysTenant.java | 14 + .../pigx/admin/api/entity/SysUser.java | 15 + .../main/resources/mapper/SysUserMapper.xml | 307 +++++++++--------- 13 files changed, 342 insertions(+), 153 deletions(-) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java index 1ed1d96b7..539191488 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java @@ -29,6 +29,8 @@ import com.pig4cloud.pigx.common.data.datascope.PigxDefaultDatascopeHandle; import com.pig4cloud.pigx.common.data.resolver.SqlFilterArgumentResolver; import com.pig4cloud.pigx.common.data.tenant.PigxTenantHandler; import com.pig4cloud.pigx.common.security.service.PigxUser; +import org.apache.ibatis.mapping.DatabaseIdProvider; +import org.apache.ibatis.mapping.VendorDatabaseIdProvider; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -42,6 +44,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import javax.sql.DataSource; import java.util.List; +import java.util.Properties; /** * @author lengleng @@ -133,4 +136,17 @@ public class MybatisPlusConfiguration implements WebMvcConfigurer { return new MybatisPlusMetaObjectHandler(); } + /** + * 数据库方言配置 + * @return + */ + @Bean + public DatabaseIdProvider databaseIdProvider() { + VendorDatabaseIdProvider databaseIdProvider = new VendorDatabaseIdProvider(); + Properties properties = new Properties(); + properties.setProperty("SQL Server", "mssql"); + databaseIdProvider.setProperties(properties); + return databaseIdProvider; + } + } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java index 70c4a4b48..8e4f6cf97 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java @@ -63,6 +63,20 @@ public class SysDept extends Model { @ApiModelProperty(value = "排序值") private Integer sortOrder; + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "修改人") + private String updateBy; + /** * 创建时间 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java index 19c1552ae..4d8675365 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java @@ -83,6 +83,20 @@ public class SysDict extends Model { @ApiModelProperty(value = "备注信息") private String remarks; + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "修改人") + private String updateBy; + /** * 删除标记 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java index d026ab3bd..bf8c33f22 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java @@ -83,6 +83,20 @@ public class SysDictItem extends Model { @ApiModelProperty(value = "排序值，默认升序") private Integer sortOrder; + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "修改人") + private String updateBy; + /** * 创建时间 */ 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 1fe8b8d7b..89d40dec5 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 @@ -103,6 +103,20 @@ public class SysMenu extends Model { @ApiModelProperty(value = "路由缓冲") private String keepAlive; + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "修改人") + private String updateBy; + /** * 创建时间 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java index db34455e7..9682740f8 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java @@ -27,6 +27,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; +import java.time.LocalDateTime; /** *

@@ -124,4 +125,32 @@ public class SysOauthClientDetails extends Model { @ApiModelProperty(value = "删除标记,1:已删除,0:正常") private String delFlag; + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "修改人") + private String updateBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPost.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPost.java index 4aa528da3..9a2efa3a0 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPost.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPost.java @@ -26,7 +26,6 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.Serializable; import java.time.LocalDateTime; /** @@ -77,10 +76,25 @@ public class SysPost extends Model { @ApiModelProperty(value = "岗位描述") private String remark; + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "修改人") + private String updateBy; + /** * 是否删除 -1：已删除 0：正常 */ @TableLogic + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "是否删除 -1：已删除 0：正常") private String delFlag; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java index 5d3e29ec2..a7793302f 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java @@ -88,6 +88,20 @@ public class SysPublicParam extends Model { @ApiModelProperty(value = "类型[1-检索；2-原文...]", example = "1") private String publicType; + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "修改人") + private String updateBy; + /** * 删除标记 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java index 09db7ea8f..99b2de188 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java @@ -70,6 +70,20 @@ public class SysRole extends Model { @ApiModelProperty(value = "数据权限作用范围") private String dsScope; + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "修改人") + private String updateBy; + /** * 创建时间 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java index 25d8368f5..5bd5cef89 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java @@ -80,6 +80,20 @@ public class SysSocialDetails extends Model { @ApiModelProperty(value = "回调地址") private String redirectUrl; + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "修改人") + private String updateBy; + /** * 创建时间 */ 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 332edd33b..e9efe20eb 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 @@ -82,6 +82,20 @@ public class SysTenant extends Model { @ApiModelProperty(value = "租户冻结标记,9:冻结,0:正常") private String status; + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "修改人") + private String updateBy; + /** * 删除标记 */ 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 21068de0f..42ac89bde 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 @@ -68,6 +68,20 @@ public class SysUser implements Serializable { @ApiModelProperty(value = "随机盐") private String salt; + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "修改人") + private String updateBy; + /** * 创建时间 */ @@ -86,6 +100,7 @@ public class SysUser implements Serializable { * 0-正常，1-删除 */ @TableLogic + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "删除标记,1:已删除,0:正常") private String delFlag; diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml index 18233698b..652be4aae 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml @@ -20,63 +20,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - u.user_id, + + u.user_id, u.username, u.password, u.salt, @@ -96,13 +96,10 @@ r.role_desc, r.create_time rcreate_time, r.update_time rupdate_time - + - - u - . - user_id - , + + u.user_id, u.username, u.password, u.salt, @@ -123,99 +120,105 @@ r.update_time rupdate_time, d.name dept_name, d.dept_id - + - + - + - + - SELECT - u.user_id, - u.username, - u.password, - u.salt, - u.phone, - u.avatar, - u.wx_openid, - u.qq_openid, - u.dept_id, - u.create_time ucreate_time, - u.update_time uupdate_time, - u.del_flag, - u.lock_flag, - u.tenant_id, - u.nickname, - u.name, - u.email, - d.name dept_name - FROM - sys_user u - LEFT JOIN sys_dept d ON d.dept_id = u.dept_id - - u.del_flag = '0' - - - AND u.username LIKE #{usernameLike} - - - AND u.dept_id = #{query.deptId} - - - ORDER BY u.create_time DESC - + + ORDER BY u.create_time DESC + + + +