2024年12月17日 1.0.2 实时信息查询页面优化查询语句及数据排序

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

@@ -130,12 +130,12 @@ public class Constant {
             "    WHERE VEHICLEPLATE LIKE '%AAAAAA%'";
 
 
-    public static final String ORACLE_DT_TIME_INTERVAL = " AND DT BETWEEN TO_DATE('CCCCCC', 'YYYY-MM-DD') AND TO_DATE('DDDDDD', 'YYYY-MM-DD')";
-    public static final String OUT_ORACLE_DT_TIME_INTERVAL = " AND n.DT BETWEEN TO_DATE('CCCCCC', 'YYYY-MM-DD') AND TO_DATE('DDDDDD', 'YYYY-MM-DD')";
-    public static final String OTHER_DT_TIME_INTERVAL = " AND DT BETWEEN 'CCCCCC' AND 'DDDDDD'";
-    public static final String OUT_OTHER_DT_TIME_INTERVAL = " AND n.DT BETWEEN 'CCCCCC' AND 'DDDDDD'";
-    public static final String ORACLE_TRANS_TIME_INTERVAL = " AND TRANSTIME BETWEEN TO_DATE('CCCCCC', 'YYYY-MM-DD') AND TO_DATE('DDDDDD', 'YYYY-MM-DD')";
-    public static final String OTHER_TRANS_TIME_INTERVAL = " AND TRANSTIME BETWEEN 'CCCCCC' AND 'DDDDDD'";
+    public static final String ORACLE_DT_TIME_INTERVAL = " AND DT BETWEEN TO_DATE('CCCCCC', 'YYYY-MM-DD') AND TO_DATE('DDDDDD', 'YYYY-MM-DD') order by DT desc";
+    public static final String OUT_ORACLE_DT_TIME_INTERVAL = " AND n.DT BETWEEN TO_DATE('CCCCCC', 'YYYY-MM-DD') AND TO_DATE('DDDDDD', 'YYYY-MM-DD')  order by DT desc";
+    public static final String OTHER_DT_TIME_INTERVAL = " AND DT BETWEEN 'CCCCCC' AND 'DDDDDD'  order by DT desc";
+    public static final String OUT_OTHER_DT_TIME_INTERVAL = " AND n.DT BETWEEN 'CCCCCC' AND 'DDDDDD'  order by DT desc";
+    public static final String ORACLE_TRANS_TIME_INTERVAL = " AND TRANSTIME BETWEEN TO_DATE('CCCCCC', 'YYYY-MM-DD') AND TO_DATE('DDDDDD', 'YYYY-MM-DD')  order by TRANSTIME desc";
+    public static final String OTHER_TRANS_TIME_INTERVAL = " AND TRANSTIME BETWEEN 'CCCCCC' AND 'DDDDDD'  order by TRANSTIME desc";
 
 
 }

RealTimeInfoQuery/src/main/java/com/nm/gsgl/entity/GantryInfo.java

