代码生成器调整

zhanghl

2025-05-13 d6fb52b2791eedbe246a58298b8af2f324045ade

代码生成器调整

 aps-modules/aps-core/src/main/resources/bootstrap-dev.yml

@@ -7,7 +7,7 @@
        server-addr: 192.168.50.160:8848
        namespace: 8e9f8829-4286-4925-943a-a6c242767ac2
        metadata:
          local: dev
          local: zhl
      config:
        # 配置中心地址
        server-addr: 192.168.50.160:8848

 aps-modules/aps-gen/pom.xml

@@ -65,7 +65,18 @@
            <groupId>com.aps</groupId>
            <artifactId>aps-common-swagger</artifactId>
        </dependency>

        <dependency>
            <groupId>org.mybatis</groupId>
            <artifactId>mybatis-spring</artifactId>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-jsqlparser</artifactId>
        </dependency>
    </dependencies>

    <build>

 aps-modules/aps-gen/src/main/java/com/aps/gen/mapper/GenTableColumnMapper.java

@@ -2,12 +2,14 @@

import java.util.List;
import com.aps.gen.domain.GenTableColumn;
import org.apache.ibatis.annotations.Mapper;

/**
 * 业务字段 数据层
 * 
 * @author ruoyi
 */
@Mapper
public interface GenTableColumnMapper
{
    /**

 aps-modules/aps-gen/src/main/java/com/aps/gen/mapper/GenTableMapper.java

@@ -2,12 +2,14 @@

import java.util.List;
import com.aps.gen.domain.GenTable;
import org.apache.ibatis.annotations.Mapper;

/**
 * 业务 数据层
 * 
 * @author ruoyi
 */
@Mapper
public interface GenTableMapper
{
    /**

 aps-modules/aps-gen/src/main/resources/bootstrap-int.yml

@@ -5,15 +5,16 @@
      discovery:
        # 服务注册地址
        server-addr: 192.168.50.160:8848
        namespace: 8e9f8829-4286-4925-943a-a6c242767ac2
        namespace: aafcd57a-d0f7-43e3-a77d-1dc85aec1f0e
        metadata:
          local: int
#        ip: 192.168.50.13
      config:
        # 配置中心地址
        server-addr: 192.168.50.160:8848
        # 配置文件格式
        file-extension: yml
        namespace: 8e9f8829-4286-4925-943a-a6c242767ac2
        namespace: aafcd57a-d0f7-43e3-a77d-1dc85aec1f0e
        # 共享配置
        shared-configs:
          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

 aps-modules/aps-gen/src/main/resources/bootstrap.yml

@@ -9,4 +9,4 @@
    name: aps-gen
  profiles:
    # 环境配置
    active: dev
    active: int

 aps-modules/aps-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.gen.mapper.GenTableColumnMapper">

    <resultMap type="GenTableColumn" id="GenTableColumnResult">
    <resultMap type="com.aps.gen.domain.GenTableColumn" id="GenTableColumnResult">
        <id     property="columnId"       column="column_id"      />
        <result property="tableId"        column="table_id"       />
        <result property="columnName"     column="column_name"    />
@@ -44,7 +44,7 @@
        from list_column where table_name = (#{tableName})
    </select>

    <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
    <insert id="insertGenTableColumn" parameterType="com.aps.gen.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
        insert into gen_table_column (
        <if test="tableId != null and tableId != ''">table_id,</if>
        <if test="columnName != null and columnName != ''">column_name,</if>
@@ -88,7 +88,7 @@
        )
    </insert>

    <update id="updateGenTableColumn" parameterType="GenTableColumn">
    <update id="updateGenTableColumn" parameterType="com.aps.gen.domain.GenTableColumn">
        update gen_table_column
        <set>
            <if test="columnComment != null">column_comment = #{columnComment},</if>

 aps-modules/aps-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.gen.mapper.GenTableMapper">
    <resultMap type="GenTable" id="GenTableResult">
    <resultMap type="com.aps.gen.domain.GenTable" id="GenTableResult">
        <id     property="tableId"        column="table_id"          />
        <result property="tableName"      column="table_name"        />
        <result property="tableComment"   column="table_comment"     />
@@ -28,7 +28,7 @@
        <collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
    </resultMap>

    <resultMap type="GenTableColumn" id="GenTableColumnResult">
    <resultMap type="com.aps.gen.domain.GenTableColumn" id="GenTableColumnResult">
        <id     property="columnId"       column="column_id"      />
        <result property="tableId"        column="table_id"       />
        <result property="columnName"     column="column_name"    />
@@ -57,7 +57,7 @@
        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
    </sql>

    <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
    <select id="selectGenTableList" parameterType="com.aps.gen.domain.GenTable" resultMap="GenTableResult">
        <include refid="selectGenTableVo"/>
        <where>
            <if test="tableName != null and tableName != ''">
@@ -75,7 +75,7 @@
        </where>
    </select>

    <select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
    <select id="selectDbTableList" parameterType="com.aps.gen.domain.GenTable" resultMap="GenTableResult">
        SELECT table_name, table_comment, create_time, update_time
        FROM list_table
        WHERE table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
@@ -135,7 +135,7 @@
        order by c.sort
    </select>

    <insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
    <insert id="insertGenTable" parameterType="com.aps.gen.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
        insert into gen_table (
        <if test="tableName != null">table_name,</if>
        <if test="tableComment != null and tableComment != ''">table_comment,</if>
@@ -169,7 +169,7 @@
        )
    </insert>

    <update id="updateGenTable" parameterType="GenTable">
    <update id="updateGenTable" parameterType="com.aps.gen.domain.GenTable">
        update gen_table
        <set>
            <if test="tableName != null">table_name = #{tableName},</if>