From 274d91f5c1d85c6ae20a4ba932d6e245f1eb7f52 Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期五, 20 四月 2018 18:52:51 +0800
Subject: [PATCH] 增加sql配置查询,查询类测试通过

---
 CenterService/src/main/java/com/java110/center/smo/impl/CenterServiceSMOImpl.java |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/CenterService/src/main/java/com/java110/center/smo/impl/CenterServiceSMOImpl.java b/CenterService/src/main/java/com/java110/center/smo/impl/CenterServiceSMOImpl.java
index d357c22..ff7e832 100644
--- a/CenterService/src/main/java/com/java110/center/smo/impl/CenterServiceSMOImpl.java
+++ b/CenterService/src/main/java/com/java110/center/smo/impl/CenterServiceSMOImpl.java
@@ -17,6 +17,7 @@
 import com.java110.common.util.*;
 import com.java110.entity.center.*;
 import com.java110.event.center.DataFlowEventPublishing;
+import com.java110.service.smo.IQueryServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +40,9 @@
 
     @Autowired
     private RestTemplate restTemplate;
+
+    @Autowired
+    private IQueryServiceSMO queryServiceSMOImpl;
 
     @Override
     public String service(String reqJson, Map<String, String> headers) throws SMOException{
@@ -91,6 +95,7 @@
             responseJson =  ResponseTemplateUtil.createOrderResponseJson(dataFlow.getTransactionId(),
                     ResponseConstant.NO_NEED_SIGN, e.getResult().getCode(), e.getMessage());
         } catch (Exception e) {
+            logger.error("鍐呴儴寮傚父浜嗭細",e);
             responseJson =  ResponseTemplateUtil.createOrderResponseJson(dataFlow == null
                             ? ResponseConstant.NO_TRANSACTION_ID
                             : dataFlow.getTransactionId(),
@@ -562,6 +567,10 @@
         Date startDate = DateUtil.getCurrentDate();
         Date businessStartDate = null;
         List<Business> synchronousBusinesses = DataFlowFactory.getSynchronousBusinesses(dataFlow);
+
+        if(synchronousBusinesses == null || synchronousBusinesses.size() == 0){
+            return ;
+        }
         AppService service = null;
         JSONObject requestBusinessJson = null;
         JSONArray responseBusinesses = new JSONArray();
@@ -576,9 +585,6 @@
             if(service.getMethod() == null || "".equals(service.getMethod())) {//post鏂瑰紡
                 //http://user-service/test/sayHello
                 responseMessage = restTemplate.postForObject(service.getUrl(),dataFlow.getRequestBusinessJson().toJSONString(),String.class);
-            }else if(CommonConstant.INVOKE_BUSINESS_MODEL_LOCAL.equals(service.getMethod())){
-                //璋冪敤鏈湴鏈嶅姟
-                responseMessage = "";
             }else{//webservice鏂瑰紡
                 responseMessage = (String) WebServiceAxisClient.callWebService(service.getUrl(),service.getMethod(),
                         new Object[]{dataFlow.getRequestBusinessJson().toJSONString()},
@@ -592,7 +598,7 @@
             //鍙戝竷浜嬩欢
             DataFlowEventPublishing.multicastEvent(service.getServiceCode(),dataFlow);
 
-            responseBusinesses.add(dataFlow.getResponseBusinessJson().getJSONArray("business"));
+            responseBusinesses.add(dataFlow.getResponseBusinessJson());
 
             DataFlowFactory.addCostTime(dataFlow, business.getServiceCode(), "璋冪敤"+business.getServiceName()+"鑰楁椂", businessStartDate);
             saveLogMessage(dataFlow.getRequestBusinessJson(),dataFlow.getResponseBusinessJson());
@@ -614,6 +620,10 @@
         Date startDate = DateUtil.getCurrentDate();
         //6.3 澶勭悊寮傛锛屾寜娑堟伅闃熼噷澶勭悊
         List<Business> asynchronousBusinesses = DataFlowFactory.getAsynchronousBusinesses(dataFlow);
+
+        if(asynchronousBusinesses == null || asynchronousBusinesses.size() == 0){
+            return ;
+        }
 
         try {
             for (Business business : asynchronousBusinesses) {
@@ -688,4 +698,12 @@
     public void setRestTemplate(RestTemplate restTemplate) {
         this.restTemplate = restTemplate;
     }
+
+    public IQueryServiceSMO getQueryServiceSMOImpl() {
+        return queryServiceSMOImpl;
+    }
+
+    public void setQueryServiceSMOImpl(IQueryServiceSMO queryServiceSMOImpl) {
+        this.queryServiceSMOImpl = queryServiceSMOImpl;
+    }
 }

--
Gitblit v1.8.0