@@ -16,7 +16,7 @@ public class GantryInfo {
     private String STANAME;
     private String TRADEID;
     private String GANTRYID ;
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     private Date TRANSTIME;
     private Integer PAYFEE;
     private Integer FEE;
@@ -24,7 +24,7 @@ public class GantryInfo {
     private Integer TRANSFEE;
     private String VEHICLEPLATE;
     private String TYPECN;
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     private Date ENTIME;
     private String INNAME;
 }

RealTimeInfoQuery/src/main/java/com/nm/gsgl/entity/InPortInfo.java

@@ -19,7 +19,7 @@ public class InPortInfo {
     private String TYPECN;
     private String FLAG;
     private String ACARNO;
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     private Date DT;
     private String ROADNAME;
     private String MAN;

RealTimeInfoQuery/src/main/java/com/nm/gsgl/entity/OutPortInfo.java

@@ -21,7 +21,7 @@ public class OutPortInfo {
     private String IPORTTYPE;
     private String ITYPECN;
     private String IACARNO;
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     private Date IDT;
     private String IROADNAME;
     private String IKINDCN;
@@ -33,7 +33,7 @@ public class OutPortInfo {
     private String TYPECN;
     private String FLAG;
     private String ACARNO;
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     private Date DT;
     private String ROADNAME;
     private String MAN;

RealTimeInfoQuery/src/main/java/com/nm/gsgl/service/impl/CallInterfaceServiceImpl.java

@@ -165,6 +165,7 @@ public class CallInterfaceServiceImpl implements CallInterfaceService {
             map2.put("SQLTEXT", querySql);
             //System.out.println("==============================");
             //System.out.println(querySql);
+            log.info("[uuid:{}]-查询sql语句{}", uuid,querySql);
             String jsonData2 = JSONObject.toJSONString(map2);
             try {
                 String s = HttpClientUtils.postSqlInfo(jsonData2, url);

RealTimeInfoQuery/src/main/java/com/nm/gsgl/test/Test07.java

@@ -0,0 +1,23 @@
+package com.nm.gsgl.test;
+
+import com.alibaba.fastjson.JSONObject;
+import com.nm.gsgl.entity.OutPortInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author: shuguang
+ * @date: 2024年12月17日 14:49
+ * @description:
+ */
+public class Test07 {
+    public static void main(String[] args) {
+        String sql0 = "[{\"IALGORITHMIDENTIFIER\":1,\"PORTNO\":54,\"IKINDCN\":\"未知\",\"LISTNO\":\"0F0203362EF303F50E\",\"OBUVERSION\":64,\"TYPECN\":\"货六\",\"ISTANAME\":\"巴拉贡\",\"IROADNAME\":\"高路公司\",\"DT\":1734334197000,\"ROADNAME\":\"高路公司\",\"ALGORITHMIDENTIFIER\":1,\"IDT\":1734331028000,\"KINDCN\":\"记账卡\",\"CARDNO\":\"2001230065072164\",\"MANNO\":70711034,\"IPORTNO\":32,\"PORTTYPE\":\"ETC出口\",\"IPORTTYPE\":\"ETC入口\",\"ITYPECN\":\"货三\",\"ILISTNO\":\"0F025A202EF2F79424\",\"ACARNO\":\"冀A712B1\",\"CPUVERSION\":64,\"IBAK14\":\"4040\",\"MAN\":\"机器人出口54\",\"IACARNO\":\"冀A712B1\",\"STANAME\":\"临河新区\"},{\"IALGORITHMIDENTIFIER\":1,\"PORTNO\":53,\"IKINDCN\":\"未知\",\"LISTNO\":\"0F025C352EF2E2DC54\",\"OBUVERSION\":64,\"TYPECN\":\"货六\",\"ISTANAME\":\"海渤湾\",\"IROADNAME\":\"高路公司\",\"DT\":1734325724000,\"ROADNAME\":\"高路公司\",\"ALGORITHMIDENTIFIER\":1,\"IDT\":1734324158000,\"KINDCN\":\"记账卡\",\"CARDNO\":\"2001230065072164\",\"MANNO\":80211888,\"IPORTNO\":32,\"PORTTYPE\":\"ETC出口\",\"IPORTTYPE\":\"ETC入口\",\"ITYPECN\":\"货三\",\"ILISTNO\":\"0F025D202EF2DCBE15\",\"ACARNO\":\"冀A712B1\",\"CPUVERSION\":64,\"IBAK14\":\"4040\",\"MAN\":\"机器人出口\",\"IACARNO\":\"冀A712B1\",\"STANAME\":\"蒙西\"}]";
+        List mapList = new ArrayList<>();
+        mapList = JSONObject.parseArray(sql0, OutPortInfo.class);
+        System.out.println(mapList);
+
+
+    }
+}

RealTimeInfoQuery/src/main/resources/version/1.0.2.txt

@@ -1,3 +1,4 @@
 序号   日期              版本号       说明
 1      2024年08月09日    1.0.0       初始化收费站版本实时信息查询，在原有集中监控版本上增加实时信息查询页面
 2      2024年08月13日    1.0.1       实时信息查询页面增加国密改造增加字段（OBU合同版本号、ETC用户卡版本号、算法标识）
+3      2024年12月17日    1.0.2       实时信息查询页面优化查询语句及数据排序

RealTimeInfoQuery/target/RealTimeInfoQuery/WEB-INF/classes/META-INF/spring.factories

@@ -0,0 +1 @@
+org.springframework.boot.env.EnvironmentPostProcessor=com.nm.gsgl.common.config.MyEnvironmentPostProcessor