From 77178b576d748fb0f7223fbab4ade8b12d625ed2 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 24 十月 2023 16:37:59 +0800
Subject: [PATCH] 修复mybatis相关配置等问题
---
src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java | 2 +-
src/main/java/com/flightfeather/monitor/mapper/AnalysisDataMapper.java | 6 +++---
pom.xml | 2 +-
src/main/java/com/flightfeather/monitor/config/MybatisConfig4ds1.kt | 21 +++++++++++++++++----
src/main/resources/application.yml | 14 ++++++++++++++
5 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index caa30d5..a3ef5a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<version>0.0.1-SNAPSHOT</version>
<name>monitor</name>
<packaging>war</packaging>
- <description>monitor managet</description>
+ <description>monitor manage</description>
<properties>
<java.version>1.8</java.version>
diff --git a/src/main/java/com/flightfeather/monitor/config/MybatisConfig4ds1.kt b/src/main/java/com/flightfeather/monitor/config/MybatisConfig4ds1.kt
index 1b82eaf..d0c499d 100644
--- a/src/main/java/com/flightfeather/monitor/config/MybatisConfig4ds1.kt
+++ b/src/main/java/com/flightfeather/monitor/config/MybatisConfig4ds1.kt
@@ -5,6 +5,7 @@
import org.mybatis.spring.SqlSessionTemplate
import org.mybatis.spring.annotation.MapperScan
import org.springframework.beans.factory.annotation.Qualifier
+import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.Primary
@@ -19,18 +20,23 @@
* @see DataSourceConfig
*/
@Configuration
-@MapperScan(basePackages = ["com.flightfeather.monitor.domain.ds1.mapper"],
- sqlSessionTemplateRef = "ds1SqlSessionTemplate")
+@MapperScan(basePackages = ["com.flightfeather.monitor.domain.ds1.mapper", "com.flightfeather.monitor.mapper"],
+ sqlSessionTemplateRef = "ds1SqlSessionTemplate", sqlSessionFactoryRef = "ds1SqlSessionFactory")
class MybatisConfig4ds1 {
//涓绘暟鎹簮 ds1鏁版嵁婧�
@Primary
@Bean("ds1SqlSessionFactory")
@Throws(Exception::class)
- fun ds1SqlSessionFactory(@Qualifier("ds1DataSource") dataSource: DataSource?): SqlSessionFactory? {
+ fun ds1SqlSessionFactory(
+ @Qualifier("ds1DataSource") dataSource: DataSource?,
+ @Qualifier("ds1MybatisConfiguration") configuration: org.apache.ibatis.session.Configuration,
+ ): SqlSessionFactory? {
val sqlSessionFactory = SqlSessionFactoryBean()
sqlSessionFactory.setDataSource(dataSource)
- sqlSessionFactory.setMapperLocations(*PathMatchingResourcePatternResolver().getResources("classpath*:mapper/ds1/*.xml"))
+ sqlSessionFactory.setMapperLocations(*PathMatchingResourcePatternResolver().getResources
+ ("classpath*:mapper/**/*.xml"))
+ sqlSessionFactory.setConfiguration(configuration)
return sqlSessionFactory.getObject()
}
@@ -45,4 +51,11 @@
fun ds1SqlSessionTemplate(@Qualifier("ds1SqlSessionFactory") sqlSessionFactory: SqlSessionFactory?): SqlSessionTemplate? {
return SqlSessionTemplate(sqlSessionFactory)
}
+
+ @Bean(name = ["ds1MybatisConfiguration"])
+ @ConfigurationProperties(prefix = "mybatis.configuration")
+ fun ds1MybatisConfiguration(): org.apache.ibatis.session.Configuration {
+ return org.apache.ibatis.session.Configuration()
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/com/flightfeather/monitor/mapper/AnalysisDataMapper.java b/src/main/java/com/flightfeather/monitor/mapper/AnalysisDataMapper.java
index 9c8faa3..963107d 100644
--- a/src/main/java/com/flightfeather/monitor/mapper/AnalysisDataMapper.java
+++ b/src/main/java/com/flightfeather/monitor/mapper/AnalysisDataMapper.java
@@ -13,14 +13,14 @@
@Select("select * from analysis_data")
List<AnalysisData> findAllData();
- List<AnalysisData> findByDevId(String devId,String begin,String end);
+ List<AnalysisData> findByDevId(String devId, String begin, String end);
- List<AnalysisData> find(String shopname,String value,String begin, String end);
+ List<AnalysisData> find(String shopname, String value, String begin, String end);
@Insert("insert into fm_web_analysis_data values(#{fumeDevId},#{fumeDate},#{fumeDayMin},#{fumeDayMax},#{fumeDayAverage},#{purifierOpenRate},#{fumeMinuteExceedingNum},#{fumeOverStandardRate},#{fumeDataEfficiency},#{dailyOnlineRate},#{noonOnlineRate},#{nightOnlineRate},#{keyOnlineRate},#{noonValidRate},#{nightValidRate},#{keyValidRate},#{noonOpeningCount},#{nightOpeningCount},#{keyOpeningRate},#{noonExceedingNum},#{nightExceedingNum},#{keyExceedingRate})")
void write(AnalysisData analysisData);
- List<AnalysisData> search(String shopname,String value, String begin, String end);
+ List<AnalysisData> search(String shopname, String value, String begin, String end);
}
diff --git a/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java b/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java
index f0c95d9..096af75 100644
--- a/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java
+++ b/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java
@@ -9,7 +9,7 @@
import java.util.List;
@Mapper
-public interface FugitiveDustMapper {
+public interface FugitiveDustMapper{
List<DustSiteData> conditonQueryDustHistoryData(String siteName, String mnCode,String beginTime, String endTime,@Param("scenarioType") String[] scenarioType) ;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8d60e75..5588ba3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,9 +14,23 @@
# username: root
# password: 123456
+# url: jdbc:mysql://114.215.109.124:3306/fume
+# username: fumeRemote
+# password: feiyu2023
+
mybatis:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
+ type-aliases-package: com.flightfeather.monitor.domain.ds1.entity
+ mapper-locations: classpath*:mapper/**/*.xml
+
+# 閫氱敤 Mapper 閰嶇疆
+# mappers 澶氫釜鎺ュ彛鏃堕�楀彿闅斿紑
+mapper:
+ mappers: com.flightfeather.monitor.domain.util.MyMapper
+ not-empty: false
+ identity: MYSQL
+
server:
port: 8081
--
Gitblit v1.9.3