123

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

@@ -46,8 +46,11 @@ public class Constant {
     public static final String SELECT_ALL_ROAD_MIN_FEE_TABLE = "SELECT VERSION,VALIDTIME,ENPROV,ENID,EXPROV,EXID,FEEINFO FROM ALLROADMINFEE_TABLE";
     public static final String SQLITE_PRE = "jdbc:sqlite:";
     public static final String SQLITE_DRIVER_NAME = "org.sqlite.JDBC";
-    public static final String DEL_MIN_FEE_BY_EXID = "DELETE FROM ALLROADMINFEE_TABLE_1 WHERE EXID='";
+    public static final String DEL_MIN_FEE_BY_EXID = "DELETE FROM ALLROADMINFEE_TABLE WHERE EXID='";
+    public static final String DEL_MIN_FEE_BY_EXID_1 = "DELETE FROM ALLROADMINFEE_TABLE_1 WHERE EXID='";
     public static final String INSERT_MIN_FEE =
+            "insert into ALLROADMINFEE_TABLE ( VERSION,VALIDTIME,ENPROV,ENID,EXPROV,EXID,FEEINFO) values(?,TO_DATE(?,'yyyy-mm-dd hh24:mi:ss'),?,?,?,?,?)";
+    public static final String INSERT_MIN_FEE_1 =
             "insert into ALLROADMINFEE_TABLE_1 ( VERSION,VALIDTIME,ENPROV,ENID,EXPROV,EXID,FEEINFO) values(?,TO_DATE(?,'yyyy-mm-dd hh24:mi:ss'),?,?,?,?,?)";
 
 

ParamInsertDb/src/main/java/com/nm/gsgl/common/config/MyEnvironmentPostProcessor.java

@@ -69,6 +69,10 @@ public class MyEnvironmentPostProcessor implements EnvironmentPostProcessor {
             properties.setProperty("TollBankConnectionStringOracle", properties.getProperty("TollBankConnectionStringOracle"));
             properties.setProperty("TollBankOracleName", properties.getProperty("TollBankOracleName"));
             properties.setProperty("TollBankOraclePass",PassWordUtils.decrypt( properties.getProperty("TollBankOraclePass")));
+            //交通集团数据库
+            properties.setProperty("JTJTConnectionStringOracle", properties.getProperty("JTJTConnectionStringOracle"));
+            properties.setProperty("JTJTOracleName", properties.getProperty("JTJTOracleName"));
+            properties.setProperty("JTJTOraclePass",PassWordUtils.decrypt( properties.getProperty("JTJTOraclePass")));
             //NFS文件存储路径
             properties.setProperty("NFSFilePath", properties.getProperty("NFSFilePath"));
             ////是否显示SQB查询页面
@@ -86,6 +90,9 @@ public class MyEnvironmentPostProcessor implements EnvironmentPostProcessor {
             System.out.println("          收费库url        : " + properties.getProperty("TollBankConnectionStringOracle"));
             System.out.println("         收费库用户名      : " + properties.getProperty("TollBankOracleName"));
             System.out.println("         收费库密码        : " + properties.getProperty("TollBankOraclePass"));
+            System.out.println("        交通集团url        : " + properties.getProperty("TollBankConnectionStringOracle"));
+            System.out.println("       交通集团用户名      : " + properties.getProperty("TollBankOracleName"));
+            System.out.println("       交通集团密码        : " + properties.getProperty("TollBankOraclePass"));
             System.out.println("      NFS文件存储路径      : " + properties.getProperty("NFSFilePath"));
 
             System.out.println("---------------------------------------------------------------------");

ParamInsertDb/src/main/java/com/nm/gsgl/common/timetask/TimeTaskInfo.java

@@ -74,6 +74,7 @@ public class TimeTaskInfo {
             long end = System.currentTimeMillis();
             logger.info("[uuid:{}]定时执行入库最小费额SQB文件服务执行完成，耗时：{}毫秒", uuid, end - start);
         } else {
+            minFeeIntoDataBaseService.emptyMinFeeFolder(uuid);
             logger.info("[uuid:{}]获取WarehousingMinFee的值为{}，不执行入库最小费额SQB文件", uuid, WarehousingMinFee);
         }
     }

ParamInsertDb/src/main/java/com/nm/gsgl/entity/minfee/AllRoadMinFee.java

@@ -7,11 +7,11 @@ import org.apache.ibatis.type.JdbcType;
 
 /**
  * @author: shuguang
- * @date: 2023年06月19日 14:05
+ * @date: 2024年06月20日 11:40
  * @description: 最小费额表
  */
 @Data
-@TableName("ALLROADMINFEE_TABLE_1")
+@TableName("ALLROADMINFEE_TABLE")
 public class AllRoadMinFee {
     @TableField("VERSION")
     private String version;

ParamInsertDb/src/main/java/com/nm/gsgl/entity/minfee/AllRoadMinFee1.java

@@ -0,0 +1,32 @@
+package com.nm.gsgl.entity.minfee;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
+
+/**
+ * @author: shuguang
+ * @date: 2023年06月19日 14:05
+ * @description: 最小费额表
+ */
+@Data
+@TableName("ALLROADMINFEE_TABLE_1")
+public class AllRoadMinFee1 {
+    @TableField("VERSION")
+    private String version;
+    @TableField(value = "VALIDTIME",jdbcType = JdbcType.DATE,update = "to_date(#{VALIDTIME},'yyyy-mm-dd hh24:mi:ss')")
+    private String validTime;
+    @TableField("ENPROV")
+    private Integer enProv;
+    @TableField("ENID")
+    private String enID;
+    @TableField("EXPROV")
+    private Integer exProv;
+    @TableField("EXID")
+    private String exID;
+    @TableField("FEEINFO")
+    //private String splitProvince;
+    private String feeInfo;
+
+}

ParamInsertDb/src/main/java/com/nm/gsgl/service/MinFeeIntoDataBaseService.java

@@ -7,10 +7,20 @@ package com.nm.gsgl.service;
  */
 public interface MinFeeIntoDataBaseService {
     /**
-     *生成的最新最小费额文件入库
+     * 生成的最新最小费额文件入库
+     *
+     * @param uuid uuid
      * @author shuguang
      * @date 2023-06-28 16:09
-     * @param uuid uuid
      */
     void intoMinFee(String uuid);
+
+    /**
+     * 不执行入库时清空需要入库的最小费额文件夹
+     *
+     * @param uuid uuid
+     * @author shuguang
+     * @date 2024-06-27 9:54
+     */
+    void emptyMinFeeFolder(String uuid);
 }

ParamInsertDb/src/main/java/com/nm/gsgl/service/impl/MinFeeIntoDataBaseServiceImpl.java

@@ -4,6 +4,7 @@ import com.nm.gsgl.common.Constant;
 import com.nm.gsgl.common.utils.DatabaseUtil;
 import com.nm.gsgl.common.utils.FileUtil;
 import com.nm.gsgl.common.utils.PathUtil;
+import com.nm.gsgl.common.utils.PropertiesUtil;
 import com.nm.gsgl.entity.FileInfo;
 import com.nm.gsgl.entity.minfee.AllRoadMinFee;
 import com.nm.gsgl.service.MinFeeIntoDataBaseService;
@@ -35,6 +36,12 @@ public class MinFeeIntoDataBaseServiceImpl implements MinFeeIntoDataBaseService
     public String TollBankOracleName;
     @Value("${TollBankOraclePass}")
     public String TollBankOraclePass;
+    @Value("${JTJTConnectionStringOracle}")
+    public String JTJTConnectionStringOracle;
+    @Value("${JTJTOracleName}")
+    public String JTJTOracleName;
+    @Value("${JTJTOraclePass}")
+    public String JTJTOraclePass;
     public static Logger log = LoggerFactory.getLogger("MinFeeInsert");
     /**
      * 生成的最新最小费额文件入库
@@ -46,6 +53,9 @@ public class MinFeeIntoDataBaseServiceImpl implements MinFeeIntoDataBaseService
     @Override
     public void intoMinFee(String uuid) {
         String minFeeBackPath = NFSFilePath + File.separator + PathUtil.webName + File.separator + "MinFeeInToDataBase" + File.separator;
+        //获取是否入库收费库及交通集团 1-入库，其他值为不入库
+        String isInMPay = PropertiesUtil.getValue("isInMPay");
+        String isInJTJT = PropertiesUtil.getValue("isInJTJT");
         List<FileInfo> fileInfos = new ArrayList<>();
         //获取文件夹下所有文件名
         FileUtil.obtainFileInfo(minFeeBackPath, fileInfos);
@@ -64,13 +74,24 @@ public class MinFeeIntoDataBaseServiceImpl implements MinFeeIntoDataBaseService
                 log.info("[uuid:{}]查询{}文件ALLROADMINFEE_TABLE表中数据条数为:{}", uuid, fileName, allRoadMinFees.size());
                 if (!allRoadMinFees.isEmpty()) {
                     int listSize = allRoadMinFees.size();
-                    //先删除原来的数据
-                    int delete = DatabaseUtil.delByExIdMinFeeDb(TollBankDriverName, TollBankConnectionStringOracle, TollBankOracleName, TollBankOraclePass,
-                            Constant.DEL_MIN_FEE_BY_EXID + exId + Constant.SINGLE_LEAD);
-                    log.info("[uuid:{}]删除数据库ALLROADMINFEE_TABLE_1表中EXID={}数据条数为:{}", uuid, exId, delete);
-                    log.info("[uuid:{}]开始将读取的SQB文件:{},插入数据库ALLROADMINFEE_TABLE_1表", uuid, fileName);
-                    DatabaseUtil.insertMinFeeDb(TollBankDriverName, TollBankConnectionStringOracle, TollBankOracleName, TollBankOraclePass, allRoadMinFees, Constant.INSERT_MIN_FEE);
-                    log.info("[uuid:{}]插入数据库ALLROADMINFEE_TABLE_1表中数据条数为:{}", uuid, listSize);
+                    if(Constant.STR_ONE.equals(isInMPay)){
+                        //先删除原来的数据
+                        int delete = DatabaseUtil.delByExIdMinFeeDb(TollBankDriverName, TollBankConnectionStringOracle, TollBankOracleName, TollBankOraclePass,
+                                Constant.DEL_MIN_FEE_BY_EXID_1 + exId + Constant.SINGLE_LEAD);
+                        log.info("[uuid:{}]删除数据库ALLROADMINFEE_TABLE_1表中EXID={}数据条数为:{}", uuid, exId, delete);
+                        log.info("[uuid:{}]开始将读取的SQB文件:{},插入数据库ALLROADMINFEE_TABLE_1表", uuid, fileName);
+                        DatabaseUtil.insertMinFeeDb(TollBankDriverName, TollBankConnectionStringOracle, TollBankOracleName, TollBankOraclePass, allRoadMinFees, Constant.INSERT_MIN_FEE_1);
+                        log.info("[uuid:{}]插入数据库ALLROADMINFEE_TABLE_1表中数据条数为:{}", uuid, listSize);
+                    }
+                    if(Constant.STR_ONE.equals(isInJTJT)){
+                        //先删除原来的数据
+                        int delete = DatabaseUtil.delByExIdMinFeeDb(TollBankDriverName, JTJTConnectionStringOracle, JTJTOracleName, JTJTOraclePass,
+                                Constant.DEL_MIN_FEE_BY_EXID + exId + Constant.SINGLE_LEAD);
+                        log.info("[uuid:{}]删除数据库ALLROADMINFEE_TABLE表中EXID={}数据条数为:{}", uuid, exId, delete);
+                        log.info("[uuid:{}]开始将读取的SQB文件:{},插入数据库ALLROADMINFEE_TABLE表", uuid, fileName);
+                        DatabaseUtil.insertMinFeeDb(TollBankDriverName, JTJTConnectionStringOracle, JTJTOracleName, JTJTOraclePass, allRoadMinFees, Constant.INSERT_MIN_FEE);
+                        log.info("[uuid:{}]插入数据库ALLROADMINFEE_TABLE表中数据条数为:{}", uuid, listSize);
+                    }
                     //删除下载的zip文件
                     FileUtil.fileDelete(filePath);
                     log.info("[uuid:{}]删除已入库的文件:{}", uuid, filePath);
@@ -78,4 +99,19 @@ public class MinFeeIntoDataBaseServiceImpl implements MinFeeIntoDataBaseService
             }
         }
     }
+
+    /**
+     * 不执行入库时清空需要入库的最小费额文件夹
+     *
+     * @param uuid uuid
+     * @author shuguang
+     * @date 2024-06-27 9:54
+     */
+    @Override
+    public void emptyMinFeeFolder(String uuid) {
+        String minFeeBackPath = NFSFilePath + File.separator + PathUtil.webName + File.separator + "MinFeeInToDataBase" + File.separator;
+        log.info("[uuid:{}]不执行入库时清空需要入库的最小费额文件夹:{}", uuid, minFeeBackPath);
+        boolean b = FileUtil.delFile(new File(minFeeBackPath));
+        log.info("[uuid:{}]不执行入库时清空需要入库的最小费额文件夹:{}完成,删除文件返回：{}", uuid, minFeeBackPath,b);
+    }
 }

ParamInsertDb/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -11,6 +11,7 @@ com\nm\gsgl\entity\sqb\SNBlack.class
 com\nm\gsgl\service\impl\InsertParamDbServiceImpl.class
 com\nm\gsgl\common\batch\CustomSqlInjector.class
 com\nm\gsgl\common\enumeration\ErrorCode$FtpConnectCode.class
+com\nm\gsgl\entity\minfee\AllRoadMinFee1.class
 com\nm\gsgl\mapper\ObuBlackStatusMapper.class
 com\nm\gsgl\common\config\ErrorConfig.class
 com\nm\gsgl\common\utils\DecimalToBinaryUtil.class

ParamInsertDb/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -41,6 +41,7 @@ D:\myproject\git\ParamInsertDb\ParamInsertDb\src\main\java\com\nm\gsgl\common\ut
 D:\myproject\git\ParamInsertDb\ParamInsertDb\src\main\java\com\nm\gsgl\service\impl\EmerCarServiceImpl.java
 D:\myproject\git\ParamInsertDb\ParamInsertDb\src\main\java\com\nm\gsgl\service\ObuBlackService.java
 D:\myproject\git\ParamInsertDb\ParamInsertDb\src\main\java\com\nm\gsgl\entity\sqb\BigVehicle.java
+D:\myproject\git\ParamInsertDb\ParamInsertDb\src\main\java\com\nm\gsgl\entity\minfee\AllRoadMinFee1.java
 D:\myproject\git\ParamInsertDb\ParamInsertDb\src\main\java\com\nm\gsgl\entity\sqb\EmerCarSqb.java
 D:\myproject\git\ParamInsertDb\ParamInsertDb\src\main\java\com\nm\gsgl\mapper\EmerCarMapper.java
 D:\myproject\git\ParamInsertDb\ParamInsertDb\src\main\java\com\nm\gsgl\service\impl\MinFeeIntoDataBaseServiceImpl.java