优化

ParamDownload/src/main/java/com/nm/gsgl/common/Constant.java

@@ -183,9 +183,9 @@ public class Constant {
 
     //测试环境使用 begin
     public static final String SELECT_TF_DOWNLOAD_NOTIFY_BLACK = "SELECT ID,SYSTEMID,TABLENAME,BATCHNO,VERSION,PROTOCOL_TYPE,CREATETIME,RECORDNUM,UPDATEFLAG,UPDATETIME,DOMAIN1,DOMAIN2,DOMAIN3,DOMAIN4 FROM TF_DOWNLOAD_NOTIFY_CS where createtime>=to_date('20240624','yyyyMMdd') and protocol_type in(101,102,103,104,105,106,107,108,111,801,802,808,809,919,920)  and updateflag=0 and length(domain1)>18 and substr(domain1,0,3)='ftp'";
-    public static final String SELECT_TF_DOWNLOAD_NOTIFY_INSERT_DB = "SELECT ID,SYSTEMID,TABLENAME,BATCHNO,VERSION,PROTOCOL_TYPE,CREATETIME,RECORDNUM,UPDATEFLAG,UPDATETIME,DOMAIN1,DOMAIN2,DOMAIN3,DOMAIN4 FROM TF_DOWNLOAD_NOTIFY_CS where createtime>=to_date('20240620','yyyyMMdd') and protocol_type in(237,240,241,242,243,244,245,246,302,304,306,501,502,503,604,605,804,803,901,902,903,904,905,917,918,922,923,924,925)  and updateflag=0 and length(domain1)>18 and substr(domain1,0,3)='ftp'";
-    //public static final String SELECT_TF_DOWNLOAD_NOTIFY_INSERT_DB = "SELECT ID,SYSTEMID,TABLENAME,BATCHNO,VERSION,PROTOCOL_TYPE,CREATETIME,RECORDNUM,UPDATEFLAG,UPDATETIME,DOMAIN1,DOMAIN2,DOMAIN3,DOMAIN4 FROM TF_DOWNLOAD_NOTIFY_CS where createtime>=to_date('2024-06-25 00:00:00','yyyy-mm-dd hh24:mi:ss') and createtime<=to_date('2024-07-05 00:00:00','yyyy-mm-dd hh24:mi:ss') and protocol_type in(242,243,244) and updateflag=1 and length(domain1)>18 and substr(domain1,0,3)='ftp'";
-    //public static final String SELECT_TF_DOWNLOAD_NOTIFY_INSERT_DB = "SELECT ID,SYSTEMID,TABLENAME,BATCHNO,VERSION,PROTOCOL_TYPE,CREATETIME,RECORDNUM,UPDATEFLAG,UPDATETIME,DOMAIN1,DOMAIN2,DOMAIN3,DOMAIN4 FROM TF_DOWNLOAD_NOTIFY_CS where createtime>=to_date('2024-06-25 00:00:00','yyyy-mm-dd hh24:mi:ss') and createtime<=to_date('2024-07-06 00:00:00','yyyy-mm-dd hh24:mi:ss') and protocol_type in(246) and updateflag=1 and length(domain1)>18 and substr(domain1,0,3)='ftp'";
+    public static final String SELECT_TF_DOWNLOAD_NOTIFY_INSERT_DB = "SELECT ID,SYSTEMID,TABLENAME,BATCHNO,VERSION,PROTOCOL_TYPE,CREATETIME,RECORDNUM,UPDATEFLAG,UPDATETIME,DOMAIN1,DOMAIN2,DOMAIN3,DOMAIN4 FROM TF_DOWNLOAD_NOTIFY_CS where createtime>=to_date('20240705','yyyyMMdd') and protocol_type in(237,240,241,242,243,244,245,246,302,304,306,501,502,503,604,605,804,803,901,902,903,904,905,917,918,922,923,924,925)  and updateflag=0 and length(domain1)>18 and substr(domain1,0,3)='ftp'";
+    //public static final String SELECT_TF_DOWNLOAD_NOTIFY_INSERT_DB = "SELECT ID,SYSTEMID,TABLENAME,BATCHNO,VERSION,PROTOCOL_TYPE,CREATETIME,RECORDNUM,UPDATEFLAG,UPDATETIME,DOMAIN1,DOMAIN2,DOMAIN3,DOMAIN4 FROM TF_DOWNLOAD_NOTIFY_CS where createtime>=to_date('2024-06-12 00:00:00','yyyy-mm-dd hh24:mi:ss') and createtime<=to_date('2024-06-20 00:00:00','yyyy-mm-dd hh24:mi:ss') and protocol_type in(901,902,903,904,905,917,918,922,923,924,925)and updateflag=1 and length(domain1)>18 and substr(domain1,0,3)='ftp'";
+    //public static final String SELECT_TF_DOWNLOAD_NOTIFY_INSERT_DB = "SELECT ID,SYSTEMID,TABLENAME,BATCHNO,VERSION,PROTOCOL_TYPE,CREATETIME,RECORDNUM,UPDATEFLAG,UPDATETIME,DOMAIN1,DOMAIN2,DOMAIN3,DOMAIN4 FROM TF_DOWNLOAD_NOTIFY_CS where createtime>=to_date('2024-07-05 00:00:00','yyyy-mm-dd hh24:mi:ss') and createtime<to_date('2024-07-06 00:00:00','yyyy-mm-dd hh24:mi:ss') and protocol_type in(242,243,244,245,246) and length(domain1)>18 and substr(domain1,0,3)='ftp'";
     public static final String UPDATE_TF_DOWNLOAD_NOTIFY_HR = "UPDATE TF_DOWNLOAD_NOTIFY_CS SET UPDATEFLAG = 1 WHERE ID =";
     //public static final String UPDATE_TF_DOWNLOAD_NOTIFY_HR = "UPDATE TF_DOWNLOAD_NOTIFY_CS SET UPDATEFLAG = 2 WHERE ID =";
     public static final String SELECT_TF_DOWNLOAD_NOTIFY_MIN_FEE = "SELECT ID,SYSTEMID,TABLENAME,BATCHNO,VERSION,PROTOCOL_TYPE,CREATETIME,RECORDNUM,UPDATEFLAG,UPDATETIME,DOMAIN1,DOMAIN2,DOMAIN3,DOMAIN4 FROM TF_DOWNLOAD_NOTIFY_CS where createtime>=to_date('20230101','yyyyMMdd') and protocol_type in(250)  and updateflag=0 and length(domain1)>18 and substr(domain1,0,3)='ftp'";

ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/OtherOutPort.java

@@ -228,7 +228,7 @@ public class OtherOutPort {
     /**
      *本省交易成功次数
      */
-    @TableField("provtranscount")
+    @TableField("PROVTRANSCOUNT")
     private Integer provTransCount;
     /**
      *通行省份个数

ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/OutPortEtcNopay.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 
-import java.util.List;
-
 /**
  * @author: shuguang
  * @date: 2023年02月08日 14:58
@@ -66,7 +64,7 @@ public class OutPortEtcNopay {
     /**
      *交易支付方式
      */
-    @TableField("transpaytype")
+    @TableField("TRANSPAYTYPE")
     private Integer transPayType;
     /**
      *计费方式

ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/ClearSum.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 
+import java.util.Date;
+
 /**
  * @author: shuguang
  * @date: 2023年02月17日 15:59
@@ -64,4 +66,6 @@ public class ClearSum {
      */
     @TableField("ISSPLIT")
     private Integer isSplit;
+    @TableField(value = "DATEMARK", jdbcType = JdbcType.DATE, update = "to_date(#{DATEMARK},'yyyy-mm-dd hh24:mi:ss')")
+    private String dateMark;
 }

ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NooutportResult.java

@@ -160,4 +160,6 @@ public class NooutportResult {
      */
     @TableField("BASICFILENAME")
     private String basicFilename;
+    @TableField(value = "DATEMARK", jdbcType = JdbcType.DATE, update = "to_date(#{DATEMARK},'yyyy-mm-dd hh24:mi:ss')")
+    private String dateMark;
 }

ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NooutportS3Down.java

@@ -140,4 +140,12 @@ public class NooutportS3Down {
      */
     @TableField("BASICFILENAME")
     private String basicFilename;
+    @TableField("RESULT")
+    private Integer result;
+    @TableField("CHANGEPROVINCEID")
+    private String changeProvinceId;
+    @TableField("EXITPASSID")
+    private String exitPassId;
+    @TableField(value = "DATEMARK", jdbcType = JdbcType.DATE, update = "to_date(#{DATEMARK},'yyyy-mm-dd hh24:mi:ss')")
+    private String dateMark;
 }

ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NosplitResult.java

@@ -30,11 +30,6 @@ public class NosplitResult {
      */
     @TableField("TOLLPROVINCEID")
     private String tollProvinceId;
-    /**
-     *最后通行门架所在省份省中心Id
-     */
-    @TableField("LASTTRANSPROVINCEID")
-    private String lastTransProvinceId;
     /**
      *涉及金额
      */

ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NosplitS3Down.java

@@ -30,11 +30,6 @@ public class NosplitS3Down {
      */
     @TableField("TOLLPROVINCEID")
     private String tollProvinceId;
-    /**
-     *最后通行门架所在省份省中心Id
-     */
-    @TableField("LASTTRANSPROVINCEID")
-    private String lastTransProvinceId;
     /**
      *涉及金额
      */
@@ -70,6 +65,8 @@ public class NosplitS3Down {
      */
     @TableField(value = "STARTTIME",jdbcType = JdbcType.DATE,update = "to_date(#{STARTTIME},'yyyy-mm-dd hh24:mi:ss')")
     private String startTime;
+    @TableField(value = "UPDATETIME",jdbcType = JdbcType.DATE,update = "to_date(#{UPDATETIME},'yyyy-mm-dd hh24:mi:ss')")
+    private String updateTime;
     /**
      *流程明细
      */
@@ -80,4 +77,10 @@ public class NosplitS3Down {
      */
     @TableField("BASICFILENAME")
     private String basicFilename;
+    @TableField("TYPE")
+    private Integer type;
+    @TableField("RESULT")
+    private Integer result;
+    @TableField(value = "DATEMARK", jdbcType = JdbcType.DATE, update = "to_date(#{DATEMARK},'yyyy-mm-dd hh24:mi:ss')")
+    private String dateMark;
 }

ParamDownload/src/main/java/com/nm/gsgl/service/impl/CreateDbServiceImpl.java

@@ -97,7 +97,7 @@ import java.util.Map;
  * @description: 入库实现类
  */
 @Service
-//@Transactional(rollbackFor = Exception.class)
+@Transactional(rollbackFor = Exception.class)
 public class CreateDbServiceImpl implements CreateDbService {
     @Value("${sqliteDriverName}")
     private String sqliteDriverName;
@@ -664,16 +664,20 @@ public class CreateDbServiceImpl implements CreateDbService {
                     op.setId((String) mapList.get("id"));
                     op.setSerProvinceId(StringUtils.isNotBlank((CharSequence) mapList.get("serProvinceId")) ? (String) mapList.get("serProvinceId") : null);
                     op.setTollProvinceId(StringUtils.isNotBlank((CharSequence) mapList.get("tollProvinceId")) ? (String) mapList.get("tollProvinceId") : null);
-                    op.setLastTransProvinceId(StringUtils.isNotBlank((CharSequence) mapList.get("lastTransProvinceId")) ? (String) mapList.get("lastTransProvinceId") : null);
                     op.setFee((mapList.get("fee") != null) ? Long.valueOf(String.valueOf(mapList.get("fee"))) : null);
                     op.setVehicleId(StringUtils.isNotBlank((CharSequence) mapList.get("vehicleId")) ? (String) mapList.get("vehicleId") : null);
                     op.setVehicleType((mapList.get("vehicleType") != null) ? Integer.valueOf(String.valueOf(mapList.get("vehicleType"))) : null);
                     op.setPassId(StringUtils.isNotBlank((CharSequence) mapList.get("passId")) ? (String) mapList.get("passId") : null);
                     op.setPassRecordId(StringUtils.isNotBlank((CharSequence) mapList.get("passRecordId")) ? (String) mapList.get("passRecordId") : null);
                     op.setSplitDate(StringUtils.isNotBlank((CharSequence) mapList.get("splitDate")) ? (String) mapList.get("splitDate") : null);
-                    op.setStartTime(StringUtils.isNotBlank(op.getStartTime()) ? op.getStartTime().replace(Constant.STR_T, Constant.STR_SPACE) : null);
+                    op.setStartTime(StringUtils.isNotBlank((CharSequence) mapList.get("startTime")) ? ((String) mapList.get("startTime")).replace(Constant.STR_T, Constant.STR_SPACE) : null);
+                    op.setUpdateTime(StringUtils.isNotBlank((CharSequence) mapList.get("updateTime")) ? ((String) mapList.get("updateTime")).replace(Constant.STR_T, Constant.STR_SPACE) : null);
                     op.setLogs(JSONObject.toJSONString(mapList.get("logs"), JSONWriter.Feature.WriteMapNullValue));
                     op.setBasicFilename(fileName);
+                    //2024-07-06增加
+                    op.setType(2);
+                    op.setResult((mapList.get("result") != null) ? Integer.valueOf(String.valueOf(mapList.get("result"))) : null);
+                    op.setDateMark(DateTimeUtil.getFormateString(new Date(),Constant.YYYY_MM_DD_HH_MM_SS));
                     nosplitS3DownMapper.insert(op);
                     count++;
                     //} else {
@@ -715,6 +719,7 @@ public class CreateDbServiceImpl implements CreateDbService {
                     obj.setEndTime(StringUtils.isNotBlank(obj.getEndTime()) ? obj.getEndTime().replace(Constant.STR_T, Constant.STR_SPACE) : null);
                     obj.setProvExTime(StringUtils.isNotBlank(obj.getProvExTime()) ? obj.getProvExTime().replace(Constant.STR_T, Constant.STR_SPACE) : null);
                     obj.setBasicFilename(fileName);
+                    obj.setDateMark(DateTimeUtil.getFormateString(new Date(),Constant.YYYY_MM_DD_HH_MM_SS));
                     nooutportResultMapper.insert(obj);
                     count++;
                     //} else {
@@ -772,6 +777,13 @@ public class CreateDbServiceImpl implements CreateDbService {
                 op.setInfo(StringUtils.isNotBlank((CharSequence) mapList.get("info")) ? (String) mapList.get("info") : null);
                 op.setLogs(JSONObject.toJSONString(mapList.get("logs"), JSONWriter.Feature.WriteMapNullValue));
                 op.setBasicFilename(fileName);
+
+
+                //2024-07-06增加
+                op.setResult((mapList.get("result") != null) ? Integer.valueOf(String.valueOf(mapList.get("result"))) : null);
+                op.setChangeProvinceId(StringUtils.isNotBlank((CharSequence) mapList.get("changeProvinceId")) ? (String) mapList.get("changeProvinceId") : null);
+                op.setExitPassId(StringUtils.isNotBlank((CharSequence) mapList.get("exitPassId")) ? (String) mapList.get("exitPassId") : null);
+                op.setDateMark(DateTimeUtil.getFormateString(new Date(),Constant.YYYY_MM_DD_HH_MM_SS));
                 nooutportS3DownMapper.insert(op);
                 count++;
             }
@@ -909,6 +921,7 @@ public class CreateDbServiceImpl implements CreateDbService {
         if (!exists) {
             obj.setBasicFilename(fileName);
             obj.setIsSplit(0);
+            obj.setDateMark(DateTimeUtil.getFormateString(new Date(),Constant.YYYY_MM_DD_HH_MM_SS));
             count = clearSumMapper.insert(obj);
         }
         LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",插入数据库表" + dbTableName + "条数为" + count, "CreateDbServiceImpl");