1.MybatisPlusu优化 2.煤种信息 3.代码生成优化

liding

5 天以前 3d6d22b23a7e4cd6073af3538cb14480bdd58db0

1.MybatisPlusu优化 2.煤种信息 3.代码生成优化

 basic-server/src/main/java/com/ruoyi/basic/controller/CoalInfoController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
package com.ruoyi.basic.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.CoalInfoDto;
import com.ruoyi.basic.dto.SupplyDto;
import com.ruoyi.basic.entity.CoalInfo;
import com.ruoyi.basic.entity.Supply;
import com.ruoyi.basic.service.CoalInfoService;
import com.ruoyi.common.core.domain.R;
import org.springframework.web.bind.annotation.*;
import lombok.AllArgsConstructor;

/**
 * <p>
 * ç…¤ç§ä¿¡æ¯è¡¨ å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author ruoyi
 * @since 2025-06-03
 */

@RestController
@AllArgsConstructor
@RequestMapping("/basic/coalInfo")
public class CoalInfoController {

    private CoalInfoService coalInfoService;

    /**
     * æŸ¥è¯¢
     */
    @GetMapping("/list")
    public R<IPage<CoalInfo>> list(Page page, CoalInfoDto coalInfoDto) {
        IPage<CoalInfo> list = coalInfoService.selectCoalInfoList(page,coalInfoDto);
        return R.ok(list);
    }


    /**
     * æ–°å¢žä¿®æ”¹
     */
    @PostMapping("/addOrEditCoalInfo")
    public R addOrEditCoalInfo(@RequestBody CoalInfoDto coalInfoDto) {
        return R.ok(coalInfoService.addOrEditCoalInfo(coalInfoDto));
    }

    /**
     * åˆ é™¤
     */
    @DeleteMapping("/delCoalInfo")
    public R remove(@RequestBody Long[] ids) {
        return R.ok(coalInfoService.delCoalInfoByIds(ids));
    }

}

 basic-server/src/main/java/com/ruoyi/basic/controller/CustomerController.java

@@ -2,20 +2,20 @@

import org.springframework.web.bind.annotation.RequestMapping;
import lombok.AllArgsConstructor;
    import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.RestController;

/**
* <p>
    *  å‰ç«¯æŽ§åˆ¶å™¨
    * </p>
*
* @author ruoyi
* @since 2025-06-03
*/
 * <p>
 * å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author ruoyi
 * @since 2025-06-03
 */

@RestController
@AllArgsConstructor
@RequestMapping("/basic/customer")
        public class CustomerController {
public class CustomerController {

    }
}

 basic-server/src/main/java/com/ruoyi/basic/dto/CoalInfoDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
package com.ruoyi.basic.dto;

import com.ruoyi.basic.entity.CoalInfo;
import lombok.Data;

@Data
public class CoalInfoDto extends CoalInfo {
}

 basic-server/src/main/java/com/ruoyi/basic/entity/CoalInfo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
package com.ruoyi.basic.entity;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.ruoyi.common.core.domain.MyBaseEntity;

import java.util.Date;

/**
 * ç…¤ç§ä¿¡æ¯è¡¨ å®žä½“ç±»
 *
 * @author ruoyi
 * @date 2025-06-03
 */
@Data
@TableName("coal_info")
public class CoalInfo extends MyBaseEntity {

    private static final long serialVersionUID = 1L;

    /**
     * ä¸»é”®ID
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * ç…¤ç§åç§°
     */
    @TableField(value = "coal_name")
    private String coalName;
    /**
     * ç»´æŠ¤äººå§“名
     */
    @TableField(value = "maintainer")
    private String maintainer;
    /**
     * ç»´æŠ¤æ—¥æœŸ
     */
    @TableField(value = "maintenance_date")
    private Date maintenanceDate;
}

 basic-server/src/main/java/com/ruoyi/basic/mapper/CoalInfoMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.basic.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.basic.entity.CoalInfo;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 * ç…¤ç§ä¿¡æ¯è¡¨ Mapper æŽ¥å£
 * </p>
 *
 * @author ruoyi
 * @since 2025-06-03
 */
@Mapper
public interface CoalInfoMapper extends BaseMapper<CoalInfo> {

}

 basic-server/src/main/java/com/ruoyi/basic/service/CoalInfoService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.basic.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.CoalInfoDto;
import com.ruoyi.basic.entity.CoalInfo;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * ç…¤ç§ä¿¡æ¯è¡¨ æœåŠ¡ç±»
 * </p>
 *
 * @author ruoyi
 * @since 2025-06-03
 */
