From fe3b0f4a3c46892f08421dd4c4d0937fb8a87f93 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 06 六月 2023 17:55:10 +0800
Subject: [PATCH] 优化代码

---
 java110-core/src/main/java/com/java110/core/event/cmd/ServiceCmdEventPublishing.java |   60 ++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/event/cmd/ServiceCmdEventPublishing.java b/java110-core/src/main/java/com/java110/core/event/cmd/ServiceCmdEventPublishing.java
index 28e8ac0..add6586 100644
--- a/java110-core/src/main/java/com/java110/core/event/cmd/ServiceCmdEventPublishing.java
+++ b/java110-core/src/main/java/com/java110/core/event/cmd/ServiceCmdEventPublishing.java
@@ -1,27 +1,23 @@
 package com.java110.core.event.cmd;
 
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.context.DataFlowContext;
+import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.center.DataFlowListenerOrderComparator;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.core.event.service.api.ServiceDataFlowListener;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.log.LoggerFactory;
 import com.java110.dto.CmdListenerDto;
-import com.java110.entity.center.AppService;
+import com.java110.dto.logSystemError.LogSystemErrorDto;
+import com.java110.po.logSystemError.LogSystemErrorPo;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.exception.BusinessException;
-import com.java110.utils.exception.CmdException;
 import com.java110.utils.exception.ListenerExecuteException;
 import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.log.LoggerEngine;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.ExceptionUtil;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpMethod;
 
-import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -88,8 +84,9 @@
 
         List<ServiceCmdListener> cmdListeners = new ArrayList<ServiceCmdListener>();
         for (CmdListenerDto listenerBean : getListeners()) {
+            //ServiceCmdListener listener = ApplicationContextFactory.getBean(listenerBean.getBeanName(), ServiceCmdListener.class);
             ServiceCmdListener listener = ApplicationContextFactory.getBean(listenerBean.getBeanName(), ServiceCmdListener.class);
-            if(listenerBean.getServiceCode().equals(serviceCode)) {
+            if (listenerBean.getServiceCode().equals(serviceCode)) {
                 cmdListeners.add(listener);
             }
         }
@@ -111,7 +108,7 @@
      *
      * @param cmdDataFlowContext
      */
-    public static void multicastEvent(ICmdDataFlowContext cmdDataFlowContext) throws BusinessException {
+    public static void multicastEvent(ICmdDataFlowContext cmdDataFlowContext) throws Exception {
         Assert.notNull(cmdDataFlowContext.getServiceCode(), "褰撳墠娌℃湁鍙鐞嗙殑涓氬姟淇℃伅锛�");
         multicastEvent(cmdDataFlowContext.getServiceCode(), cmdDataFlowContext, null);
     }
@@ -123,8 +120,8 @@
      * @param serviceCode
      * @param dataFlowContext
      */
-    public static void multicastEvent(String serviceCode, ICmdDataFlowContext dataFlowContext) throws BusinessException {
-        multicastEvent(serviceCode, dataFlowContext,  null);
+    public static void multicastEvent(String serviceCode, ICmdDataFlowContext dataFlowContext) throws Exception {
+        multicastEvent(serviceCode, dataFlowContext, null);
     }
 
     /**
@@ -133,14 +130,15 @@
      * @param serviceCode
      * @param dataFlowContext 杩欎釜璁㈠崟淇℃伅锛屼互渚夸簬 渚﹀惉閭h竟闇�瑕佺敤
      */
-    public static void multicastEvent(String serviceCode, ICmdDataFlowContext dataFlowContext, String asyn) throws BusinessException {
+    public static void multicastEvent(String serviceCode, ICmdDataFlowContext dataFlowContext, String asyn) throws Exception {
         try {
             CmdEvent targetDataFlowEvent = new CmdEvent(serviceCode, dataFlowContext);
 
             multicastEvent(serviceCode, targetDataFlowEvent, asyn);
         } catch (Exception e) {
             logger.error("鍙戝竷渚﹀惉澶辫触锛屽け璐ュ師鍥犱负锛�", e);
-            throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, e.getMessage());
+            //throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, e.getMessage());
+            throw e;
         }
 
     }
@@ -152,7 +150,7 @@
      * @param event
      * @param asyn  A 琛ㄧず寮傛澶勭悊
      */
-    public static void multicastEvent(String serviceCode, final CmdEvent event, String asyn) {
+    public static void multicastEvent(String serviceCode, final CmdEvent event, String asyn) throws Exception {
         List<ServiceCmdListener> listeners = getListeners(serviceCode);
         //杩欓噷鍒ゆ柇 serviceCode + httpMethod 鐨勪睛鍚紝濡傛灉娌℃湁娉ㄥ唽鐩存帴鎶ラ敊銆�
         if (listeners == null || listeners.size() == 0) {
@@ -167,7 +165,11 @@
                 executor.execute(new Runnable() {
                     @Override
                     public void run() {
-                        invokeListener(listener, event);
+                        try {
+                            invokeListener(listener, event);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
                 });
                 break;
@@ -197,12 +199,26 @@
      * @since 4.1
      */
     @SuppressWarnings({"unchecked", "rawtypes"})
-    protected static void invokeListener(ServiceCmdListener listener, CmdEvent event) {
+    protected static void invokeListener(ServiceCmdListener listener, CmdEvent event) throws Exception {
         try {
-            listener.cmd(event);
-        } catch (CmdException e) {
-            LoggerEngine.error("鍙戝竷渚﹀惉澶辫触", e);
+            //        //杩欓噷澶勭悊涓氬姟閫昏緫鏁版嵁
+            ICmdDataFlowContext dataFlowContext = event.getCmdDataFlowContext();
+            //鑾峰彇璇锋眰鏁版嵁
+            JSONObject reqJson = dataFlowContext.getReqJson();
+
+            logger.debug("API鏈嶅姟 --- 璇锋眰鍙傛暟涓猴細{}", reqJson.toJSONString());
+
+            listener.validate(event, dataFlowContext, reqJson);
+
+            listener.doCmd(event, dataFlowContext, reqJson);
+
+            //logger.debug("API鏈嶅姟 --- 杩斿洖鎶ユ枃淇℃伅锛歿}", dataFlowContext.getResponseEntity());
+            //   listener.cmd(event);
+        } catch (Throwable e) {
+            LoggerEngine.error("鍙戝竷渚﹀惉澶辫触" + e);
             throw e;
         }
     }
+
+
 }

--
Gitblit v1.8.0