From bdc870fab7c09b420079257fb05e3e08a5436ff9 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 01 九月 2021 08:25:02 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-job/src/main/java/com/java110/job/kafka/JobServiceKafka.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/kafka/JobServiceKafka.java b/service-job/src/main/java/com/java110/job/kafka/JobServiceKafka.java
index 2c692b2..ace3b51 100755
--- a/service-job/src/main/java/com/java110/job/kafka/JobServiceKafka.java
+++ b/service-job/src/main/java/com/java110/job/kafka/JobServiceKafka.java
@@ -11,6 +11,7 @@
import com.java110.utils.exception.InitConfigDataException;
import com.java110.utils.exception.InitDataFlowContextException;
import com.java110.utils.kafka.KafkaFactory;
+import com.java110.utils.util.Assert;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,7 +44,7 @@
//棰勬牎楠�
preValiateOrderInfo(orderInfo);
businessServiceDataFlow = this.writeDataToDataFlowContext(orderInfo, headers);
- responseJson = jobServiceSMOImpl.service(businessServiceDataFlow);
+ //responseJson = jobServiceSMOImpl.service(businessServiceDataFlow);
} catch (InitDataFlowContextException e) {
logger.error("璇锋眰鎶ユ枃閿欒,鍒濆鍖� BusinessServiceDataFlow澶辫触" + orderInfo, e);
responseJson = DataTransactionFactory.createNoBusinessTypeBusinessResponseJson(orderInfo, ResponseConstant.RESULT_PARAM_ERROR, e.getMessage(), null);
@@ -77,9 +78,14 @@
* @param orderInfo
*/
private void preValiateOrderInfo(String orderInfo) {
- /* if(JSONObject.parseObject(orderInfo).getJSONObject("orders").containsKey("dataFlowId")){
- throw new BusinessException(ResponseConstant.RESULT_CODE_ERROR,"鎶ユ枃涓笉鑳藉瓨鍦╠ataFlowId鑺傜偣");
- }*/
+ JSONObject reqJson = JSONObject.parseObject(orderInfo);
+ Assert.hasKeyAndValue(reqJson, "header", "璇锋眰鎶ユ枃涓湭鍖呭惈header");
+ Assert.hasKeyAndValue(reqJson, "body", "璇锋眰鎶ユ枃涓湭鍖呭惈body");
+ JSONObject header = reqJson.getJSONObject("header");
+ Assert.hasKeyAndValue(header, "serviceCode", "璇锋眰鎶ユ枃涓湭鍖呭惈serviceCode");
+ Assert.hasKeyAndValue(header, "sign", "璇锋眰鎶ユ枃涓湭鍖呭惈sign");
+ Assert.hasKeyAndValue(header, "resTime", "璇锋眰鎶ユ枃涓湭鍖呭惈reqTime");
+ Assert.hasKeyAndValue(header, "code", "璇锋眰鎶ユ枃涓湭鍖呭惈reqTime");
+ Assert.hasKeyAndValue(header, "msg", "璇锋眰鎶ユ枃涓湭鍖呭惈reqTime");
}
-
}
--
Gitblit v1.8.0