mysql版本 提交

pom.xml

@@ -60,11 +60,17 @@
 		<artifactId>ojdbc14</artifactId>
 		<version>10.2.0.5.0</version>
 	</dependency> -->
-	<dependency>
+	<!-- <dependency>
 		<groupId>com.oracle</groupId>
 		<artifactId>ojdbc6</artifactId>
 		<version>11.2.0.3</version>
-	</dependency>
+	</dependency> -->
+	
+    <dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+	</dependency> 
+		
 	<dependency>
 		<groupId>com.alibaba</groupId>
 		<artifactId>druid-spring-boot-starter</artifactId>

src/main/java/com/unis/hlht/server/mapper/tabledata/TableDataMapper.java

@@ -22,36 +22,38 @@ import java.util.Map;
 @Repository
 public interface TableDataMapper extends MyMapper<Map> {
 
-    @Select({"<script> SELECT * FROM ( "
-            + "SELECT t.*,rownum num FROM ${tableName} t where is_upload = 0 "
-            + "and rownum &lt;= #{pageSize}",
+    @Select({"<script>"
+            + "SELECT t.* FROM ${tableName} t where is_upload = 0 ",
             "<if test = 'startTime != null'>",
-            "and to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &gt;= to_date(#{startTime},'yyyy-MM-dd HH24:MI:SS')",
+            /*"and str_to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &gt;= str_to_date(#{startTime},'yyyy-MM-dd HH24:MI:SS')",*/
+            "and (zhgxsj) &gt;= (#{startTime})",
             "</if>",
             "<if test = 'endTime != null'>",
-            "and to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &lt;= to_date(#{endTime},'yyyy-MM-dd HH24:MI:SS')",
+            /*"and str_to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &lt;= str_to_date(#{endTime},'yyyy-MM-dd HH24:MI:SS')",*/
+            "and (zhgxsj) &lt;= (#{endTime})",
             "</if>",
             "<if test = 'depDwdm != null'>",
             "and ${selectByDwdmOfCol} like #{depDwdm}",
             "</if>",
-            ") where num &gt; #{pageIndex}",
+            "limit #{pageIndex},#{pageSize}",
             "</script>"})
     List<Map> findAllByLoadDate(Map params);
 
     @Select({"<script> SELECT * FROM ( "
             + "SELECT t.*,rownum num FROM ${tableName} t where is_upload = 0 and id = #{busId}"
-            + " and rownum &lt;= #{pageSize} ",
-            " ) where num &gt; #{pageIndex} ",
+            +" ) a limit #{pageIndex},#{pageSize}",
             "</script>"})
     List<Map> findById(@Param("tableName") String tableName, @Param("busId") String busId,
                        @Param("pageSize") Integer pageSize, @Param("pageIndex") Integer pageIndex);
 
     @Select({"<script> SELECT count(*)  FROM ${tableName} where is_upload = 0 ",
             "<if test = 'startTime != null'>",
-            "and to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &gt;= to_date(#{startTime},'yyyy-MM-dd HH24:MI:SS')",
+            /*"and str_to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &gt;= str_to_date(#{startTime},'yyyy-MM-dd HH24:MI:SS')",*/
+            "and (zhgxsj) &gt;= (#{startTime})",
             "</if>",
             "<if test = 'endTime != null'>",
-            "and to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &lt;= to_date(#{endTime},'yyyy-MM-dd HH24:MI:SS')",
+            /*"and str_to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &lt;= str_to_date(#{endTime},'yyyy-MM-dd HH24:MI:SS')",*/
+            "and (zhgxsj) &lt;= (#{endTime})",
             "</if>",
             "<if test = 'depDwdm != null'>",
             "and ${selectByDwdmOfCol} like #{depDwdm} ",
@@ -85,19 +87,20 @@ public interface TableDataMapper extends MyMapper<Map> {
      */
     @Select({"<script> SELECT * FROM ( "
             + "SELECT t.WSDJCDH,t.JCSJ,t.HWDM,t.CFWW,t.CFWS,t.CFNW,t.CFNS,t.LSZGW,t.LSZDW,t.LSPJW,REPLACE(t.LSSDZJH,CHR(0),'') as LSSDZJH,t.CZBZ,t.ZHGXSJ,"
-            + "t.id,t.IS_UPLOAD,t.LOAD_DATE,t.DEP_DWDM,t.DEP_KQDM,t.TYHWBM,REPLACE(t.LSWDZJH,CHR(0),'') as LSWDZJH,"
-    		+"rownum num FROM ${tableName} t where is_upload = 0 "
-            + "and rownum &lt;= #{pageSize}",
+            + "t.id,t.IS_UPLOAD,t.LOAD_DATE,t.DEP_DWDM,t.DEP_KQDM,t.TYHWBM,REPLACE(t.LSWDZJH,CHR(0),'') as LSWDZJH"
+    		+"FROM ${tableName} t where is_upload = 0 ",
             "<if test = 'startTime != null'>",
-            "and to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &gt;= to_date(#{startTime},'yyyy-MM-dd HH24:MI:SS')",
+            /*"and str_to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &gt;= str_to_date(#{startTime},'yyyy-MM-dd HH24:MI:SS')",*/
+            "and (zhgxsj) &gt;= (#{startTime})",
             "</if>",
             "<if test = 'endTime != null'>",
-            "and to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &lt;= to_date(#{endTime},'yyyy-MM-dd HH24:MI:SS')",
+            /*"and str_to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &lt;= str_to_date(#{endTime},'yyyy-MM-dd HH24:MI:SS')",*/
+            "and (zhgxsj) &lt;= (#{endTime})",
             "</if>",
             "<if test = 'depDwdm != null'>",
             "and ${selectByDwdmOfCol} like #{depDwdm}",
             "</if>",
-            ") where num &gt; #{pageIndex}",
+            ") a limit #{pageIndex},#{pageSize}",
             "</script>"})
     List<Map> findAllByLoadDateLOB(Map params);
     
@@ -105,10 +108,9 @@ public interface TableDataMapper extends MyMapper<Map> {
     
     @Select({"<script> SELECT * FROM ( "
     		+ "SELECT t.WSDJCDH,t.JCSJ,t.HWDM,t.CFWW,t.CFWS,t.CFNW,t.CFNS,t.LSZGW,t.LSZDW,t.LSPJW,REPLACE(t.LSSDZJH,CHR(0),'') as LSSDZJH,t.CZBZ,t.ZHGXSJ,"
-            + "t.id,t.IS_UPLOAD,t.LOAD_DATE,t.DEP_DWDM,t.DEP_KQDM,t.TYHWBM,REPLACE(t.LSWDZJH,CHR(0),'') as LSWDZJH,"
-            + "rownum num FROM ${tableName} t where is_upload = 0 and id = #{busId}"
-            + " and rownum &lt;= #{pageSize} ",
-            " ) where num &gt; #{pageIndex} ",
+            + "t.id,t.IS_UPLOAD,t.LOAD_DATE,t.DEP_DWDM,t.DEP_KQDM,t.TYHWBM,REPLACE(t.LSWDZJH,CHR(0),'') as LSWDZJH"
+            + "FROM ${tableName} t where is_upload = 0 and id = #{busId}",
+            " ) a limit #{pageIndex},#{pageSize}",
             "</script>"})
     List<Map> findByIdLOB(@Param("tableName") String tableName, @Param("busId") String busId,
                        @Param("pageSize") Integer pageSize, @Param("pageIndex") Integer pageIndex);
@@ -119,10 +121,9 @@ public interface TableDataMapper extends MyMapper<Map> {
             + "SELECT QTNDJCDH,JCSJ,HWDM,CZBZ,ZHGXSJ,id,IS_UPLOAD,LOAD_DATE,DEP_DWDM,DEP_KQDM,ZYLX,TYHWBM,"
     		+"REPLACE(t.YQHLZJH,CHR(0),'') as YQHLZJH,REPLACE(t.EYHTHLZJH,CHR(0),'') as EYHTHLZJH,"
             +"REPLACE(t.LXFNDZJH,CHR(0),'') as LXFNDZJH,REPLACE(t.LHQNDZJH,CHR(0),'') as LHQNDZJH,"
-    		+"REPLACE(t.YYHDHLZJH,CHR(0),'') as YYHDHLZJH,REPLACE(t.YYHTHLZJH,CHR(0),'') as YYHTHLZJH,"
-            + "rownum num FROM ${tableName} t where is_upload = 0 and id = #{busId}"
-            + " and rownum &lt;= #{pageSize} ",
-            " ) where num &gt; #{pageIndex} ",
+    		+"REPLACE(t.YYHDHLZJH,CHR(0),'') as YYHDHLZJH,REPLACE(t.YYHTHLZJH,CHR(0),'') as YYHTHLZJH"
+            + "FROM ${tableName} t where is_upload = 0 and id = #{busId}",
+            " )a limit #{pageIndex},#{pageSize}",
             "</script>"})
     List<Map> findByIdQt(@Param("tableName") String tableName, @Param("busId") String busId,
                        @Param("pageSize") Integer pageSize, @Param("pageIndex") Integer pageIndex);
@@ -132,19 +133,20 @@ public interface TableDataMapper extends MyMapper<Map> {
             + "SELECT QTNDJCDH,JCSJ,HWDM,CZBZ,ZHGXSJ,id,IS_UPLOAD,LOAD_DATE,DEP_DWDM,DEP_KQDM,ZYLX,TYHWBM,"
             +"REPLACE(t.YQHLZJH,CHR(0),'') as YQHLZJH,REPLACE(t.EYHTHLZJH,CHR(0),'') as EYHTHLZJH,"
             +"REPLACE(t.LXFNDZJH,CHR(0),'') as LXFNDZJH,REPLACE(t.LHQNDZJH,CHR(0),'') as LHQNDZJH,"
-    		+"REPLACE(t.YYHDHLZJH,CHR(0),'') as YYHDHLZJH,REPLACE(t.YYHTHLZJH,CHR(0),'') as YYHTHLZJH,"
-    		+"rownum num FROM ${tableName} t where is_upload = 0 "
-            + "and rownum &lt;= #{pageSize}",
+    		+"REPLACE(t.YYHDHLZJH,CHR(0),'') as YYHDHLZJH,REPLACE(t.YYHTHLZJH,CHR(0),'') as YYHTHLZJH"
+    		+"FROM ${tableName} t where is_upload = 0 ",
             "<if test = 'startTime != null'>",
-            "and to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &gt;= to_date(#{startTime},'yyyy-MM-dd HH24:MI:SS')",
+            /*"and str_to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &gt;= str_to_date(#{startTime},'yyyy-MM-dd HH24:MI:SS')",*/
+            "and (zhgxsj) &gt;= (#{startTime})",
             "</if>",
             "<if test = 'endTime != null'>",
-            "and to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &lt;= to_date(#{endTime},'yyyy-MM-dd HH24:MI:SS')",
+            /*"and str_to_date(zhgxsj,'yyyy-MM-dd HH24:MI:SS') &lt;= str_to_date(#{endTime},'yyyy-MM-dd HH24:MI:SS')",*/
+            "and (zhgxsj) &lt;= (#{endTime})",
             "</if>",
             "<if test = 'depDwdm != null'>",
             "and ${selectByDwdmOfCol} like #{depDwdm}",
             "</if>",
-            ") where num &gt; #{pageIndex}",
+            ") a limit #{pageIndex},#{pageSize}",
             "</script>"})
     List<Map> findAllByLoadDateQt(Map params);
 

src/main/resources/application.yml

@@ -35,51 +35,10 @@ spring:
     exceptiontranslation:
       enabled: true
   datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      db-type: oracle
-      #数据库链接--青海
-      url: jdbc:oracle:thin:@(DESCRIPTION =
-        (ADDRESS_LIST =
-        (ADDRESS = (PROTOCOL = TCP)(HOST = 172.16.0.12)(PORT = 1521))
-        (LOAD_BALANCE = no)(FAILOVER=YES)
-        )
-        (CONNECT_DATA =
-        (SERVER = DEDICATED)
-        (SERVICE_NAME = ORCL)
-        )
-        )
-      username: updb_qh_n
-      password: 123456
-      driver-class-name: oracle.jdbc.driver.OracleDriver
-      initial-size: 30
-      max-active: 100
-      min-idle: 25
-      max-wait: 6000
-      pool-prepared-statements: true
-      max-pool-prepared-statement-per-connection-size: 1000
-      validation-query: SELECT 1 FROM DUAL
-      test-on-borrow: false
-      test-on-return: false
-      test-while-idle: true
-      time-between-connect-error-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      max-evictable-idle-time-millis: 3000000
-      filters: stat
-      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-      use-global-data-source-stat: true
-      #      aop-patterns: com.unis.user.server.repository.*
-      web-stat-filter:
-        url-pattern: /*
-        exclusions: /druid/*,*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico
-        enabled: true
-        session-stat-enable: true
-        session-stat-max-count: 10
-      stat-view-servlet:
-        url-pattern: /druid/*
-        reset-enable: true
-        login-username: druid
-        login-password: Admin@1238Sxls
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://172.16.0.36:3306/up_country_qh?useUnicode=true&characterEncoding=utf-8&useSSL=false
+    username: root
+    password: admin@1234
   # Redis 配置
   redis:
     # Redis 服务器地址
@@ -117,4 +76,8 @@ swagger:
 #本地测试地址
 #baseFilePath: C:\Users\18513\Pictures\targets
 #服务器地址
-baseFilePath: E:\lkMediaFile
+baseFilePath: E:\lkMediaFile
+
+logging:
+  level:
+    com.unis.hlht.server.mapper.tabledata: debug

src/main/resources/secure/secure.yml

@@ -30,7 +30,8 @@ national:
   nationalprikey:
   #http://106.3.145.72:49880/dep/service/API/UPLOAD/1101
 #  uploadip: 106.3.145.72
-  uploadip: 121.36.17.6
+  #uploadip: 121.36.17.6
+  uploadip: 121.36.17.6111
   uploadport: 9101
 #  uploaduri: dep/service/API/UPLOAD/V2020/
   #uploaduri: dep/service/API/UPLOAD/V2022/