Merge branch 'dev_mp' into dev

zhanghl

2025-05-13 2b72ee5736445aab3aa2b4ba6b862d7c660be9ce

Merge branch 'dev_mp' into dev

 aps-common/aps-common-core/pom.xml

@@ -53,11 +53,6 @@
            <artifactId>pagehelper-spring-boot-starter</artifactId>
        </dependency>

        <!-- Mybatis Spring -->
        <dependency>
            <groupId>org.mybatis</groupId>
            <artifactId>mybatis-spring</artifactId>
        </dependency>

        <!-- Hibernate Validator -->
        <dependency>
@@ -125,6 +120,20 @@
            <artifactId>hutool-all</artifactId>
            <version>5.8.16</version>
        </dependency>
<!--                 Mybatis Spring -->
        <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>

</project>

 aps-common/aps-common-core/src/main/java/com/aps/common/core/config/MyBatisPlusConfig.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
package com.aps.common.core.config;


import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@Configuration
public class MyBatisPlusConfig {

    /**
     * åˆ†é¡µæ’件
     */
    @Bean
    public PaginationInnerInterceptor paginationInterceptor() {
        PaginationInnerInterceptor paginationInterceptor = new PaginationInnerInterceptor();
        // è®¾ç½®è¯·æ±‚的页面大于最大页后是否进行回滚, true回滚, false继续
        paginationInterceptor.setOverflow(false);
        // è®¾ç½®æœ€å¤§å•é¡µé™åˆ¶æ•°é‡, é»˜è®¤ 500 æ¡, -1 ä¸å—限制
        paginationInterceptor.setDbType(DbType.MYSQL);
        paginationInterceptor.setMaxLimit(-1L);
        return paginationInterceptor;
    }

    /**
     * ä¹è§‚锁插件
     */
    @Bean
    public OptimisticLockerInnerInterceptor optimisticLockerInterceptor() {
        return new OptimisticLockerInnerInterceptor();
    }


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


}

 aps-modules/aps-core/pom.xml

@@ -95,6 +95,18 @@
            <artifactId>lombok</artifactId>
            <scope>provided</scope>
        </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-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java

@@ -31,13 +31,14 @@
    /**
     * æŸ¥è¯¢å·¥åŽ‚管理列表
     */
    @RequiresPermissions("plant:list")
    //@RequiresPermissions("plant:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsPlant apsPlant)
    {
        startPage();
        List<ApsPlant> list = apsPlantService.selectApsPlantList(apsPlant);
        return getDataTable(list);
        //startPage();
        //List<ApsPlant> list = apsPlantService.selectApsPlantList(apsPlant);
        List<ApsPlant> list1 = apsPlantService.list();
        return getDataTable(list1);
    }

    /**

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsShopController.java

@@ -31,7 +31,7 @@
    /**
     * æŸ¥è¯¢è½¦é—´åˆ—表
     */
    @RequiresPermissions("shop:list")
   // @RequiresPermissions("shop:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsShop apsShop)
    {

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlant.java

@@ -1,5 +1,7 @@
package com.aps.core.domain;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.aps.common.core.annotation.Excel;
@@ -11,6 +13,8 @@
 * @author ruoyi
 * @date 2025-04-14
 */
@Getter
@TableName(value = "aps_plant")
public class ApsPlant extends BaseEntity
{
    private static final long serialVersionUID = 1L;
@@ -35,19 +39,9 @@
        this.id = id;
    }

    public String getId()
    {
        return id;
    }

    public void setPlantName(String plantName) 
    {
        this.plantName = plantName;
    }

    public String getPlantName() 
    {
        return plantName;
    }

    public void setPlantCode(String plantCode) 
@@ -55,19 +49,9 @@
        this.plantCode = plantCode;
    }

    public String getPlantCode() 
    {
        return plantCode;
    }

    public void setStatus(String status) 
    {
        this.status = status;
    }

    public String getStatus() 
    {
        return status;
    }

    @Override

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlantMapper.java

@@ -2,6 +2,7 @@

import java.util.List;
import com.aps.core.domain.ApsPlant;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
@@ -11,7 +12,7 @@
 * @date 2025-04-14
 */
@Mapper
public interface ApsPlantMapper 
public interface ApsPlantMapper  extends BaseMapper<ApsPlant>
{
    /**
     * æŸ¥è¯¢å·¥åŽ‚管理

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlantService.java

@@ -2,6 +2,7 @@

import java.util.List;
import com.aps.core.domain.ApsPlant;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * å·¥åŽ‚管理Service接口
@@ -9,7 +10,7 @@
 * @author ruoyi
 * @date 2025-04-14
 */
public interface IApsPlantService 
public interface IApsPlantService  extends IService<ApsPlant>
{
    /**
     * æŸ¥è¯¢å·¥åŽ‚管理

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlantServiceImpl.java

@@ -4,6 +4,7 @@
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.SecurityUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlantMapper;
@@ -17,7 +18,7 @@
 * @date 2025-04-14
 */
@Service
public class ApsPlantServiceImpl implements IApsPlantService 
public class ApsPlantServiceImpl extends ServiceImpl<ApsPlantMapper, ApsPlant> implements IApsPlantService
{
    @Autowired
    private ApsPlantMapper apsPlantMapper;