public interface CoalInfoService extends IService<CoalInfo> {

    IPage<CoalInfo> selectCoalInfoList(Page page, CoalInfoDto coalInfoDto);

    int addOrEditCoalInfo(CoalInfoDto coalInfoDto);

    int delCoalInfoByIds(Long[] ids);
}

 basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,67 @@
package com.ruoyi.basic.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.CoalInfoDto;
import com.ruoyi.basic.entity.CoalInfo;
import com.ruoyi.basic.entity.Supply;
import com.ruoyi.basic.mapper.CoalInfoMapper;
import com.ruoyi.basic.service.CoalInfoService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.bean.BeanUtils;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import org.springframework.util.StringUtils;

import java.util.Objects;

/**
 * <p>
 * ç…¤ç§ä¿¡æ¯è¡¨ æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author ruoyi
 * @since 2025-06-03
 */
@Service
@RequiredArgsConstructor
public class CoalInfoServiceImpl extends ServiceImpl<CoalInfoMapper, CoalInfo> implements CoalInfoService {

    private final CoalInfoMapper coalInfoMapper;

    @Override
    public IPage<CoalInfo> selectCoalInfoList(Page page, CoalInfoDto coalInfoDto) {
        LambdaQueryWrapper<CoalInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.orderByDesc(CoalInfo::getCreateTime);
        return coalInfoMapper.selectPage(page, queryWrapper);
    }

    @Override
    public int addOrEditCoalInfo(CoalInfoDto coalInfoDto) {
        CoalInfo coalInfo = new CoalInfo();
        BeanUtils.copyProperties(coalInfoDto, coalInfo);
        if (Objects.isNull(coalInfo.getId())) {
            return coalInfoMapper.insert(coalInfo);
        } else {
            return coalInfoMapper.updateById(coalInfo);
        }
    }

    @Override
    public int delCoalInfoByIds(Long[] ids) {
        // æ£€æŸ¥å‚æ•°
        if (ids == null || ids.length == 0) {
            return 0;
        }

        // æž„造更新条件
        UpdateWrapper<CoalInfo> updateWrapper = new UpdateWrapper<>();
        updateWrapper.in("id", ids)
                .set("deleted", 1);  // è®¾ç½® deleted ä¸º 1 è¡¨ç¤ºå·²åˆ é™¤

        // æ‰§è¡Œæ‰¹é‡é€»è¾‘删除
        return coalInfoMapper.update(null, updateWrapper);
    }
}

 basic-server/src/main/resources/db/migration/postgresql/V20250603102701__create_table_coal_info.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
-- åˆ›å»º coal_info è¡¨
CREATE TABLE coal_info
(
    id               SERIAL PRIMARY KEY,                              -- ä¸»é”®ï¼Œè‡ªåŠ¨é€’增
    coal_name        VARCHAR(255) NOT NULL,                           -- ç…¤ç§åç§°ï¼Œä¸å…è®¸ä¸ºç©º
    maintainer       VARCHAR(255) NOT NULL,                           -- ç»´æŠ¤äººï¼Œä¸å…è®¸ä¸ºç©º
    maintenance_date DATE         NOT NULL,                           -- ç»´æŠ¤æ—¥æœŸï¼Œä¸å…è®¸ä¸ºç©º

    -- æ–°å¢žå­—段
    deleted          int4         NOT NULL DEFAULT 0,                 -- æ˜¯å¦åˆ é™¤ï¼ˆè½¯åˆ é™¤æ ‡å¿—）
    create_by        VARCHAR(255),                                    -- åˆ›å»ºäºº
    create_time      TIMESTAMP             DEFAULT CURRENT_TIMESTAMP, -- åˆ›å»ºæ—¶é—´ï¼Œé»˜è®¤å½“前时间
    update_by        VARCHAR(255),                                    -- æœ€åŽæ›´æ–°äºº
    update_time      TIMESTAMP             DEFAULT CURRENT_TIMESTAMP  -- æœ€åŽæ›´æ–°æ—¶é—´ï¼Œé»˜è®¤å½“前时间
);

-- ä¸ºè¡¨æ·»åŠ æ³¨é‡Š
COMMENT ON TABLE coal_info IS '煤种信息表';

-- ä¸ºå­—段添加注释
COMMENT ON COLUMN coal_info.id IS '主键ID';
COMMENT ON COLUMN coal_info.coal_name IS '煤种名称';
COMMENT ON COLUMN coal_info.maintainer IS '维护人姓名';
COMMENT ON COLUMN coal_info.maintenance_date IS '维护日期';

