2025年01月17日 1.1.8 优化下发武俊涛Java程序及下载回调,云收费平台测试

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

@@ -79,14 +79,12 @@ public class Constant {
     public static final String CREATE_BASICINFO_SQB_SQL = "CREATE TABLE IF NOT EXISTS BASICINFO (BEGDATE DATETIME,TYPE INT,PROVINCEID TEXT,ID TEXT,NAME TEXT,HEX TEXT,VERNO TEXT,BAK1 TEXT,BAK2 TEXT,BAK3 TEXT,BAK4 TEXT,BAK6 TEXT,BAK7 TEXT,BAK8 TEXT )";
     public static final String CREATE_PRICELIB_SQB_SQL = "CREATE TABLE IF NOT EXISTS PRICELIB (BEGDATE DATETIME,ENDDATE DATETIME,SEQNO TEXT,IAREANO INT,IROADNO INT,ISTANO INT,OAREANO INT,OROADNO INT,OSTANO INT,FLAGSTA INT,DIRECT INT,IDX INT,CASH1 INT,CASH2 INT,CASH3 INT,CASH4 INT,CASH5 INT,CASH6 INT,CASH7 INT,CASH8 INT,CASH9 INT,CASH10 INT,CASH11 INT,CASH12 INT,CASH13 INT,PATHCMB TEXT,MILES INT,KIND INT,STATE INT,SEQCMB TEXT,_DBASELOCK TEXT,HCASH1 INT,HCASH2 INT,HCASH3 INT,HCASH4 INT,HCASH5 INT,HCASH6 INT,HCASH7 INT,HCASH8 INT,HCASH9 INT,HCASH10 INT,HCASH11 INT,HCASH12 INT,HCASH13 INT,ZCASH1 INT,ZCASH2 INT,ZCASH3 INT,ZCASH4 INT,ZCASH5 INT,ZCASH6 INT,ZCASH7 INT,ZCASH8 INT,ZCASH9 INT,ZCASH10 INT,ZCASH11 INT,ZCASH12 INT,ZCASH13 INT )";
     /**
-     *数据库驱动
-     *
+     * 数据库驱动
      */
     public static final String SQLSERVER_CLASSNAME = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
     public static final String ORACLE_CLASSNAME = "oracle.jdbc.driver.OracleDriver";
 
 
-
     /**
      * 接收发送文件的接口名称
      */
@@ -135,8 +133,8 @@ public class Constant {
     public static final int INT_1003 = 1003;
     public static final int INT_1004 = 1004;
     public static final int INT_9001 = 9001;
-    public static final List<Integer> INT_GENERATED = Arrays.asList(101, 102, 103, 104, 105, 106, 107, 108, 111, 222, 59, 801, 802, 808, 809, 919, 920, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 3501, 3601,9001);
-    public static final List<Integer> INT_UPLOAD = Arrays.asList(101, 102, 103, 104, 105, 106, 107, 108, 111, 222, 801, 802, 808, 809, 919, 920, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 3501, 3601,9001);
+    public static final List<Integer> INT_GENERATED = Arrays.asList(101, 102, 103, 104, 105, 106, 107, 108, 111, 222, 59, 81, 801, 802, 808, 809, 919, 920, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 3501, 3601, 9001);
+    public static final List<Integer> INT_UPLOAD = Arrays.asList(101, 102, 103, 104, 105, 106, 107, 108, 111, 222, 801, 802, 808, 809, 919, 920, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 3501, 3601, 9001);
 
     /**
      * ETC卡黑名单-全量101
@@ -215,8 +213,7 @@ public class Constant {
     /**
      * 智慧云IP地址
      */
-    public final static List<String> ZHY_IP_LIST = Arrays.asList( "10.15.0.28", "10.15.0.29");
-
+    public final static List<String> ZHY_IP_LIST = Arrays.asList("10.15.0.28", "10.15.0.29");
 
 
     public static final String SQLITE_DRIVER_NAME = "org.sqlite.JDBC";

ManualSendOut/src/main/java/com/nm/gsgl/common/utils/CloseableHttpClientUtils.java

@@ -1,6 +1,8 @@
 package com.nm.gsgl.common.utils;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.nm.gsgl.entity.Res;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpStatus;
@@ -108,7 +110,7 @@ public class CloseableHttpClientUtils {
 
         CloseableHttpClient client = null;
         CloseableHttpResponse response = null;
-        //String result = null;
+        String result = null;
 
         try {
             //创建可关闭的 HttpClient 实例
@@ -141,9 +143,17 @@ public class CloseableHttpClientUtils {
 
             //执行请求
             response = client.execute(httpPost);
-            //if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
-            //    result = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-            //}
+            result=EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+            log.info("{}接口返回消息{}",httpUrl,result);
+            ObjectMapper objectMapper = new ObjectMapper();
+            Res res = objectMapper.readValue(result, Res.class);
+            if(res!= null && "200".equals(res.getCode())){
+                log.info("{}接口返回成功，结果为{}",httpUrl,res.getMessage());
+            }else {
+                log.info("{}接口返回消息失败，报错{}",httpUrl,res);
+            }
+
+
         } catch (IOException e) {
             log.error("发送post请求错误,请求URL：{},请求参数：{},错误信息：{}", httpUrl, data, e.getMessage());
         } finally {

ManualSendOut/src/main/java/com/nm/gsgl/common/utils/SqliteUtils.java

@@ -164,7 +164,7 @@ public class SqliteUtils {
             idxBegDate = h.getBegdate();
         }
         System.out.println(sqlList.size());
-        String insertIdxTableSql = "INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('" + DateTimeUtil.getFormateString(now, Constant.YYYY_MM_DD_HH_MM_SS) + "','" + idxVersion + "','" + sqlList.size() + "','" + DateTimeUtil.getFormateString(idxBegDate, Constant.YYYY_MM_DD_HH_MM_SS) + "')";
+        String insertIdxTableSql = "INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('" + DateTimeUtil.getFormateString(now, Constant.YYYY_MM_DD_HH_MM_SS) + "','" + idxVersion + "','" + sqlList.size() + "','" + DateTimeUtil.getFormateString(idxBegDate, Constant.YYYY_MM_DD_HH_MM_SS) + "')";
         long start2 = System.currentTimeMillis();
         int count = insertSqlite(url, sqlList, insertIdxTableSql);
         long end2 = System.currentTimeMillis();
@@ -218,7 +218,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -263,14 +263,14 @@ public class SqliteUtils {
                     String idxBegDate = "";
                     for (Map<String, Object> map : mapList) {
                         idxBegDate = (String) map.get("BEGDATE");
-                        String insertSql = new StringBuilder().append("INSERT INTO ROADCODE (BEGDATE, AREANO,SUBAREANO ,SAREANAME ,ROADNO ,STANO ,STAID ,ROADNAME , STANAME , FREEPOS , DISCOUNT , SUBCOMNO , STATYPE , AREAEDGE , IGANTRYID , IGANTRYHEX , OGANTRYID , OGANTRYHEX ) VALUES(")
+                        String insertSql = new StringBuilder().append("INSERT INTO ROADCODE (BEGDATE, AREANO,SUBAREANO ,SUBAREANAME ,ROADNO ,STANO ,GBSTATIONID ,ROADNAME , STANAME , FREEPOS , DISCOUNT , SUBCOMNO , STATYPE , AREAEDGE , IGANTRYID , IGANTRYHEX , OGANTRYID , OGANTRYHEX ) VALUES(")
                                 .append("'").append(map.getOrDefault("BEGDATE", Constant.NULL_STRING)).append("'").append(",")
                                 .append("'").append(map.getOrDefault("AREANO", Constant.NULL_STRING)).append("'").append(",")
                                 .append("'").append(map.getOrDefault("SUBAREANO", Constant.ZERO)).append("'").append(",")
-                                .append("'").append(map.getOrDefault("SAREANAME", Constant.NULL_STRING)).append("'").append(",")
+                                .append("'").append(map.getOrDefault("SUBAREANAME", Constant.NULL_STRING)).append("'").append(",")
                                 .append("'").append(map.getOrDefault("ROADNO", Constant.NULL_STRING)).append("'").append(",")
                                 .append("'").append(map.getOrDefault("STANO", Constant.NULL_STRING)).append("'").append(",")
-                                .append("'").append(map.getOrDefault("STAID", Constant.NULL_STRING)).append("'").append(",")
+                                .append("'").append(map.getOrDefault("GBSTATIONID", Constant.NULL_STRING)).append("'").append(",")
                                 .append("'").append(map.getOrDefault("ROADNAME", Constant.NULL_STRING)).append("'").append(",")
                                 .append("'").append(map.getOrDefault("STANAME", Constant.NULL_STRING)).append("'").append(",")
                                 .append("'").append(map.getOrDefault("FREEPOS", Constant.NULL_STRING)).append("'").append(",")
@@ -286,7 +286,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(version).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(version).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -342,7 +342,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(version).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(version).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -405,7 +405,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -471,7 +471,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -536,7 +536,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -597,7 +597,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -661,7 +661,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -719,7 +719,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -783,7 +783,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -846,7 +846,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -915,7 +915,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(version).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(version).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -981,7 +981,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(idxVersion).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -1087,7 +1087,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(version).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(version).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -1167,7 +1167,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(version).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(version).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 
@@ -1228,7 +1228,7 @@ public class SqliteUtils {
                         statement.executeUpdate(insertSql);
                     }
 
-                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEADATE) VALUES('").append(idxBegDate).append("','").append(version).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
+                    String insertIdxTableSql = new StringBuilder().append("INSERT INTO IDX_TABLE (CREATETIME,VERSION,RECCOUNT ,BEGDATE) VALUES('").append(idxBegDate).append("','").append(version).append("','").append(mapList.size()).append("','").append(idxBegDate).append("')").toString();
                     statement.executeUpdate(insertIdxTableSql);
                 }
 

ManualSendOut/src/main/java/com/nm/gsgl/entity/Res.java

@@ -0,0 +1,44 @@
+package com.nm.gsgl.entity;
+
+import com.nm.gsgl.common.enumeration.MessageEnum;
+import lombok.Data;
+
+/**
+ * @author: shuguang
+ * @date: 2022年10月16日 16:01
+ * @description:  返回结果
+ */
+@Data
+public class Res<T> {
+    private String code;
+    private String message;
+    private String success;
+    private T data;
+    public Res() {
+    }
+
+    public Res(T data) {
+        this.data = data;
+    }
+
+    public static Res success() {
+        Res result = new Res<>();
+        result.setCode(MessageEnum.成功.getCode());
+        result.setMessage(MessageEnum.成功.getMessage());
+        return result;
+    }
+
+    public static <T> Res<T> success(T data) {
+        Res<T> result = new Res<>(data);
+        result.setCode(MessageEnum.成功.getCode());
+        result.setMessage(MessageEnum.成功.getMessage());
+        return result;
+    }
+
+    public static Res error(String code, String msg) {
+        Res result = new Res();
+        result.setCode(code);
+        result.setMessage(msg);
+        return result;
+    }
+}

ManualSendOut/src/main/java/com/nm/gsgl/service/impl/CheckLaneServiceImpl.java

@@ -23,7 +23,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-@Transactional(rollbackFor = Exception.class)
+//@Transactional(rollbackFor = Exception.class)
 public class CheckLaneServiceImpl implements CheckLaneService {
     @Resource
     private SetupTableMapper setupTableMapper;

ManualSendOut/src/main/java/com/nm/gsgl/service/impl/CmsDataSynchroServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-@Transactional(rollbackFor = Exception.class)
+//@Transactional(rollbackFor = Exception.class)
 public class CmsDataSynchroServiceImpl implements CmsDataSynchroService {
     @Resource
     private CmsDataSynchroMapper cmsDataSynchroMapper;

ManualSendOut/src/main/java/com/nm/gsgl/service/impl/CmsParameterServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Service
 @Slf4j
-@Transactional(rollbackFor = Exception.class)
+//@Transactional(rollbackFor = Exception.class)
 public class CmsParameterServiceImpl implements CmsParameterService {
 
     @Resource

ManualSendOut/src/main/java/com/nm/gsgl/service/impl/ManagerServiceImpl.java

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-@Transactional(rollbackFor = Exception.class)
+//@Transactional(rollbackFor = Exception.class)
 public class ManagerServiceImpl implements ManagerService {
 
     @Resource

ManualSendOut/src/main/java/com/nm/gsgl/service/impl/ManualIssueServiceImpl.java

@@ -108,7 +108,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-@Transactional(rollbackFor = Exception.class)
+//@Transactional(rollbackFor = Exception.class)
 public class ManualIssueServiceImpl implements ManualIssueService {
     @Resource
     private CmsDownLogMapper cmsDownLogMapper;
@@ -212,28 +212,28 @@ public class ManualIssueServiceImpl implements ManualIssueService {
         //log.info("decryptManNo====={}",decryptManNo);
         List<SetUpTable> list = JSON.parseObject(checkedNodes, new TypeReference<List<SetUpTable>>() {
         });
-        int count = 0;
-        if (list != null && list.size() > 0) {
-            log.info("[uuid:{}]-开始保存已选车道，条数为{}", uuid, list.size());
-            UpdateWrapper<SetupTable> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.set("UNUSE12", 0);
-            setupTableMapper.update(null, updateWrapper);
-            for (SetUpTable setUpTable : list) {
-                if (StringUtils.isNotBlank(setUpTable.getPORTIP())) {
-                    UpdateWrapper<SetupTable> setupTableUpdateWrapper = new UpdateWrapper<>();
-                    setupTableUpdateWrapper.eq("ROADNO", setUpTable.getROADNO())
-                            .eq("STANO", setUpTable.getSTANO())
-                            .eq("PORTNO", setUpTable.getPORTNO())
-                            .set("UNUSE12", 1);
-                    setupTableMapper.update(null, setupTableUpdateWrapper);
-                    count++;
-                }
-
-            }
-            log.info("[uuid:{}]-更新已选车道，条数为{}", uuid, count);
-        } else {
-            log.info("[uuid:{}]-未选择车道，条数为0", uuid);
-        }
+        //int count = 0;
+        //if (list != null && list.size() > 0) {
+        //    log.info("[uuid:{}]-开始保存已选车道，条数为{}", uuid, list.size());
+        //    UpdateWrapper<SetupTable> updateWrapper = new UpdateWrapper<>();
+        //    updateWrapper.set("UNUSE12", 0);
+        //    setupTableMapper.update(null, updateWrapper);
+        //    for (SetUpTable setUpTable : list) {
+        //        if (StringUtils.isNotBlank(setUpTable.getPORTIP())) {
+        //            UpdateWrapper<SetupTable> setupTableUpdateWrapper = new UpdateWrapper<>();
+        //            setupTableUpdateWrapper.eq("ROADNO", setUpTable.getROADNO())
+        //                    .eq("STANO", setUpTable.getSTANO())
+        //                    .eq("PORTNO", setUpTable.getPORTNO())
+        //                    .set("UNUSE12", 1);
+        //            setupTableMapper.update(null, setupTableUpdateWrapper);
+        //            count++;
+        //        }
+        //
+        //    }
+        //    log.info("[uuid:{}]-更新已选车道，条数为{}", uuid, count);
+        //} else {
+        //    log.info("[uuid:{}]-未选择车道，条数为0", uuid);
+        //}
 
 
         for (Integer protocolType : ids) {

ManualSendOut/src/main/java/com/nm/gsgl/service/impl/QueryParamsServiceImpl.java

@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-@Transactional(rollbackFor = Exception.class)
+//@Transactional(rollbackFor = Exception.class)
 public class QueryParamsServiceImpl implements QueryParamsService {
     @Resource
     private NameTableDcomMapper nameTableDcomMapper;

ManualSendOut/src/main/java/com/nm/gsgl/service/impl/RecFileServiceImpl.java

@@ -68,7 +68,7 @@ import java.util.List;
  */
 @Service
 @Slf4j
-@Transactional(rollbackFor = Exception.class)
+//@Transactional(rollbackFor = Exception.class)
 public class RecFileServiceImpl implements RecFileService {
     @Value("${DownloadPath}")
     private String DownloadPath;

ManualSendOut/src/main/java/com/nm/gsgl/service/impl/UploadZlibServiceImpl.java

@@ -153,7 +153,7 @@ public class UploadZlibServiceImpl implements UploadZlibService {
         FileUtil.uploadFile(file, uploadFilePath);
         String sqbUrl = Constant.SQLITE_PRE + uploadFilePath;
         PriceLib priceLib = DatabaseUtil.selectPriceLib(Constant.SQLITE_DRIVER_NAME, sqbUrl, Constant.SQL_PRICE_LIB);
-        String s = DateTimeUtil.getFormateString(DateTimeUtil.getFormatDate(priceLib.getBegDate(), Constant.YYYY_MM_DD_HH_MM_SS), Constant.YYYYMMDDHHMMSS);
+        String s = DateTimeUtil.getFormateString(new Date(), Constant.YYYYMMDDHHMMSS);
         String newNames = "SQB_PRICELIB_" + s + Constant.STR_ + priceLib.getIdx()
                 + Constant.STR_ZLIB;
         String newFileAllPath = upLoadPath + File.separator + newNames;

ManualSendOut/src/main/java/com/nm/gsgl/service/impl/WjtManualServiceImpl.java

@@ -31,7 +31,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.File;
@@ -48,7 +47,6 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-@Transactional(rollbackFor = Exception.class)
 public class WjtManualServiceImpl implements WjtManualService {
     @Value("${UserType}")
     private String userType;
@@ -86,11 +84,12 @@ public class WjtManualServiceImpl implements WjtManualService {
         log.info("[uuid:{}]-开始手动下发参数数据", uuid);
         List<Integer> ids = (List<Integer>) map.get("ids");
         String checkedNodes = JSON.toJSONString(map.get("checkedNodes"));
+        //正式使用
         String man = String.valueOf(map.get("man"));
         String manno = String.valueOf(map.get("manno"));
         //测试使用
-        //String decryptManNo = "1";
-        //String decryptManNo = DESUtil.decrypt(manno.replace("AAAAA", "/").replace("\\", "BBBBB"));
+        //String man ="测试号";
+        //String manno = "A/WmzjNaj6k=";
         String decryptManNo = DESUtil.decrypt(manno);
         if (StringUtils.isBlank(decryptManNo)) {
             throw new RuntimeException("解密失败，请重新登录");
@@ -446,6 +445,8 @@ public class WjtManualServiceImpl implements WjtManualService {
                     sqlStr = cmsParameter.getSqlStr();
                 } else if (Constant.STR_TWO.equals(DBType)) {
                     sqlStr = cmsParameter.getOraStr();
+                }else if (Constant.STR_FOUR.equals(DBType)) {
+                    sqlStr = cmsParameter.getOraStr();
                 }
 
                 String sqbName = Constant.SQB_ + paramName.split("\\.")[0].toUpperCase() + Constant.STR_ + version + Constant.STR_SQB;

ManualSendOut/src/main/resources/static/index.html

@@ -5,7 +5,7 @@
     <meta charset="UTF-8"/>
     
     <title></title>
-  <script type="module" crossorigin src="./assets/index.e3f026fc.js"></script>
+  <script type="module" crossorigin src="./assets/index.ab7d5d8d.js"></script>
   <link rel="stylesheet" href="./assets/index.f0fb4751.css">
 </head>
 <body>

ManualSendOut/src/main/resources/version/1.1.8.txt

@@ -20,3 +20,5 @@
 15     2024年11月01日    1.1.4       优化手动上传费率文件
 16     2024年11月28日    1.1.5       优化查询黑名单页面查询加载动画
 17     2024年12月18日    1.1.6       优化参数表下发页面非admin只能操作配置IssuedTableId(CMS_DATASYNCHRO表中ID,使用英文,隔开),参数表下发管理页面非admin登录不允许操作
+18     2024年12月20日    1.1.7       优化参数表下发
+19     2025年01月17日    1.1.8       优化下发武俊涛Java程序及下载回调,云收费平台测试

vue_ManualSendOut/.idea/vue_ManualSendOut.iml

@@ -6,4 +6,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="87e1e0e0-733c-4c54-8340-42c7a61d7e61" />
+  </component>
 </module>

vue_ManualSendOut/ManualSendOut/index.html

@@ -5,7 +5,7 @@
     <meta charset="UTF-8"/>
     
     <title></title>
-  <script type="module" crossorigin src="./assets/index.e3f026fc.js"></script>
+  <script type="module" crossorigin src="./assets/index.ab7d5d8d.js"></script>
   <link rel="stylesheet" href="./assets/index.f0fb4751.css">
 </head>
 <body>

vue_ManualSendOut/src/views/Pages/LaneDistribute.vue

@@ -20,7 +20,7 @@
             <el-table :data="tableData" border
                       highlight-current-row="true"
                       style="width: 100%"
-                      height="100%"
+                      height="95%"
                       @selection-change="handleSelectionChange"
             >
               <!--              <el-table-column resizable="false" fixed type="selection" width="50" align="center"></el-table-column>-->

vue_ManualSendOut/src/views/Pages/LaneIssued.vue

@@ -351,18 +351,18 @@ export default {
       //this.manno = manno.replace('/', 'AAAAA').replace('\\', 'BBBBB');
       //console.log(man);
       //console.log(manno);
-      if (checkedNodes.length === 0 || checkedIds.length === 0) {
+      if (manno === '' || manno === undefined || manno === null ||manno==='undefined') {
         ElMessage({
           showClose: true,
-          message: '请选择下发车道地址、下发实体参数数据！',
+          message: '未登录不能操作！',
           type: 'warning',
         })
         return;
       }
-      if (manno === '' || manno === undefined) {
+      if (checkedNodes.length === 0 || checkedIds.length === 0) {
         ElMessage({
           showClose: true,
-          message: '未登录不能操作！',
+          message: '请选择下发车道地址、下发实体参数数据！',
           type: 'warning',
         })
         return;

vue_ManualSendOut/src/views/Pages/WjtParamsIssued.vue

@@ -259,23 +259,24 @@ export default {
       // const manno = "A/WmzjNaj6k=";
       //this.manno = manno.replace('/', 'AAAAA').replace('\\', 'BBBBB');
       //console.log(man);
-      //console.log(manno);
-      if (checkedNodes.length === 0 || checkedIds.length === 0) {
+      // console.log(manno);
+      if (manno === '' || manno === undefined || manno === null ||manno==='undefined') {
         ElMessage({
           showClose: true,
-          message: '请选择下发地址、下发实体参数数据！',
+          message: '未登录不能操作！',
           type: 'warning',
         })
         return;
       }
-      if (manno === '' || manno === undefined) {
+      if (checkedNodes.length === 0 || checkedIds.length === 0) {
         ElMessage({
           showClose: true,
-          message: '未登录不能操作！',
+          message: '请选择下发地址、下发实体参数数据！',
           type: 'warning',
         })
         return;
       }
+
       ElMessageBox.confirm(
           '是否下发选择的地址:' + checkedNodes.length + '个,参数类型:' + checkedIds + '进行手动下发？',
           '提示',