Merge remote-tracking branch 'origin/master'

SZH

2022-06-29 392b41b8ce3c73cbfaf8235fbd8969709eb066cf

Merge remote-tracking branch 'origin/master'

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java

@@ -1,4 +1,4 @@
package com.gkhy.safePlatform.emergency.repository;

public class DemoInfoRepository {
public interface DemoInfoRepository {
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/DemoInfoServiceImpl.java

对比新文件
@@ -0,0 +1,8 @@
package com.gkhy.safePlatform.emergency.service.baseService.impl;

import com.gkhy.safePlatform.emergency.service.baseService.DemoInfoService;
import org.springframework.stereotype.Service;

@Service("demoInfoService")
public class DemoInfoServiceImpl implements DemoInfoService {
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java

@@ -1,6 +1,7 @@
package com.gkhy.safePlatform.emergency.service.impl;

import com.gkhy.safePlatform.emergency.service.DemoService;
import com.gkhy.safePlatform.emergency.service.baseService.DemoInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -8,7 +9,7 @@
public class DemoServiceImpl implements DemoService {

    @Autowired
    private DemoService demoService;
    private DemoInfoService demoInfoService;
    // 1

    //2

 emergency/emergency-service/src/main/resource/mapper/emergency/DemoInfoRepository.xml

对比新文件
@@ -0,0 +1,12 @@
<?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.gkhy.safePlatform.emergency.repository.DemoInfoRepository">

    <resultMap type="DemoInfoDo" id="DemoInfoDoResult">
        <result property="eventId"    column="event_id"    />
    </resultMap>


</mapper>

 pom.xml

@@ -30,6 +30,7 @@
        <mybatisPlusStarter.version>3.5.1</mybatisPlusStarter.version>
        <guava.version>31.1-jre</guava.version>
        <account.rpc.model.version>1.0-SNAPSHOT</account.rpc.model.version>
        <mybatis.plus.version>3.5.2</mybatis.plus.version>
    </properties>

    <parent>
@@ -82,6 +83,22 @@
                <groupId>com.gkhy.safePlatfrom</groupId>
                <artifactId>emergency-rpc-api</artifactId>
                <version>1.0-SNAPSHOT</version>
            </dependency>

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

        </dependencies>
@@ -194,4 +211,4 @@
    </build>


</project>
</project>

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java

@@ -2,8 +2,10 @@

import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.pagination.DialectFactory;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -26,15 +28,23 @@
//    }



    /**
     * 新版分页插件
     * @return
     * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除)
     */
    @Bean
    public MybatisPlusInterceptor mybatisPlusInterceptor(){
    public MybatisPlusInterceptor mybatisPlusInterceptor() {
        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
        PaginationInnerInterceptor innerInterceptor = new PaginationInnerInterceptor();
        innerInterceptor.setDbType(DbType.MYSQL);
        innerInterceptor.setMaxLimit(1000L);
        innerInterceptor.setDialect(DialectFactory.getDialect(DbType.MYSQL));
        interceptor.addInnerInterceptor(innerInterceptor);
        return interceptor;
    }

    @Bean
    public ConfigurationCustomizer configurationCustomizer() {
        return configuration -> {};
    }
}