oracle 时间取年月日查询,但是数据库存储的包含时间信息的BUG修复

@@ -7,7 +7,7 @@ server:
     context-path: ${SERVER_CONTEXTPATH:}
 spring:
   profiles:
-    active: pro
+    active: dev
   mvc:
     #静态资源，设置上传文件的访问，
     static-path-pattern: /**
@@ -132,7 +132,7 @@ jwt:
 #自定义配置
 custom:
   #进港放行回执读取目录
-  receptDirectory: /Users/mrz/Downloads/rdp_temp/logs/回执报文样例/20191018
+  receptDirectory: /Users/mrz/Downloads/rdp_temp/logs/回执报文样例/
   #回执解析成功后的备份目录
   receptBakDir: /Users/mrz/Downloads/rdp_temp/logs/success
   #解析错误报文的备份目录

@@ -24,9 +24,9 @@
     <!--输出到控制台-->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
-        <!--<filter class="ch.qos.logback.classic.filter.ThresholdFilter">-->
-            <!--<level>trace</level>-->
-        <!--</filter>-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>trace</level>
+        </filter>
         <encoder>
             <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
             <!-- 设置字符集 windows系统这里设置成GBK-->
@@ -197,7 +197,7 @@
         可以包含零个或多个元素，标识这个appender将会添加到这个logger。
     -->
     <!--<logger name="com.tianbo.analysis" level="trace">-->
-        <!--&lt;!&ndash;<appender-ref ref="CONSOLE" />&ndash;&gt;-->
+        <!--<appender-ref ref="CONSOLE" />-->
         <!--<appender-ref ref="TRACE_FILE" />-->
         <!--<appender-ref ref="DEBUG_FILE" />-->
         <!--<appender-ref ref="INFO_FILE" />-->
@@ -207,10 +207,11 @@
 
     <!--开发环境:打印控制台-->
     <springProfile name="dev">
-        <!--<logger name="org.springframework.boot" level="trace"/>-->
+        <logger name="org.springframework" level="info"/>
         <logger name="org.apache.tomcat" level="info" />
         <logger name="com.tianbo.analysis.dao" level="DEBUG" />
-        <root level="trace">
+        <logger name="com.tianbo.analysis" level="trace" />
+        <root level="info">
             <appender-ref ref="CONSOLE" />
             <appender-ref ref="TRACE_FILE" />
             <appender-ref ref="DEBUG_FILE" />
@@ -222,6 +223,7 @@
 
     <!--生产环境:输出到文件-->
     <springProfile name="pro">
+        <logger name="com.tianbo.analysis" level="trace" />
         <logger name="org.springframework.boot" level="INFO"/>
         <logger name="com.tianbo.analysis.dao" level="DEBUG" />
         <root level="info">

@@ -203,7 +203,7 @@ public class CustomXmlHandleThread implements Runnable{
                 }
                 break;
             case "MT3201":
-                if (customReception.getWayBillSecond()!=null && secondSplit.contains(customReception.getWayBillSecond())){
+                if (customReception.getWayBillSecond()!=null && customReception.getWayBillSecond().contains(secondSplit)){
                     ARRIVEDSECONDARY arrivedsecondary = new ARRIVEDSECONDARY(customReception);
                     i=arrivedsecondary.secondAnalysisReception();
                 }else {
@@ -212,7 +212,7 @@ public class CustomXmlHandleThread implements Runnable{
                 }
                 break;
             case "MT5202":
-                if (customReception.getWayBillSecond()!=null && secondSplit.contains(customReception.getWayBillSecond())){
+                if (customReception.getWayBillSecond()!=null && customReception.getWayBillSecond().contains(secondSplit)){
                     TALLYSECONDARY tallysecondary = new TALLYSECONDARY(customReception);
                     i=tallysecondary.secondAnalysisReception();
                 }else {
@@ -221,7 +221,7 @@ public class CustomXmlHandleThread implements Runnable{
                 }
                 break;
             case "MT5201":
-                if (customReception.getWayBillSecond()!=null && secondSplit.contains(customReception.getWayBillSecond())){
+                if (customReception.getWayBillSecond()!=null && customReception.getWayBillSecond().contains(secondSplit)){
                     TALLYSECONDARY tallysecondary = new TALLYSECONDARY(customReception);
                     i=tallysecondary.secondAnalysisReception();
                 }else {
@@ -234,16 +234,16 @@ public class CustomXmlHandleThread implements Runnable{
                 i=departuresloading.masterAnalysisReception();
                 break;
             case "MT1201":
-                if (customReception.getWayBillSecond()!=null && secondSplit.contains(customReception.getWayBillSecond())){
+                if (customReception.getWayBillSecond()!=null && customReception.getWayBillSecond().contains(secondSplit)){
                     Originmanifestsecondary originmanifestsecondary = new Originmanifestsecondary(customReception);
-                    originmanifestsecondary.secondAnalysisReception();
+                    i=originmanifestsecondary.secondAnalysisReception();
                 }else {
                     ORIGINMANIFESTMASTER originmanifestmaster1201 = new ORIGINMANIFESTMASTER(customReception);
                     i = originmanifestmaster1201.masterAnalysisReception();
                 }
                 break;
             case "MT2201":
-                if (customReception.getWayBillSecond()!=null && secondSplit.contains(customReception.getWayBillSecond())){
+                if (customReception.getWayBillSecond()!=null && customReception.getWayBillSecond().contains(secondSplit)){
                     PREPARESECONDARY preparesecondary = new PREPARESECONDARY(customReception);
                     i = preparesecondary.secondAnalysisReception();
                 }else {
@@ -323,7 +323,7 @@ public class CustomXmlHandleThread implements Runnable{
             String errDirByDay = customXmlHandle.errBakDir + "/" + today;
             File berrDirectory = new File(errDirByDay);
             FileUtils.moveFileToDirectory(file,berrDirectory,true);
-            log.info("数据库未找到与回执适配的信息备份文件:{}:"+file.getName());
+            log.info("数据库未找到与回执适配的信息备份文件:{}:",file.getName());
         }catch (FileExistsException e){
             log.error("备份解析错误文件失败，目标文件夹存在同名文件{}",file.getName());
         }catch (Exception e){

@@ -2,8 +2,10 @@ package com.tianbo.analysis.model;
 
 import com.tianbo.analysis.bean.WlptBaseModel;
 import com.tianbo.analysis.tools.AWBTools;
+import com.tianbo.util.Date.DateUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -75,6 +77,8 @@ public class Originmanifestsecondary extends WlptBaseModel {
 
     private String consigneePhone;
 
+    private ORIGINMANIFESTMASTER master;
+
     public String getAutoid() {
         return autoid;
     }
@@ -339,11 +343,22 @@ public class Originmanifestsecondary extends WlptBaseModel {
         this.waybillnosecondary = customReception.getWayBillSecond().split("_")[1];
         this.status = AWBTools.transCusRspCode(customReception.getResponseCode());
         this.receiption = customReception.getResponseText();
+
+        this.master = new ORIGINMANIFESTMASTER(customReception);
     }
 
     @Override
     public int secondAnalysisReception() {
         //更新分单回执
+
+        //todo:这里根据航班号航班日期还要反查下分单的主单id
+
+        List<ORIGINMANIFESTMASTER> masterlist = originmanifestmasterMapper.selectAutoIdByAwb(this.master);
+        if(!masterlist.isEmpty()){
+            ORIGINMANIFESTMASTER masterResult = masterlist.get(0);
+            this.originmanifestmasterautoid = masterResult.getAutoid();
+
+        }
         int i = originmanifestsecondaryMapper.updateRECEIPTION(this);
         //获取分单autoid
         List<Originmanifestsecondary> originmanifestsecondaryList = originmanifestsecondaryMapper.selectAutoIdByawbAawbH(this);

@@ -215,6 +215,8 @@ public class TALLYSECONDARY extends WlptBaseModel {
 
     @Override
     public int secondAnalysisReception() {
+
+        //todo:这里要根据回执的航班信息取到主单的autoid，设置到分单中。做到精确解析
         //更新分单回执
         int i = tallysecondaryMapper.updateRECEIPTION(this);
         //获取分单autoid

@@ -58,7 +58,7 @@ public class TaskAnalysis {
             //文件数量大于50个，每次只解析前50个
             if (files!=null && !files.isEmpty() && files.size()>theadamount){
                 CountDownLatch latch = new CountDownLatch(theadamount);
-                log.trace("解析任务开始{}，文件数量:{}",startTime,theadamount);
+                log.trace("解析任务开始{}，剩余处理文件数量:{}",startTime,files.size());
                 for (int i=0;i<theadamount;i++){
                     threadJbob(files.get(i),latch,transToCfps,threadPool);
                 }
@@ -67,7 +67,7 @@ public class TaskAnalysis {
             //文件数量小于50个,全部一次解析完
             else if (files!=null && !files.isEmpty() && files.size()<theadamount){
                 CountDownLatch latch = new CountDownLatch(files.size());
-                log.info("解析任务开始{}，文件数量:{}",startTime,files.size());
+                log.info("解析任务开始{}，剩余处理文件数量文件数量:{}",startTime,files.size());
                 for (int i=0;i<files.size();i++){
                     threadJbob(files.get(i),latch,transToCfps,threadPool);
                 }

@@ -124,7 +124,7 @@
     AND
     FLIGHTNO = #{flightno,jdbcType=VARCHAR}
     AND
-    FLIGHTDATE= #{flightdate,jdbcType=DATE}
+    trunc(FLIGHTDATE)= #{flightdate,jdbcType=DATE}
     AND
     WAYBILLNO = #{waybillno,jdbcType=VARCHAR}
   </update>
@@ -135,7 +135,7 @@
     WHERE
     FLIGHTNO= #{flightno,jdbcType=VARCHAR}
     AND
-    FLIGHTDATE= #{flightdate,jdbcType=DATE}
+    trunc(FLIGHTDATE)= #{flightdate,jdbcType=DATE}
     AND
     WAYBILLNO = #{waybillno,jdbcType=VARCHAR}
   </select>

@@ -356,7 +356,7 @@
     AND
     CARRIER = #{carrier,jdbcType=VARCHAR}
     AND
-    FLIGHTDATE= #{flightDate,jdbcType=DATE}
+    trunc(FLIGHTDATE)= #{flightDate,jdbcType=DATE}
     AND
     WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
   </update>
@@ -367,8 +367,10 @@
     WHERE
     FLIGHTNO= #{flightno,jdbcType=VARCHAR}
     AND
-    FLIGHTDATE= #{flightDate,jdbcType=DATE}
+    trunc(FLIGHTDATE)= #{flightDate,jdbcType=DATE}
     AND
     WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
+    AND
+    CARRIER = #{carrier,jdbcType=VARCHAR}
   </select>
 </mapper>
\ No newline at end of file

@@ -245,7 +245,7 @@
     AND
       CARRIER = #{carrier,jdbcType=VARCHAR}
     AND
-      FLIGHTDATE= #{flightdate,jdbcType=DATE}
+      trunc(FLIGHTDATE)= #{flightdate,jdbcType=DATE}
   </update>
 
   <select id="selectAutoIdByawbAawbH" parameterType="com.tianbo.analysis.model.ARRIVEDSECONDARY" resultType="com.tianbo.analysis.model.ARRIVEDSECONDARY">

@@ -150,7 +150,7 @@
     SET RECEIPTION= #{receiption,jdbcType=VARCHAR},STATUS = #{status,jdbcType=VARCHAR}
     WHERE FLIGHTNO = #{flightno,jdbcType=VARCHAR}
     AND
-    FLIGHTDATE= #{flightdate,jdbcType=DATE}
+    trunc(FLIGHTDATE)= #{flightdate,jdbcType=DATE}
     AND
     WAYBILLNO = #{waybillno,jdbcType=VARCHAR}
   </update>
@@ -161,7 +161,7 @@
     WHERE
     FLIGHTNO= #{flightno,jdbcType=VARCHAR}
     AND
-    FLIGHTDATE= #{flightdate,jdbcType=DATE}
+    trunc(FLIGHTDATE) #{flightdate,jdbcType=DATE}
     AND
     WAYBILLNO = #{waybillno,jdbcType=VARCHAR}
   </select>

@@ -140,7 +140,7 @@
     AND
     FLIGHTNO = #{flightno,jdbcType=VARCHAR}
     AND
-    FLIGHTDATE= #{flightdate,jdbcType=DATE }
+    trunc(FLIGHTDATE)= #{flightdate,jdbcType=DATE }
     AND
     WAYBILLNO = #{waybillno,jdbcType=VARCHAR}
   </update>
@@ -151,7 +151,7 @@
     WHERE
     FLIGHTNO= #{flightno,jdbcType=VARCHAR}
     AND
-    FLIGHTDATE= #{flightdate,jdbcType=DATE}
+    trunc(FLIGHTDATE)= #{flightdate,jdbcType=DATE}
     AND
     WAYBILLNO = #{waybillno,jdbcType=VARCHAR}
   </select>

@@ -179,7 +179,7 @@
     AND
     ORIGINAL_CARRIER = #{originalCarrier,jdbcType=VARCHAR}
     AND
-    ORIGINAL_FLIGHTDATE= #{originalFlightdate,jdbcType=DATE}
+    trunc(ORIGINAL_FLIGHTDATE)= #{originalFlightdate,jdbcType=DATE}
     AND
     ORIGINAL_BILLNO = #{originalBillno,jdbcType=VARCHAR}
   </update>
@@ -192,7 +192,7 @@
     AND
      ORIGINAL_CARRIER = #{originalCarrier,jdbcType=VARCHAR}
     AND
-    ORIGINAL_FLIGHTDATE= #{originalFlightdate,jdbcType=DATE}
+    trunc(ORIGINAL_FLIGHTDATE)= #{originalFlightdate,jdbcType=DATE}
     AND
     ORIGINAL_BILLNO = #{originalBillno,jdbcType=VARCHAR}
   </select>

@@ -360,7 +360,7 @@
     STATUS=#{status,jdbcType=VARCHAR }
     WHERE FLIGHTNO = #{flightno,jdbcType=VARCHAR}
     AND
-    FLIGHT_DATE= #{flightDate,jdbcType=TIMESTAMP}
+    trunc(FLIGHT_DATE)= #{flightDate,jdbcType=DATE }
     AND
     WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
   </update>
@@ -371,7 +371,7 @@
     WHERE
     FLIGHTNO= #{flightno,jdbcType=VARCHAR}
     AND
-    FLIGHT_DATE= #{flightDate,jdbcType=TIMESTAMP}
+    trunc(FLIGHT_DATE)= #{flightDate,jdbcType=DATE }
     AND
     WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
   </select>

@@ -313,7 +313,7 @@
     WHERE
     FLIGHTNO = #{flightno,jdbcType=VARCHAR}
     AND
-    FLIGHTDATE= #{flightdate,jdbcType=DATE }
+    trunc(FLIGHTDATE)= #{flightdate,jdbcType=DATE }
     AND
     WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
     AND
@@ -326,8 +326,10 @@
     WHERE
     FLIGHTNO= #{flightno,jdbcType=VARCHAR}
     AND
-    FLIGHTDATE= #{flightdate,jdbcType=TIMESTAMP}
+    trunc(FLIGHTDATE)= #{flightdate,jdbcType=DATE }
     AND
     WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
+    AND
+    CARRIER = #{carrier,jdbcType=VARCHAR}
   </select>
 </mapper>
\ No newline at end of file

@@ -977,7 +977,7 @@
     AND
      FLIGHTNO = #{flightno,jdbcType=VARCHAR}
     AND
-    FLIGHTDATE= #{flightdate,jdbcType=DATE }
+    trunc(FLIGHTDATE)= #{flightdate,jdbcType=DATE }
     AND
     CARRIER = #{carrier,jdbcType=VARCHAR}
   </update>
@@ -986,6 +986,14 @@
     SELECT AUTOID
     FROM PREPARESECONDARY
     WHERE
-    WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR} AND WAYBILLNOSECONDARY = #{waybillnosecondary,jdbcType=VARCHAR}
+    WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
+    AND
+    WAYBILLNOSECONDARY = #{waybillnosecondary,jdbcType=VARCHAR}
+    AND
+    CARRIER = #{carrier,jdbcType=VARCHAR}
+    AND
+     FLIGHTNO = #{flightno,jdbcType=VARCHAR}
+    AND
+    trunc(FLIGHTDATE)= #{flightdate,jdbcType=DATE }
   </select>
 </mapper>
\ No newline at end of file

@@ -253,7 +253,7 @@
     STATUS = #{status,jdbcType=VARCHAR}
     WHERE WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
     AND FLIGHTNO = #{flightno, jdbcType=VARCHAR}
-    AND FLIGHTDATE =  #{flightdate, jdbcType=DATE}
+    AND trunc(FLIGHTDATE) =  #{flightdate, jdbcType=DATE}
     AND TALLTYPE = #{talltype,jdbcType=VARCHAR }
   </update>
 
@@ -263,7 +263,7 @@
     WHERE
     WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
     AND FLIGHTNO = #{flightno, jdbcType=VARCHAR}
-    AND FLIGHTDATE = #{flightdate, jdbcType=DATE}
+    AND trunc(FLIGHTDATE) = #{flightdate, jdbcType=DATE}
     AND TALLTYPE = #{talltype,jdbcType=VARCHAR }
   </select>
 

@@ -269,12 +269,15 @@
     WHERE
     WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
     AND WAYBILLNOSECONDARY = #{waybillnosecondary,jdbcType=VARCHAR}
+    AND ORIGINMANIFESTMASTERAUTOID = #{originmanifestmasterautoid,jdbcType=VARCHAR }
   </update>
 
   <select id="selectAutoIdByawbAawbH" parameterType="com.tianbo.analysis.model.Originmanifestsecondary" resultType="com.tianbo.analysis.model.Originmanifestsecondary">
     SELECT AUTOID
     FROM ORIGINMANIFESTSECONDARY
     WHERE
-    WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR} AND WAYBILLNOSECONDARY = #{waybillnosecondary,jdbcType=VARCHAR}
+    WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
+    AND WAYBILLNOSECONDARY = #{waybillnosecondary,jdbcType=VARCHAR}
+    AND ORIGINMANIFESTMASTERAUTOID = #{originmanifestmasterautoid,jdbcType=VARCHAR }
   </select>
 </mapper>
\ No newline at end of file