-- æ–°å¢žå­—段的注释
COMMENT ON COLUMN coal_info.deleted IS '软删除标志，true表示已删除';
COMMENT ON COLUMN coal_info.create_by IS '创建人用户名';
COMMENT ON COLUMN coal_info.create_time IS '记录创建时间';
COMMENT ON COLUMN coal_info.update_by IS '最后更新人用户名';
COMMENT ON COLUMN coal_info.update_time IS '记录最后更新时间';

 basic-server/src/main/resources/mapper/CoalInfoMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.CoalInfoMapper">

        <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
        <resultMap id="BaseResultMap" type="com.ruoyi.basic.entity.CoalInfo">
                    <id column="id" property="id" />
                <result column="deleted" property="deleted" />
                <result column="create_by" property="createBy" />
                <result column="create_time" property="createTime" />
                <result column="update_by" property="updateBy" />
                <result column="update_time" property="updateTime" />
                    <result column="coal_name" property="coalName" />
                    <result column="maintainer" property="maintainer" />
                    <result column="maintenance_date" property="maintenanceDate" />
        </resultMap>

        <!-- é€šç”¨æŸ¥è¯¢ç»“果列 -->
        <sql id="Base_Column_List">
                deleted,
                create_by,
                create_time,
                update_by,
                update_time,
            id, coal_name, maintainer, maintenance_date
        </sql>

</mapper>

 pom.xml

@@ -234,6 +234,12 @@
            <version>${mybatis-plus.version}</version>
        </dependency>

        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-jsqlparser</artifactId>
            <version>${mybatis-plus.version}</version>
        </dependency>

        <!--mybatis-plus代码生成器-->
        <dependency>
            <groupId>com.baomidou</groupId>

 ruoyi-admin/pom.xml

@@ -73,6 +73,11 @@
            <artifactId>basic-server</artifactId>
        </dependency>

        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common</artifactId>
        </dependency>

        <!-- å®šæ—¶ä»»åŠ¡-->
        <dependency>
            <groupId>com.ruoyi</groupId>

 ruoyi-admin/src/main/java/com/ruoyi/PlusCodeGenerator.java

@@ -28,9 +28,9 @@
public class PlusCodeGenerator {

    // æ•°æ®åº“配置
    private static final String DB_URL = "jdbc:postgresql://localhost:5432/ruoyi-java";
    private static final String DB_URL = "jdbc:postgresql://localhost:5432/ruoyi-zd";
    private static final String DB_USERNAME = "postgres";
    private static final String DB_PASSWORD = "root";
    private static final String DB_PASSWORD = "123456";

    // é¡¹ç›®åŸºç¡€é…ç½®
    private static final String BASE_PACKAGE = "com.ruoyi";
@@ -38,8 +38,8 @@

