Merge branch 'refs/heads/v16.3_line_warn_20240528' into test

performance-api/src/main/java/com/clx/performance/enums/ResultEnum.java

@@ -34,9 +34,9 @@ public enum ResultEnum implements com.msl.common.enums.ResultEnum {
 
 
     VEHICLE_WARN_USER_EXIST(1201, "联系方式已存在"),
-    VEHICLE_WARN_CONFIG_EXIST(1201, "配置名称已存在"),
+    VEHICLE_WARN_CONFIG_EXIST(1201, "预警方案名称已存在"),
     LINE_WARN_USER_EXIST(1301, "联系方式已存在"),
-    LINE_WARN_CONFIG_EXIST(1302, "配置名称已存在"),
+    LINE_WARN_CONFIG_EXIST(1302, "预警方案名称已存在"),
 
 
 

performance-web/src/main/java/com/clx/performance/sqlProvider/linewarn/LineWarnInfoSqlProvider.java

@@ -43,7 +43,7 @@ public class LineWarnInfoSqlProvider {
             if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("warn_time >= #{param.beginTime}");}
             if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("warn_time <= #{param.endTime}");}
 
-            ORDER_BY("id desc");
+            ORDER_BY("warn_time desc, id desc");
         }}.toString();
     }
 

performance-web/src/main/java/com/clx/performance/sqlProvider/vehiclewarn/VehicleWarnInfoSqlProvider.java

@@ -41,10 +41,10 @@ public class VehicleWarnInfoSqlProvider {
             if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address like CONCAT('%',#{param.sendAddress},'%')");}
             if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT('%',#{param.receiveAddress},'%')");}
 
-            if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("create_time >= #{param.beginTime}");}
-            if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("create_time <= #{param.endTime}");}
+            if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("warn_time >= #{param.beginTime}");}
+            if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("warn_time <= #{param.endTime}");}
 
-            ORDER_BY("id desc");
+            ORDER_BY("warn_time desc, id desc");
         }}.toString();
     }