 aps-modules/aps-core/src/main/resources/application.yml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,96 @@
server:
  port: 9205
spring:
  application:
    # åº”用名称
    name: aps-core
  cloud:
    nacos:
      discovery:
        # æœåŠ¡æ³¨å†Œåœ°å€
        server-addr: 192.168.50.160:8848
        namespace: aafcd57a-d0f7-43e3-a77d-1dc85aec1f0e
        metadata:
          local: int
      config:
        # é…ç½®ä¸­å¿ƒåœ°å€
        server-addr: 192.168.50.160:8848
        # é…ç½®æ–‡ä»¶æ ¼å¼
        file-extension: yml
        namespace: aafcd57a-d0f7-43e3-a77d-1dc85aec1f0e
        # å…±äº«é…ç½®
        shared-configs:
          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
  # spring配置
  data:
    redis:
      host: 192.168.50.160
      port: 6379
      password:
  datasource:
    druid:
      stat-view-servlet:
        enabled: true
        loginUsername: ruoyi
        loginPassword: 123456
    dynamic:
      druid:
        initial-size: 5
        min-idle: 5
        maxActive: 20
        maxWait: 60000
        connectTimeout: 30000
        socketTimeout: 60000
        timeBetweenEvictionRunsMillis: 60000
        minEvictableIdleTimeMillis: 300000
        testWhileIdle: true
        testOnBorrow: false
        testOnReturn: false
        poolPreparedStatements: true
        maxPoolPreparedStatementPerConnectionSize: 20
        filters: stat,slf4j
      datasource:
        # ä¸»åº“数据源
        master:
          driver-class-name: org.postgresql.Driver
          url: jdbc:postgresql://192.168.50.160:5432/postgres?stringtype=unspecified
          username: postgres
          password: pwd@aps
          # ä»Žåº“数据源
          # slave:
          # username:
          # password:
          # url:
          # driver-class-name:

## mybatis配置
#mybatis:
#  # æœç´¢æŒ‡å®šåŒ…别名
#  typeAliasesPackage: com.aps.core
#  # é…ç½®mapper的扫描，找到所有的mapper.xml映射文件
#  mapperLocations: classpath:mapper/**/*.xml
# mp配置
mybatis-plus:
  mapper-locations:  classpath:mapper/**/*.xml
  type-aliases-package: com.aps.core
  global-config:
    db-config:
      id-type: ASSIGN_ID
      logic-delete-value: 1
      logic-not-delete-value: 0
  configuration:
    map-underscore-to-camel-case: true
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl


# springdoc配置
springdoc:
  gatewayUrl: http://localhost:8080/${spring.application.name}
  api-docs:
    # æ˜¯å¦å¼€å¯æŽ¥å£æ–‡æ¡£
    enabled: true
  info:
    # æ ‡é¢˜
    title: '系统模块接口文档'
    # æè¿°
    description: '系统模块接口描述'

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

@@ -9,4 +9,4 @@
    name: aps-core
  profiles:
    # çŽ¯å¢ƒé…ç½®
    active: dev
    active: int

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlantMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlantMapper">
    
    <resultMap type="ApsPlant" id="ApsPlantResult">
    <resultMap type="com.aps.core.domain.ApsPlant" id="ApsPlantResult">
        <result property="id"    column="id"    />
        <result property="plantName"    column="plant_name"    />
        <result property="plantCode"    column="plant_code"    />

 pom.xml

@@ -34,6 +34,7 @@
        <poi.version>4.1.2</poi.version>
        <springdoc.version>2.6.0</springdoc.version>
        <transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
        <mybatis-plus-version>3.5.1</mybatis-plus-version>
    </properties>

    <!-- ä¾èµ–声明 -->
@@ -92,12 +93,6 @@
                        <groupId>org.mybatis</groupId>
                    </exclusion>
                </exclusions>
            </dependency>

            <dependency>
                <groupId>org.mybatis</groupId>
                <artifactId>mybatis-spring</artifactId>
                <version>${mybatis-spring.version}</version>
            </dependency>

            <!-- io常用工具类 -->
@@ -212,6 +207,34 @@
                <version>${aps.version}</version>
            </dependency>

            <dependency>
                <groupId>org.mybatis</groupId>
                <artifactId>mybatis-spring</artifactId>
                <version>${mybatis-spring.version}</version>
            </dependency>

            <dependency>
                <groupId>com.baomidou</groupId>
                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
                <version>3.5.10</version>
                <exclusions>
                    <exclusion>
                        <artifactId>mybatis-spring</artifactId>
                        <groupId>org.mybatis</groupId>
                    </exclusion>
                </exclusions>
            </dependency>
            <dependency>
                <groupId>com.baomidou</groupId>
                <artifactId>mybatis-plus-jsqlparser</artifactId>
                <version>3.5.10</version>
                <exclusions>
                    <exclusion>
                        <artifactId>mybatis-spring</artifactId>
                        <groupId>org.mybatis</groupId>
                    </exclusion>
                </exclusions>
            </dependency>
        </dependencies>
    </dependencyManagement>