Browse Source

数据库转换成pg需要修改对应的实体类,sql语句

dev
mh 5 months ago
parent
commit
1b1c915ffa
  1. 2
      mh-admin/pom.xml
  2. 7
      mh-common/pom.xml
  3. 3
      mh-common/src/main/java/com/mh/common/core/domain/entity/SysUser.java
  4. 3
      mh-system/src/main/java/com/mh/system/domain/SysConfig.java
  5. 4
      mh-system/src/main/java/com/mh/system/domain/SysLogininfor.java
  6. 3
      mh-system/src/main/java/com/mh/system/domain/SysNotice.java
  7. 4
      mh-system/src/main/java/com/mh/system/domain/SysOperLog.java
  8. 3
      mh-system/src/main/java/com/mh/system/domain/SysPost.java
  9. 4
      mh-system/src/main/java/com/mh/system/mapper/SysUserMapper.java
  10. 4
      mh-system/src/main/resources/mapper/system/SysDeptMapper.xml
  11. 4
      mh-system/src/main/resources/mapper/system/SysUserMapper.xml
  12. 3
      pom.xml
  13. 98
      sql/添加自增id.sql

2
mh-admin/pom.xml

@ -50,7 +50,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
</dependency>
<!-- 核心模块-->

7
mh-common/pom.xml

@ -124,6 +124,13 @@
<version>3.5.9</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-core</artifactId>
<version>3.5.9</version>
<scope>compile</scope>
</dependency>
</dependencies>

3
mh-common/src/main/java/com/mh/common/core/domain/entity/SysUser.java

@ -5,6 +5,7 @@ import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import jakarta.validation.constraints.*;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@ -24,7 +25,7 @@ public class SysUser extends BaseEntity
{
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
@TableId(value = "user_id", type = IdType.AUTO)
/** 用户ID */
@Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
private Long userId;

3
mh-system/src/main/java/com/mh/system/domain/SysConfig.java

@ -1,5 +1,7 @@
package com.mh.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -17,6 +19,7 @@ public class SysConfig extends BaseEntity
{
private static final long serialVersionUID = 1L;
@TableId(value = "config_id", type = IdType.AUTO)
/** 参数主键 */
@Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
private Long configId;

4
mh-system/src/main/java/com/mh/system/domain/SysLogininfor.java

@ -1,6 +1,9 @@
package com.mh.system.domain;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mh.common.annotation.Excel;
import com.mh.common.annotation.Excel.ColumnType;
@ -15,6 +18,7 @@ public class SysLogininfor extends BaseEntity
{
private static final long serialVersionUID = 1L;
@TableId(type = IdType.AUTO)
/** ID */
@Excel(name = "序号", cellType = ColumnType.NUMERIC)
private Long infoId;

3
mh-system/src/main/java/com/mh/system/domain/SysNotice.java

@ -1,5 +1,7 @@
package com.mh.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -16,6 +18,7 @@ public class SysNotice extends BaseEntity
{
private static final long serialVersionUID = 1L;
@TableId(value = "notice_id", type = IdType.AUTO)
/** 公告ID */
private Long noticeId;

4
mh-system/src/main/java/com/mh/system/domain/SysOperLog.java

@ -1,6 +1,9 @@
package com.mh.system.domain;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mh.common.annotation.Excel;
import com.mh.common.annotation.Excel.ColumnType;
@ -15,6 +18,7 @@ public class SysOperLog extends BaseEntity
{
private static final long serialVersionUID = 1L;
@TableId(value = "oper_id", type = IdType.AUTO)
/** 日志主键 */
@Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
private Long operId;

3
mh-system/src/main/java/com/mh/system/domain/SysPost.java

@ -1,5 +1,7 @@
package com.mh.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
@ -18,6 +20,7 @@ public class SysPost extends BaseEntity
{
private static final long serialVersionUID = 1L;
@TableId(value = "post_id", type = IdType.AUTO)
/** 岗位序号 */
@Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
private Long postId;

4
mh-system/src/main/java/com/mh/system/mapper/SysUserMapper.java

@ -1,6 +1,8 @@
package com.mh.system.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.mh.common.core.domain.entity.SysUser;
@ -9,7 +11,7 @@ import com.mh.common.core.domain.entity.SysUser;
*
* @author mh
*/
public interface SysUserMapper
public interface SysUserMapper extends BaseMapper<SysUser>
{
/**
* 根据条件分页查询用户列表

4
mh-system/src/main/resources/mapper/system/SysDeptMapper.xml

@ -75,11 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
select * from sys_dept where find_in_set(#{deptId}, ancestors)
select * from sys_dept where #{deptId}::bigint = ANY(string_to_array(t.ancestors, ',')::int[])))
</select>
<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
select count(*) from sys_dept where status = 0 and del_flag = '0' and #{deptId}::bigint = ANY(string_to_array(t.ancestors, ',')::int[])))
</select>
<select id="checkDeptNameUnique" resultMap="SysDeptResult">

4
mh-system/src/main/resources/mapper/system/SysUserMapper.xml

@ -79,7 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND date_format(u.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
</if>
<if test="deptId != null and deptId != 0">
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id
FROM sys_dept t
WHERE #{deptId}::bigint = ANY(string_to_array(t.ancestors, ',')::int[])))
</if>
<!-- 数据范围过滤 -->
${params.dataScope}

3
pom.xml

@ -90,7 +90,6 @@
<version>${sqlserver.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
@ -99,7 +98,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<version>${mybatis.version}</version>
</dependency>

98
sql/添加自增id.sql

@ -0,0 +1,98 @@
CREATE SEQUENCE notice_id_seq
START WITH 10000
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
ALTER TABLE sys_notice ALTER COLUMN notice_id
SET DEFAULT nextval('notice_id_seq');
CREATE SEQUENCE config_id_seq
START WITH 10000
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
ALTER TABLE sys_config ALTER COLUMN config_id
SET DEFAULT nextval('config_id_seq');
CREATE SEQUENCE dept_id_seq
START WITH 10000
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
ALTER TABLE sys_dept ALTER COLUMN dept_id
SET DEFAULT nextval('dept_id_seq');
CREATE SEQUENCE dict_code_seq
START WITH 10000
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
ALTER TABLE sys_dict_data ALTER COLUMN dict_code
SET DEFAULT nextval('dict_code_seq');
CREATE SEQUENCE dict_id_seq
START WITH 10000
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
ALTER TABLE sys_dict_type ALTER COLUMN dict_id
SET DEFAULT nextval('dict_id_seq');
CREATE SEQUENCE info_id_seq
START WITH 10000
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
ALTER TABLE sys_logininfor ALTER COLUMN info_id
SET DEFAULT nextval('info_id_seq');
CREATE SEQUENCE menu_id_seq
START WITH 10000
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
ALTER TABLE sys_menu ALTER COLUMN menu_id
SET DEFAULT nextval('menu_id_seq');
CREATE SEQUENCE oper_id_seq
START WITH 10000
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
ALTER TABLE sys_oper_log ALTER COLUMN oper_id
SET DEFAULT nextval('oper_id_seq');
CREATE SEQUENCE post_id_seq
START WITH 10000
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
ALTER TABLE sys_post ALTER COLUMN post_id
SET DEFAULT nextval('post_id_seq');
CREATE SEQUENCE role_id_seq
START WITH 10000
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
ALTER TABLE sys_role ALTER COLUMN role_id
SET DEFAULT nextval('role_id_seq');
CREATE SEQUENCE user_id_seq
START WITH 10000
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
ALTER TABLE sys_user ALTER COLUMN user_id
SET DEFAULT nextval('user_id_seq');
Loading…
Cancel
Save