diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java index 72592a5..03e0974 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java @@ -6,7 +6,7 @@ import com.alibaba.druid.pool.DruidDataSource; /** * druid 配置属性 - * + * * @author ruoyi */ @Configuration @@ -61,13 +61,16 @@ public class DruidProperties /** 配置获取连接等待超时的时间 */ datasource.setMaxWait(maxWait); - /** 配置驱动连接超时时间,检测数据库建立连接的超时时间,单位是毫秒 */ + /** 配置驱动连接超时时间,检测数据库建立连接的超时时间,单位是毫秒 */ datasource.setConnectTimeout(connectTimeout); /** 配置网络超时时间,等待数据库操作完成的网络超时时间,单位是毫秒 */ datasource.setSocketTimeout(socketTimeout); +/* + datasource.setConnectionProperties("connectTimeout="+connectTimeout+";socketTimeout="+socketTimeout); +*/ - /** 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 */ + /** 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 */ datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis); /** 配置一个连接在池中最小、最大生存的时间,单位是毫秒 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/quote/mapper/QuoteMapper.java b/ruoyi-system/src/main/java/com/ruoyi/quote/mapper/QuoteMapper.java index a951bad..5261c01 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quote/mapper/QuoteMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quote/mapper/QuoteMapper.java @@ -15,5 +15,7 @@ import java.util.List; * @Version 1.0 */ public interface QuoteMapper { - List queryMaterialListByParam(String precMaterialName,String vagueMaterialName,String vagueModel); + List selectMaterialListByParam(@Param("precMaterialName") String precMaterialName, + @Param("vagueMaterialName")String vagueMaterialName, + @Param("vagueModel") String vagueModel); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/quote/service/impl/QuoteServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/quote/service/impl/QuoteServiceImpl.java index 916dd0e..25560e3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quote/service/impl/QuoteServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quote/service/impl/QuoteServiceImpl.java @@ -32,6 +32,6 @@ public class QuoteServiceImpl implements QuoteService { * @return: java.util.List */ public List queryMaterialListByParam(String precMaterialName, String vagueMaterialName, String vagueModel) { - return quoteMapper.queryMaterialListByParam(precMaterialName, vagueMaterialName, vagueModel); + return quoteMapper.selectMaterialListByParam(precMaterialName, vagueMaterialName, vagueModel); } } diff --git a/ruoyi-system/src/main/resources/mapper/quote/QuoteMapper.xml b/ruoyi-system/src/main/resources/mapper/quote/QuoteMapper.xml new file mode 100644 index 0000000..e1f3c78 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/quote/QuoteMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-system/src/main/resources/mapper/quote/quote.xml b/ruoyi-system/src/main/resources/mapper/quote/quote.xml deleted file mode 100644 index a595dd5..0000000 --- a/ruoyi-system/src/main/resources/mapper/quote/quote.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/ruoyi-ui/src/views/quotePage/quote/index.vue b/ruoyi-ui/src/views/quotePage/quote/index.vue index ff7b228..64020ca 100644 --- a/ruoyi-ui/src/views/quotePage/quote/index.vue +++ b/ruoyi-ui/src/views/quotePage/quote/index.vue @@ -437,7 +437,7 @@
-
+
+
- +
确认