mysql版本

pom.xml

@@ -41,6 +41,10 @@
 			<version>1.3.2</version>
 		</dependency>
 		<dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
@@ -51,7 +55,7 @@
 			<version>1.2.3</version>
 		</dependency>
 		<!-- gbase依赖包 -->  
-		<dependency>
+		<!-- <dependency>
 	      	<groupId>com.gbase8s</groupId>
 	      	<artifactId>ifxjdbc</artifactId>
 	      	<version>1.0</version>
@@ -60,7 +64,7 @@
       		<groupId>com.gbase</groupId>
       		<artifactId>druid</artifactId>
       		<version>1.0.28</version>
-    	</dependency>
+    	</dependency> -->
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>

src/main/java/com/chinaitop/DepotBasicApplication.java

@@ -15,13 +15,14 @@ import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
 @EnableEurekaClient
 @EnableDiscoveryClient
 @EnableFeignClients
-@SpringBootApplication(exclude = PageHelperAutoConfiguration.class)//配置mybatis的配置文件使用，否则报多个分页插件
+@SpringBootApplication
+//@SpringBootApplication(exclude = PageHelperAutoConfiguration.class)//配置mybatis的配置文件使用，否则报多个分页插件
 @MapperScan(basePackages = {"com.chinaitop.depot.**.mapper"})
 public class DepotBasicApplication {
 
 	public static void main(String[] args) {
-		System.setProperty("druid.testWhileIdle", "true");
-		System.setProperty("druid.validationQuery", "SELECT 1 FROM DUAL");
+		//System.setProperty("druid.testWhileIdle", "true");
+		//System.setProperty("druid.validationQuery", "SELECT 1 FROM DUAL");
 		SpringApplication.run(DepotBasicApplication.class, args);
 	}
 }

src/main/java/com/chinaitop/depot/basic/mapper/BasicStorehouseMapper.xml

@@ -1462,24 +1462,23 @@
   </update>
   
   <select id="getThreeTempCheckList" parameterType="java.util.Map" resultMap="BaseResultMap">
-    select DISTINCT storehouse_id
-    from basic_storehouse storehouse
-    inner join (SELECT
-    *
-    FROM
-    (
-    SELECT
-    org_id,
-    storehouse
-    FROM
-    t_testdata
-    WHERE
-    org_id = #{orgId}
-    ORDER BY
-    storehouse
-    )
-    WHERE
-    rownum = 1) testdata on testdata.org_id = storehouse.org_id and testdata.storehouse = storehouse.storehouse_code
+	SELECT DISTINCT
+		storehouse_id
+	FROM
+		basic_storehouse storehouse
+	INNER JOIN (
+		SELECT
+			org_id,
+			storehouse
+		FROM
+			t_testdata
+		WHERE
+			org_id = #{orgId}
+		ORDER BY
+			storehouse
+		LIMIT 1
+	) testdata ON testdata.org_id = storehouse.org_id
+	AND testdata.storehouse = storehouse.storehouse_code
     <where>
       <if test="orgId != null">
       	storehouse.org_id = #{orgId}
@@ -1558,8 +1557,8 @@
   <!-- 查询当前仓房和油罐的有效容量之和 -->
   <select id="queryCrAndgw" parameterType="java.lang.Integer" resultType="java.util.Map">
   	SELECT 
-	NVL((SELECT SUM(a.actual_capacity) FROM basic_storehouse a WHERE a.del_flag=1 AND a.library_type='0' and a.org_id=#{orgId,jdbcType=INTEGER}),0) as cr_count,
-	NVL((SELECT SUM(a.tank_capacity) FROM basic_tank a WHERE a.del_flag=1 AND a.library_type='0' and a.org_id=#{orgId,jdbcType=INTEGER}),0) as gr_count
+	IFNULL((SELECT SUM(a.actual_capacity) FROM basic_storehouse a WHERE a.del_flag=1 AND a.library_type='0' and a.org_id=#{orgId,jdbcType=INTEGER}),0) as cr_count,
+	IFNULL((SELECT SUM(a.tank_capacity) FROM basic_tank a WHERE a.del_flag=1 AND a.library_type='0' and a.org_id=#{orgId,jdbcType=INTEGER}),0) as gr_count
 	FROM DUAL
   </select>
 </mapper>

src/main/resources/bootstrap.yml

@@ -26,33 +26,29 @@ spring:
     name: depot-basic
   # 数据库配置
   datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: com.gbasedbt.jdbc.IfxDriver
-    url: jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
-    username: gbasedbt
-    password: cDbK2S0go8
-    #url: jdbc:gbasedbt-sqli://111.164.113.172:666/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
-    #username: gbasedbt
-    #password: GBase123
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://101.36.160.140:21029/depot_gouxiao?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+    username: root
+    password: 1qaz@WSX
   # 缓存配置
-  session:
-    store-type: redis
-  redis:
-    database: 3
-    host: 172.16.0.2
-    port: 6379
-    password: 123456
-    timeout: 60000
-    jedis:
-      pool:
+  #session:
+    #store-type: redis
+  #redis:
+    #database: 3
+    #host: 172.16.0.2
+    #port: 6379
+    #password: 123456
+    #timeout: 60000
+    #jedis:
+      #pool:
         # 连接池最大连接数(使用负值表示没有限制)
-        max-active: 16
+        #max-active: 16
         # 连接池最大阻塞等待时间(使用负值表示没有限制)
-        max-wait: -1
+        #max-wait: -1
         # 连接池中的最大空闲连接
-        max-idle: 16
+        #max-idle: 16
         # 连接池中的最小空闲连接
-        min-idle: 0
+        #min-idle: 0
   # 静态资源配置
   resources:
     static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}