From 392b41b8ce3c73cbfaf8235fbd8969709eb066cf Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期三, 29 六月 2022 14:50:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/DemoInfoServiceImpl.java | 8 ++++
emergency/emergency-service/src/main/resource/mapper/emergency/DemoInfoRepository.xml | 12 ++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java | 2
pom.xml | 19 +++++++++
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java | 18 +++++++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java | 3 +
6 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java
index 7288fa8..f3b3747 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java
+++ b/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 {
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/DemoInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/DemoInfoServiceImpl.java
new file mode 100644
index 0000000..32b1aa0
--- /dev/null
+++ b/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 {
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
index 63fe037..0c2014f 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
+++ b/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
diff --git a/emergency/emergency-service/src/main/resource/mapper/emergency/DemoInfoRepository.xml b/emergency/emergency-service/src/main/resource/mapper/emergency/DemoInfoRepository.xml
new file mode 100644
index 0000000..ad16d78
--- /dev/null
+++ b/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>
diff --git a/pom.xml b/pom.xml
index 2476c05..79aa802 100644
--- a/pom.xml
+++ b/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>
\ No newline at end of file
+</project>
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java
index 7fce4a5..9b511fb 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java
+++ b/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 -> {};
+ }
}
--
Gitblit v1.9.2