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

performance-web/src/main/java/com/clx/performance/listener/linewarn/LineWarnLineWarnListener.java

@@ -6,6 +6,7 @@ import com.clx.performance.common.MqWrapper;
 import com.clx.performance.constant.RabbitKeyLineWarnConstants;
 import com.clx.performance.param.mq.linewarn.LineWarnLineWarnMqParam;
 import com.clx.performance.service.linewarn.LineWarnMqHandlerService;
+import com.msl.common.exception.ServiceSystemException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -31,7 +32,12 @@ public class LineWarnLineWarnListener {
             log.info("线路预警-货单预警, message:{}", new String(message.getBody()));
             process(JSON.parseObject(new String(message.getBody()), new TypeReference<MqWrapper<LineWarnLineWarnMqParam>>(){}).getData());
         }catch (Exception e){
-            log.info("线路预警-货单预警 失败",e);
+            if (e instanceof ServiceSystemException){
+                log.info("线路预警-货单预警 失败, msg:{}", e.getMessage());
+            }
+            else {
+                log.info("线路预警-货单预警 失败", e);
+            }
         }
     }
 

performance-web/src/main/java/com/clx/performance/listener/linewarn/LineWarnOrderChildWarnListener.java

@@ -6,6 +6,7 @@ import com.clx.performance.common.MqWrapper;
 import com.clx.performance.constant.RabbitKeyLineWarnConstants;
 import com.clx.performance.param.mq.linewarn.LineWarnOrderChildWarnMqParam;
 import com.clx.performance.service.linewarn.LineWarnMqHandlerService;
+import com.msl.common.exception.ServiceSystemException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -31,7 +32,12 @@ public class LineWarnOrderChildWarnListener {
             log.info("线路预警-运单异常预警, message:{}", new String(message.getBody()));
             process(JSON.parseObject(new String(message.getBody()), new TypeReference<MqWrapper<LineWarnOrderChildWarnMqParam>>(){}).getData());
         }catch (Exception e){
-            log.info("线路预警-运单异常预警 失败",e);
+            if (e instanceof ServiceSystemException){
+                log.info("线路预警-运单异常预警 失败, msg:{}", e.getMessage());
+            }
+            else {
+                log.info("线路预警-运单异常预警 失败", e);
+            }
         }
     }
 

performance-web/src/main/java/com/clx/performance/listener/linewarn/LineWarnOrderGoodsAddListener.java

@@ -6,6 +6,7 @@ import com.clx.performance.common.MqWrapper;
 import com.clx.performance.constant.RabbitKeyLineWarnConstants;
 import com.clx.performance.param.mq.linewarn.LineWarnOrderGoodsAddMqParam;
 import com.clx.performance.service.linewarn.LineWarnMqHandlerService;
+import com.msl.common.exception.ServiceSystemException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -31,7 +32,12 @@ public class LineWarnOrderGoodsAddListener {
             log.info("线路预警-货单新增, message:{}", new String(message.getBody()));
             process(JSON.parseObject(new String(message.getBody()), new TypeReference<MqWrapper<LineWarnOrderGoodsAddMqParam>>(){}).getData());
         }catch (Exception e){
-            log.info("线路预警-货单新增 失败",e);
+            if (e instanceof ServiceSystemException){
+                log.info("线路预警-货单新增 失败, msg:{}", e.getMessage());
+            }
+            else {
+                log.info("线路预警-货单新增 失败", e);
+            }
         }
     }