    public static void main(String[] args) {
        String projectPath = System.getProperty("user.dir"); // èŽ·å–项目根路径
        String path = "ruoyi-system"; // æ¨¡å—名称
        String table = "province,city,district"; // è¡¨åï¼Œå¤šä¸ªè¡¨é€—号隔开
        String path = "basic-server"; // æ¨¡å—名称
        String table = "coal_info"; // è¡¨åï¼Œå¤šä¸ªè¡¨é€—号隔开

        // ä»£ç è¾“出路径配置
        String outputBasePath = Paths.get(projectPath, path, "src", "main", "java").toString();
@@ -48,7 +48,7 @@
        // ä»£ç ç”Ÿæˆæ ¸å¿ƒé…ç½®
        FastAutoGenerator.create(DB_URL, DB_USERNAME, DB_PASSWORD)
                .globalConfig(builder -> {
                    builder.author("chenhj") // ä½œè€…信息
                    builder.author("ld") // ä½œè€…信息
                            .outputDir(outputBasePath) // ä»£ç è¾“出目录
                            .dateType(DateType.ONLY_DATE) // æ—¥æœŸç±»åž‹
                            .commentDate("yyyy-MM-dd") // æ³¨é‡Šæ—¥æœŸæ ¼å¼
@@ -73,7 +73,7 @@

                            // å®žä½“类配置
                            .entityBuilder()
                            .superClass("com.ruoyi.common.core.domain.BaseEntity") // ç»§æ‰¿åŸºç±»
                            .superClass("com.ruoyi.common.core.domain.MyBaseEntity") // ç»§æ‰¿åŸºç±»
                            .addSuperEntityColumns("create_by", "create_time", "update_by", "update_time") // æŽ’除基类字段
                            .enableLombok() // å¯ç”¨Lombok
                            .naming(NamingStrategy.underline_to_camel) // è¡¨åè½¬é©¼å³°
@@ -127,7 +127,7 @@
                            "create_by", "create_time", "update_by", "update_time"
                    )); // åŸºç±»å­—段
                    customMap.put("idType", "AUTO"); // ä¸»é”®ç±»åž‹
                    customMap.put("superEntityClass", "com.ruoyi.common.core.domain.BaseEntity"); // åŸºç±»å…¨è·¯å¾„
                    customMap.put("superEntityClass", "com.ruoyi.common.core.domain.MyBaseEntity"); // åŸºç±»å…¨è·¯å¾„
                    customMap.put("author", "ruoyi"); // ä½œè€…信息
                    customMap.put("packageName", BASE_PACKAGE + "." + MODULE_NAME); // åŒ…名
                    customMap.put("tableName", table); // è¡¨å
@@ -148,8 +148,8 @@
            if (Files.exists(entityPath)) {
                String content = Files.readString(entityPath);
                content = content.replace(
                        "extends com.ruoyi.common.core.domain.BaseEntity",
                        "extends BaseEntity"
                        "extends com.ruoyi.common.core.domain.MyBaseEntity",
                        "extends MyBaseEntity"
                ); // ç®€åŒ–基类引用
                Files.writeString(entityPath, content);
            }

 ruoyi-common/pom.xml

@@ -125,12 +125,6 @@
            <version>3.5.16</version>
        </dependency>

        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
            <version>3.5.12</version>
        </dependency>

        <!-- minio -->
        <dependency>
            <groupId>io.minio</groupId>

 ruoyi-framework/pom.xml

@@ -53,17 +53,19 @@
            <artifactId>oshi-core</artifactId>
        </dependency>

        <!-- MyBatis Plus Starter for Spring Boot 3 -->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
            <version>3.5.12</version>
        </dependency>

        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-extension</artifactId>
            <version>3.5.6</version>
        </dependency>
<!--        &lt;!&ndash; å¯é€‰ï¼šæ‰‹åŠ¨å¼•å…¥ extension æ¨¡å— &ndash;&gt;-->
<!--        <dependency>-->
<!--            <groupId>com.baomidou</groupId>-->
<!--            <artifactId>mybatis-plus-extension</artifactId>-->
<!--            <version>3.5.12</version>-->
<!--        </dependency>-->

        <!-- ç³»ç»Ÿæ¨¡å—-->
        <dependency>

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java

@@ -7,51 +7,20 @@
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;

/**
 * Mybatis Plus é…ç½®
 *
 * @author ruoyi
 */
@EnableTransactionManagement(proxyTargetClass = true)
@Configuration
public class MybatisPlusConfig {

    @Bean
    public MybatisPlusInterceptor mybatisPlusInterceptor() {
    public MybatisPlusInterceptor mybatisPlusInterceptor(){
        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
        // åˆ†é¡µæ’件
        interceptor.addInnerInterceptor(paginationInnerInterceptor());
        // ä¹è§‚锁插件
        interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
        // é˜»æ–­æ’件
        interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
        // åˆ†é¡µ
        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.POSTGRE_SQL));
        // ä¹è§‚锁
        interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
        // é˜²æ­¢å…¨å±€åˆ é™¤æˆ–æ›´æ–°
        interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
        return interceptor;
    }

    /**
     * åˆ†é¡µæ’件，自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html
     */
    public PaginationInnerInterceptor paginationInnerInterceptor() {
        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
        // è®¾ç½®æ•°æ®åº“类型为mysql
        paginationInnerInterceptor.setDbType(DbType.MYSQL);
        // è®¾ç½®æœ€å¤§å•é¡µé™åˆ¶æ•°é‡ï¼Œé»˜è®¤ 500 æ¡ï¼Œ-1 ä¸å—限制
        paginationInnerInterceptor.setMaxLimit(-1L);
        return paginationInnerInterceptor;
    }

    /**
     * ä¹è§‚锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html
     */
    public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() {
        return new OptimisticLockerInnerInterceptor();
    }

    /**
     * å¦‚果是对全表的删除或更新操作，就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html
     */
    public BlockAttackInnerInterceptor blockAttackInnerInterceptor() {
        return new BlockAttackInnerInterceptor();
    }
}