From b2b5bdf6f42597e582da96aa56707e1f68d3936e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:41:44 +0800
Subject: [PATCH] 优化 费用
---
java110-core/src/main/java/com/java110/core/factory/OrderDataFlowContextFactory.java | 550 ++++++++++++++++++++++++++++--------------------------
1 files changed, 289 insertions(+), 261 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/factory/OrderDataFlowContextFactory.java b/java110-core/src/main/java/com/java110/core/factory/OrderDataFlowContextFactory.java
old mode 100644
new mode 100755
index 8873246..5a0a215
--- a/java110-core/src/main/java/com/java110/core/factory/OrderDataFlowContextFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/OrderDataFlowContextFactory.java
@@ -2,14 +2,6 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.MappingConstant;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.StatusConstant;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
import com.java110.core.context.DataFlow;
import com.java110.core.context.IOrderDataFlowContext;
import com.java110.core.context.IOrderNotifyDataFlowContext;
@@ -19,6 +11,14 @@
import com.java110.entity.order.BusinessAttrs;
import com.java110.entity.order.Orders;
import com.java110.entity.order.OrdersAttrs;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.MappingConstant;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.StatusConstant;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.BeanInstantiationException;
import org.springframework.http.HttpHeaders;
import org.springframework.util.MultiValueMap;
@@ -33,6 +33,7 @@
/**
* 鍒濆鍖�
+ *
* @param clazz
* @param <T>
* @return
@@ -44,11 +45,10 @@
}
//DateUtil.getCurrentDate(), ResponseConstant.RESULT_CODE_SUCCESS
try {
- return clazz.getConstructor(Date.class,String.class).newInstance(DateUtil.getCurrentDate(), ResponseConstant.RESULT_CODE_SUCCESS);
- }
- catch (InstantiationException ex) {
+ return clazz.getConstructor(Date.class, String.class).newInstance(DateUtil.getCurrentDate(), ResponseConstant.RESULT_CODE_SUCCESS);
+ } catch (InstantiationException ex) {
throw new BeanInstantiationException(clazz, "鏄竴涓娊璞＄被?", ex);
- }catch (Exception ex){
+ } catch (Exception ex) {
throw new BeanInstantiationException(clazz, "鏋勯�犲嚱鏁颁笉鑳借闂�?", ex);
}
@@ -57,14 +57,15 @@
/**
* 娣诲姞鑰楁椂
- * @param dataFlow 鏁版嵁娴�
+ *
+ * @param dataFlow 鏁版嵁娴�
* @param linksCode 鐜妭缂栫爜
* @param linksName 鐜妭鍚嶇О
* @param startDate 寮�濮嬫椂闂�
* @return
*/
- public static void addCostTime(IOrderDataFlowContext dataFlow, String linksCode, String linksName, Date startDate){
- if(MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_COST_TIME_ON_OFF))) {
+ public static void addCostTime(IOrderDataFlowContext dataFlow, String linksCode, String linksName, Date startDate) {
+ if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_COST_TIME_ON_OFF))) {
DataFlowLinksCost dataFlowLinksCost = new DataFlowLinksCost().builder(linksCode, linksName, startDate, DateUtil.getCurrentDate());
//dataFlow.addLinksCostDates(dataFlowLinksCost);
}
@@ -73,42 +74,45 @@
/**
* 鑾峰彇灏嗚浣滃簾鐨勮鍗�
+ *
* @param dataFlow
* @return
*/
- public static Map getNeedErrorOrder(IOrderDataFlowContext dataFlow){
+ public static Map getNeedErrorOrder(IOrderDataFlowContext dataFlow) {
Map order = new HashMap();
- order.put("oId",dataFlow.getOrders().getoId());
+ order.put("oId", dataFlow.getOrders().getoId());
//order.put("finishTime",DateUtil.getCurrentDate());
- order.put("statusCd",StatusConstant.STATUS_CD_ERROR);
+ order.put("statusCd", StatusConstant.STATUS_CD_ERROR);
return order;
}
/**
* 鑾峰彇灏嗚浣滃簾鐨勮鍗�
+ *
* @param dataFlow
* @return
*/
- public static Map getNeedErrorOrder(IOrderNotifyDataFlowContext dataFlow){
+ public static Map getNeedErrorOrder(IOrderNotifyDataFlowContext dataFlow) {
Map order = new HashMap();
- order.put("oId",dataFlow.getoId());
+ order.put("oId", dataFlow.getoId());
//order.put("finishTime",DateUtil.getCurrentDate());
- order.put("statusCd",StatusConstant.STATUS_CD_ERROR);
+ order.put("statusCd", StatusConstant.STATUS_CD_ERROR);
return order;
}
/**
* 娣诲姞鑰楁椂
- * @param dataFlow 鏁版嵁娴�
+ *
+ * @param dataFlow 鏁版嵁娴�
* @param linksCode 鐜妭缂栫爜
* @param linksName 鐜妭鍚嶇О
* @param startDate 寮�濮嬫椂闂�
- * @param endDate 缁撴潫鏃堕棿
+ * @param endDate 缁撴潫鏃堕棿
* @return
*/
- public static void addCostTime(IOrderDataFlowContext dataFlow, String linksCode, String linksName, Date startDate, Date endDate){
- if(MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_COST_TIME_ON_OFF))) {
+ public static void addCostTime(IOrderDataFlowContext dataFlow, String linksCode, String linksName, Date startDate, Date endDate) {
+ if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_COST_TIME_ON_OFF))) {
DataFlowLinksCost dataFlowLinksCost = new DataFlowLinksCost().builder(linksCode, linksName, startDate, endDate);
//dataFlow.addLinksCostDates(dataFlowLinksCost);
}
@@ -116,47 +120,48 @@
/**
* 鑾峰彇Order淇℃伅
+ *
* @param orders 璁㈠崟淇℃伅
* @return
*/
- public static Map getOrder(Orders orders){
+ public static Map getOrder(Orders orders) {
Map order = new HashMap();
- orders.setoId(GenerateCodeFactory.getOId());
- order.put("oId",orders.getoId());
- order.put("appId",orders.getAppId());
- order.put("extTransactionId",orders.getExtTransactionId());
- order.put("userId",orders.getUserId());
- order.put("requestTime",orders.getRequestTime());
- order.put("orderTypeCd",orders.getOrderTypeCd());
- order.put("remark",orders.getRemark());
- order.put("statusCd",StatusConstant.STATUS_CD_SAVE);
- return order ;
+ if (StringUtil.isEmpty(orders.getoId()) || orders.getoId().startsWith("-")) {
+ orders.setoId(GenerateCodeFactory.getOId());
+ }
+ order.put("oId", orders.getoId());
+ order.put("appId", orders.getAppId());
+ order.put("extTransactionId", orders.getExtTransactionId());
+ order.put("userId", orders.getUserId());
+ order.put("requestTime", orders.getRequestTime());
+ order.put("orderTypeCd", orders.getOrderTypeCd());
+ order.put("remark", orders.getRemark());
+ order.put("statusCd", StatusConstant.STATUS_CD_SAVE);
+ return order;
}
-
-
-
/**
* 鑾峰彇璁㈠崟椤�
+ *
* @param dataFlow
* @return
*/
- public static List<Map> getBusiness(IOrderDataFlowContext dataFlow){
+ public static List<Map> getBusiness(IOrderDataFlowContext dataFlow) {
List<Map> businesss = new ArrayList<Map>();
Map busiMap = null;
List<com.java110.entity.order.Business> businessList = dataFlow.getBusinessList();
- for(com.java110.entity.order.Business business : businessList) {
- if(business == null){
+ for (com.java110.entity.order.Business business : businessList) {
+ if (business == null) {
continue;
}
business.setbId(GenerateCodeFactory.getBId());
busiMap = new HashMap();
- busiMap.put("oId",dataFlow.getOrders().getoId());
- busiMap.put("businessTypeCd",business.getBusinessTypeCd());
- busiMap.put("remark",business.getRemark());
- busiMap.put("statusCd",StatusConstant.STATUS_CD_SAVE);
- busiMap.put("bId",business.getbId());
+ busiMap.put("oId", dataFlow.getOrders().getoId());
+ busiMap.put("businessTypeCd", business.getBusinessTypeCd());
+ busiMap.put("remark", business.getRemark());
+ busiMap.put("statusCd", StatusConstant.STATUS_CD_SAVE);
+ busiMap.put("bId", business.getbId());
businesss.add(busiMap);
}
return businesss;
@@ -164,17 +169,18 @@
/**
* 缁勮鎾ゅ崟鏁版嵁
+ *
* @param dataFlow
* @param message
* @return
*/
- public static List<Map> getDeleteOrderBusiness(IOrderDataFlowContext dataFlow,String message){
+ public static List<Map> getDeleteOrderBusiness(IOrderDataFlowContext dataFlow, String message) {
List<Map> business = new ArrayList<Map>();
Map busiMap = new HashMap();
- busiMap.put("oId",dataFlow.getOrders().getoId());
- busiMap.put("businessTypeCd",StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
- busiMap.put("remark",message);
- busiMap.put("statusCd",StatusConstant.STATUS_CD_DELETE_ORDER);
+ busiMap.put("oId", dataFlow.getOrders().getoId());
+ busiMap.put("businessTypeCd", StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
+ busiMap.put("remark", message);
+ busiMap.put("statusCd", StatusConstant.STATUS_CD_DELETE_ORDER);
busiMap.put("bId", GenerateCodeFactory.getBId());
business.add(busiMap);
return business;
@@ -183,17 +189,18 @@
/**
* 缁勮鎾ゅ崟鏁版嵁
+ *
* @param dataFlow
* @param message
* @return
*/
- public static List<Map> getDeleteOrderBusiness(IOrderNotifyDataFlowContext dataFlow,String message){
+ public static List<Map> getDeleteOrderBusiness(IOrderNotifyDataFlowContext dataFlow, String message) {
List<Map> business = new ArrayList<Map>();
Map busiMap = new HashMap();
- busiMap.put("oId",dataFlow.getoId());
- busiMap.put("businessTypeCd",StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
- busiMap.put("remark",message);
- busiMap.put("statusCd",StatusConstant.STATUS_CD_DELETE_ORDER);
+ busiMap.put("oId", dataFlow.getoId());
+ busiMap.put("businessTypeCd", StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
+ busiMap.put("remark", message);
+ busiMap.put("statusCd", StatusConstant.STATUS_CD_DELETE_ORDER);
busiMap.put("bId", GenerateCodeFactory.getBId());
business.add(busiMap);
return business;
@@ -202,14 +209,15 @@
/**
* 鑾峰彇璁㈠崟灞炴��
+ *
* @param dataFlow
* @return
*/
- public static List<Map> getBusinessAttrs(IOrderDataFlowContext dataFlow){
+ public static List<Map> getBusinessAttrs(IOrderDataFlowContext dataFlow) {
List<Map> businessAttrs = new ArrayList<Map>();
List<com.java110.entity.order.Business> businesses = dataFlow.getBusinessList();
- for(com.java110.entity.order.Business business :businesses) {
- if (business.getBusinessAttrs() == null || business.getBusinessAttrs().size() ==0) {
+ for (com.java110.entity.order.Business business : businesses) {
+ if (business.getBusinessAttrs() == null || business.getBusinessAttrs().size() == 0) {
continue;
}
List<BusinessAttrs> attrs = business.getBusinessAttrs();
@@ -229,90 +237,94 @@
/**
* 鑾峰彇灏嗚浣滃簾鐨勮鍗�
+ *
* @param dataFlow
* @return
*/
- public static Map getNeedInvalidOrder(IOrderDataFlowContext dataFlow){
+ public static Map getNeedInvalidOrder(IOrderDataFlowContext dataFlow) {
Map order = new HashMap();
- order.put("oId",dataFlow.getOrders().getoId());
+ order.put("oId", dataFlow.getOrders().getoId());
// order.put("finishTime",DateUtil.getCurrentDate());
- order.put("statusCd",StatusConstant.STATUS_CD_DELETE);
+ order.put("statusCd", StatusConstant.STATUS_CD_DELETE);
return order;
}
-
/**
* 鑾峰彇灏嗚浣滃簾鐨勮鍗�
+ *
* @param dataFlow
* @return
*/
- public static Map getNeedInvalidOrder(IOrderNotifyDataFlowContext dataFlow){
+ public static Map getNeedInvalidOrder(IOrderNotifyDataFlowContext dataFlow) {
Map order = new HashMap();
- order.put("oId",dataFlow.getoId());
+ order.put("oId", dataFlow.getoId());
// order.put("finishTime",DateUtil.getCurrentDate());
- order.put("statusCd",StatusConstant.STATUS_CD_DELETE);
+ order.put("statusCd", StatusConstant.STATUS_CD_DELETE);
return order;
}
/**
* Business 杩囩▼瀹屾垚
+ *
* @param dataFlow
* @return
*/
- public static Map getNeedDeleteBusiness(IOrderDataFlowContext dataFlow){
+ public static Map getNeedDeleteBusiness(IOrderDataFlowContext dataFlow, List<com.java110.entity.order.Business> deleteBusinesses) {
Map business = new HashMap();
String bId = "";
- for(com.java110.entity.order.Business busi:dataFlow.getBusinessList()){
- bId += busi.getbId()+",";
+ for (com.java110.entity.order.Business busi : deleteBusinesses) {
+ bId += busi.getbId() + ",";
}
- business.put("bId",bId.substring(0,bId.length()-1));
- business.put("finishTime",DateUtil.getCurrentDate());
- business.put("statusCd",StatusConstant.STATUS_CD_DELETE_ORDER);
+ business.put("bId", bId.substring(0, bId.length() - 1));
+ business.put("finishTime", DateUtil.getCurrentDate());
+ business.put("statusCd", StatusConstant.STATUS_CD_DELETE_ORDER);
return business;
}
/**
* Business 杩囩▼瀹屾垚
+ *
* @param dataFlow
* @return
*/
- public static Map getNeedDeleteBusiness(IOrderNotifyDataFlowContext dataFlow){
+ public static Map getNeedDeleteBusiness(IOrderNotifyDataFlowContext dataFlow) {
Map business = new HashMap();
String bId = "";
- business.put("bId",dataFlow.getbId());
- business.put("finishTime",DateUtil.getCurrentDate());
- business.put("statusCd",StatusConstant.STATUS_CD_DELETE_ORDER);
+ business.put("bId", dataFlow.getbId());
+ business.put("finishTime", DateUtil.getCurrentDate());
+ business.put("statusCd", StatusConstant.STATUS_CD_DELETE_ORDER);
return business;
}
- public static Map getNeedNotifyErrorBusiness(DataFlow dataFlow){
+ public static Map getNeedNotifyErrorBusiness(DataFlow dataFlow) {
Map business = new HashMap();
String bId = getMoreBId(dataFlow);
- business.put("bId",bId.substring(0,bId.length()-1));
- business.put("finishTime",DateUtil.getCurrentDate());
- business.put("statusCd",StatusConstant.STATUS_CD_NOTIFY_ERROR);
+ business.put("bId", bId.substring(0, bId.length() - 1));
+ business.put("finishTime", DateUtil.getCurrentDate());
+ business.put("statusCd", StatusConstant.STATUS_CD_NOTIFY_ERROR);
return business;
}
- public static Map getNeedNotifyErrorBusiness(IOrderNotifyDataFlowContext dataFlow){
+ public static Map getNeedNotifyErrorBusiness(IOrderNotifyDataFlowContext dataFlow) {
Map business = new HashMap();
- business.put("bId",dataFlow.getbId());
- business.put("finishTime",DateUtil.getCurrentDate());
- business.put("statusCd",StatusConstant.STATUS_CD_NOTIFY_ERROR);
+ business.put("bId", dataFlow.getbId());
+ business.put("finishTime", DateUtil.getCurrentDate());
+ business.put("statusCd", StatusConstant.STATUS_CD_NOTIFY_ERROR);
return business;
}
/**
* 鑾峰彇DataFlow 瀵硅薄涓殑鎵�鏈塨Id
+ *
* @param dataFlow
* @return
*/
- public static String getMoreBId(DataFlow dataFlow){
+ public static String getMoreBId(DataFlow dataFlow) {
String bId = "";
- for(Business busi:dataFlow.getBusinesses()){
- bId += busi.getbId()+",";
+ for (Business busi : dataFlow.getBusinesses()) {
+ bId += busi.getbId() + ",";
}
return bId;
}
@@ -320,36 +332,38 @@
/**
* 鑾峰彇灏嗚瀹屾垚鐨勮鍗�
+ *
* @param dataFlow
* @return
*/
- public static Map getNeedCompleteOrder(DataFlow dataFlow){
+ public static Map getNeedCompleteOrder(DataFlow dataFlow) {
Map order = new HashMap();
- order.put("oId",dataFlow.getoId());
- order.put("finishTime",DateUtil.getCurrentDate());
- order.put("statusCd",StatusConstant.STATUS_CD_COMPLETE);
+ order.put("oId", dataFlow.getoId());
+ order.put("finishTime", DateUtil.getCurrentDate());
+ order.put("statusCd", StatusConstant.STATUS_CD_COMPLETE);
return order;
}
/**
* 鑾峰彇绔ｅ伐娑堟伅鐨勬姤鏂囷紙璁㈠崟瀹屾垚鍚庨�氱煡涓氬姟绯荤粺锛�
+ *
* @param dataFlow
* @return
*/
- public static JSONObject getNotifyBusinessSuccessJson(DataFlow dataFlow){
- JSONObject notifyMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.NOTIFY_BUSINESS_TYPE);
+ public static JSONObject getNotifyBusinessSuccessJson(DataFlow dataFlow) {
+ JSONObject notifyMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.NOTIFY_BUSINESS_TYPE);
JSONArray businesses = notifyMessage.getJSONArray("business");
JSONObject busi = null;
JSONObject response = null;
- for(Business business :dataFlow.getBusinesses()){
+ for (Business business : dataFlow.getBusinesses()) {
busi = new JSONObject();
- busi.put("bId",business.getbId());
- busi.put("serviceCode",business.getServiceCode());
+ busi.put("bId", business.getbId());
+ busi.put("serviceCode", business.getServiceCode());
response = new JSONObject();
- response.put("code",ResponseConstant.RESULT_CODE_SUCCESS);
- response.put("message","鎴愬姛");
- busi.put("response",response);
+ response.put("code", ResponseConstant.RESULT_CODE_SUCCESS);
+ response.put("message", "鎴愬姛");
+ busi.put("response", response);
businesses.add(busi);
}
return notifyMessage;
@@ -357,49 +371,50 @@
/**
* 鑾峰彇绔ｅ伐娑堟伅鐨勬姤鏂囷紙璁㈠崟瀹屾垚鍚庨�氱煡涓氬姟绯荤粺锛�
+ *
* @param dataFlow
* @return
*/
- public static JSONObject getNotifyBusinessSuccessJson(IOrderNotifyDataFlowContext dataFlow){
- JSONObject notifyMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.NOTIFY_BUSINESS_TYPE);
+ public static JSONObject getNotifyBusinessSuccessJson(IOrderNotifyDataFlowContext dataFlow) {
+ JSONObject notifyMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.NOTIFY_BUSINESS_TYPE);
JSONArray businesses = notifyMessage.getJSONArray("business");
JSONObject busi = null;
JSONObject response = null;
- busi = new JSONObject();
- busi.put("bId",dataFlow.getbId());
- busi.put("businessTypeCd",dataFlow.getBusinessTypeCd());
- response = new JSONObject();
- response.put("code",ResponseConstant.RESULT_CODE_SUCCESS);
- response.put("message","鎴愬姛");
- busi.put("response",response);
- businesses.add(busi);
+ busi = new JSONObject();
+ busi.put("bId", dataFlow.getbId());
+ busi.put("businessTypeCd", dataFlow.getBusinessTypeCd());
+ response = new JSONObject();
+ response.put("code", ResponseConstant.RESULT_CODE_SUCCESS);
+ response.put("message", "鎴愬姛");
+ busi.put("response", response);
+ businesses.add(busi);
return notifyMessage;
}
/**
* 鑾峰彇璁㈠崟灞炴��
+ *
* @param orders
* @return
*/
- public static List<Map> getOrderAttrs(Orders orders){
+ public static List<Map> getOrderAttrs(Orders orders) {
List<Map> orderAttrs = new ArrayList<Map>();
List<OrdersAttrs> attrs = orders.getOrdersAttrs();
- if(attrs == null || attrs.size() == 0){
+ if (attrs == null || attrs.size() == 0) {
return orderAttrs;
}
Map attrMap = null;
- for(OrdersAttrs ordersAttr:attrs)
- {
+ for (OrdersAttrs ordersAttr : attrs) {
ordersAttr.setAttrId(GenerateCodeFactory.getAttrId());
attrMap = new HashMap();
- attrMap.put("oId",orders.getoId());
+ attrMap.put("oId", orders.getoId());
attrMap.put("attrId", ordersAttr.getAttrId());
- attrMap.put("specCd",ordersAttr.getSpecCd());
- attrMap.put("value",ordersAttr.getValue());
+ attrMap.put("specCd", ordersAttr.getSpecCd());
+ attrMap.put("value", ordersAttr.getValue());
orderAttrs.add(attrMap);
}
return orderAttrs;
@@ -407,24 +422,25 @@
/**
* 鑾峰彇澶辫触娑堟伅鐨勬姤鏂囷紙璁㈠崟澶辫触鍚庨�氱煡涓氬姟绯荤粺锛�
+ *
* @param dataFlow
* @return
*/
- public static JSONObject getNotifyBusinessErrorJson(DataFlow dataFlow){
+ public static JSONObject getNotifyBusinessErrorJson(DataFlow dataFlow) {
- JSONObject notifyMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.NOTIFY_BUSINESS_TYPE);
+ JSONObject notifyMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.NOTIFY_BUSINESS_TYPE);
JSONArray businesses = notifyMessage.getJSONArray("business");
JSONObject busi = null;
JSONObject response = null;
- for(Business business :dataFlow.getBusinesses()){
+ for (Business business : dataFlow.getBusinesses()) {
busi = new JSONObject();
- busi.put("bId",business.getbId());
- busi.put("serviceCode",business.getServiceCode());
+ busi.put("bId", business.getbId());
+ busi.put("serviceCode", business.getServiceCode());
response = new JSONObject();
- response.put("code",ResponseConstant.RESULT_CODE_INNER_ERROR);
- response.put("message","澶辫触");
- busi.put("response",response);
+ response.put("code", ResponseConstant.RESULT_CODE_INNER_ERROR);
+ response.put("message", "澶辫触");
+ busi.put("response", response);
businesses.add(busi);
}
return notifyMessage;
@@ -432,279 +448,289 @@
/**
* 鑾峰彇澶辫触娑堟伅鐨勬姤鏂囷紙璁㈠崟澶辫触鍚庨�氱煡涓氬姟绯荤粺锛�
+ *
* @param dataFlow
* @return
*/
- public static JSONObject getNotifyBusinessErrorJson(IOrderNotifyDataFlowContext dataFlow){
+ public static JSONObject getNotifyBusinessErrorJson(IOrderNotifyDataFlowContext dataFlow) {
- JSONObject notifyMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.NOTIFY_BUSINESS_TYPE);
- JSONArray businesses = notifyMessage.getJSONArray("business");
-
- JSONObject busi = null;
- JSONObject response = null;
- busi = new JSONObject();
- busi.put("bId",dataFlow.getbId());
- busi.put("businessTypeCd",dataFlow.getBusinessTypeCd());
- response = new JSONObject();
- response.put("code",ResponseConstant.RESULT_CODE_INNER_ERROR);
- response.put("message","澶辫触");
- busi.put("response",response);
- businesses.add(busi);
- return notifyMessage;
- }
-
- public static JSONObject getCompletedBusinessErrorJson(DataFlow dataFlow,Map business,AppService appService){
- JSONObject notifyMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.NOTIFY_BUSINESS_TYPE);
+ JSONObject notifyMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.NOTIFY_BUSINESS_TYPE);
JSONArray businesses = notifyMessage.getJSONArray("business");
JSONObject busi = null;
JSONObject response = null;
busi = new JSONObject();
- busi.put("bId",business.get("b_id"));
- busi.put("serviceCode",appService.getServiceCode());
+ busi.put("bId", dataFlow.getbId());
+ busi.put("businessTypeCd", dataFlow.getBusinessTypeCd());
response = new JSONObject();
- response.put("code",ResponseConstant.RESULT_CODE_INNER_ERROR);
- response.put("message","澶辫触");
- busi.put("response",response);
+ response.put("code", ResponseConstant.RESULT_CODE_INNER_ERROR);
+ response.put("message", "澶辫触");
+ busi.put("response", response);
+ businesses.add(busi);
+ return notifyMessage;
+ }
+
+ public static JSONObject getCompletedBusinessErrorJson(DataFlow dataFlow, Map business, AppService appService) {
+ JSONObject notifyMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.NOTIFY_BUSINESS_TYPE);
+ JSONArray businesses = notifyMessage.getJSONArray("business");
+
+ JSONObject busi = null;
+ JSONObject response = null;
+ busi = new JSONObject();
+ busi.put("bId", business.get("b_id"));
+ busi.put("serviceCode", appService.getServiceCode());
+ response = new JSONObject();
+ response.put("code", ResponseConstant.RESULT_CODE_INNER_ERROR);
+ response.put("message", "澶辫触");
+ busi.put("response", response);
businesses.add(busi);
return notifyMessage;
}
-
/**
* 鑾峰彇澶辫触娑堟伅鐨勬姤鏂囷紙璁㈠崟澶辫触鍚庨�氱煡涓氬姟绯荤粺锛�
+ *
* @param business
* @return
*/
- public static JSONObject getBusinessTableDataInfoToInstanceTableJson(DataFlow dataFlow,Business business){
+ public static JSONObject getBusinessTableDataInfoToInstanceTableJson(DataFlow dataFlow, Business business) {
- JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.REQUEST_BUSINESS_TYPE_INSTANCE);
- JSONObject busi = null;
- busi = new JSONObject();
- busi.put("bId",business.getbId());
- busi.put("serviceCode",business.getServiceCode());
- busi.put("serviceName",business.getServiceName());
- //busi.put("isInstance",CommonConstant.INSTANCE_Y);
- //busi.put("datas",business.getDatas());
- requestMessage.put("business",busi);
- return requestMessage;
- }
-
- /**
- * 鑾峰彇澶辫触娑堟伅鐨勬姤鏂囷紙璁㈠崟澶辫触鍚庨�氱煡涓氬姟绯荤粺锛�
- * @param business
- * @return
- */
- public static JSONObject getBusinessTableDataInfoToInstanceTableJson(IOrderDataFlowContext dataFlow,com.java110.entity.order.Business business){
-
- JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.REQUEST_BUSINESS_TYPE_INSTANCE);
+ JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.REQUEST_BUSINESS_TYPE_INSTANCE);
JSONObject busi = null;
busi = new JSONObject();
- busi.put("bId",business.getbId());
- busi.put("businessTypeCd",business.getBusinessTypeCd());
- requestMessage.put("business",busi);
+ busi.put("bId", business.getbId());
+ busi.put("serviceCode", business.getServiceCode());
+ busi.put("serviceName", business.getServiceName());
+ //busi.put("isInstance",CommonConstant.INSTANCE_Y);
+ //busi.put("datas",business.getDatas());
+ requestMessage.put("business", busi);
return requestMessage;
}
/**
* 鑾峰彇澶辫触娑堟伅鐨勬姤鏂囷紙璁㈠崟澶辫触鍚庨�氱煡涓氬姟绯荤粺锛�
+ *
+ * @param business
+ * @return
+ */
+ public static JSONObject getBusinessTableDataInfoToInstanceTableJson(IOrderDataFlowContext dataFlow, com.java110.entity.order.Business business) {
+
+ JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.REQUEST_BUSINESS_TYPE_INSTANCE);
+ JSONObject busi = null;
+ busi = new JSONObject();
+ busi.put("bId", business.getbId());
+ busi.put("businessTypeCd", business.getBusinessTypeCd());
+ requestMessage.put("business", busi);
+ return requestMessage;
+ }
+
+ /**
+ * 鑾峰彇澶辫触娑堟伅鐨勬姤鏂囷紙璁㈠崟澶辫触鍚庨�氱煡涓氬姟绯荤粺锛�
+ *
* @param dataFlow
* @return
*/
- public static JSONObject getBusinessTableDataInfoToInstanceTableJson(IOrderNotifyDataFlowContext dataFlow){
+ public static JSONObject getBusinessTableDataInfoToInstanceTableJson(IOrderNotifyDataFlowContext dataFlow) {
- JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.REQUEST_BUSINESS_TYPE_INSTANCE);
+ JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.REQUEST_BUSINESS_TYPE_INSTANCE);
JSONObject busi = null;
busi = new JSONObject();
- busi.put("bId",dataFlow.getbId());
- busi.put("businessTypeCd",dataFlow.getBusinessTypeCd());
- requestMessage.put("business",busi);
+ busi.put("bId", dataFlow.getbId());
+ busi.put("businessTypeCd", dataFlow.getBusinessTypeCd());
+ requestMessage.put("business", busi);
return requestMessage;
}
/**
* 鍙戣捣鎾ゅ崟璇锋眰鎶ユ枃
+ *
* @param business
* @return
*/
- public static JSONObject getDeleteInstanceTableJson(DataFlow dataFlow,Business business){
+ public static JSONObject getDeleteInstanceTableJson(DataFlow dataFlow, Business business) {
- JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
+ JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
JSONObject busi = null;
busi = new JSONObject();
- busi.put("bId",business.getbId());
- busi.put("serviceCode",business.getServiceCode());
- busi.put("serviceName",business.getServiceName());
+ busi.put("bId", business.getbId());
+ busi.put("serviceCode", business.getServiceCode());
+ busi.put("serviceName", business.getServiceName());
//busi.put("datas",business.getDatas());
- requestMessage.put("business",busi);
+ requestMessage.put("business", busi);
return requestMessage;
}
/**
* 鍙戣捣鎾ゅ崟璇锋眰鎶ユ枃
+ *
* @param business
* @return
*/
- public static JSONObject getDeleteInstanceTableJson(IOrderDataFlowContext dataFlow,com.java110.entity.order.Business business){
+ public static JSONObject getDeleteInstanceTableJson(IOrderDataFlowContext dataFlow, com.java110.entity.order.Business business) {
- JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
+ JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
JSONObject busi = null;
busi = new JSONObject();
- busi.put("bId",business.getbId());
- busi.put("businessTypeCd",business.getBusinessTypeCd());
+ busi.put("bId", business.getbId());
+ busi.put("businessTypeCd", business.getBusinessTypeCd());
//busi.put("datas",business.getDatas());
- requestMessage.put("business",busi);
+ requestMessage.put("business", busi);
return requestMessage;
}
- public static JSONObject getDeleteInstanceTableJson(DataFlow dataFlow,Map business,AppService appService){
- JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
+ public static JSONObject getDeleteInstanceTableJson(DataFlow dataFlow, Map business, AppService appService) {
+ JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
JSONObject busi = null;
busi = new JSONObject();
- busi.put("bId",business.get("b_id"));
- busi.put("serviceCode",appService.getServiceCode());
+ busi.put("bId", business.get("b_id"));
+ busi.put("serviceCode", appService.getServiceCode());
//busi.put("datas",business.getDatas());
- requestMessage.put("business",busi);
+ requestMessage.put("business", busi);
return requestMessage;
}
- public static JSONObject getDeleteInstanceTableJson(IOrderNotifyDataFlowContext dataFlow, Map business ){
- JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
+ public static JSONObject getDeleteInstanceTableJson(IOrderNotifyDataFlowContext dataFlow, Map business) {
+ JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
JSONObject busi = null;
busi = new JSONObject();
- busi.put("bId",business.get("b_id"));
- busi.put("businessTypeCd",business.get("business_type_cd").toString());
+ busi.put("bId", business.get("b_id"));
+ busi.put("businessTypeCd", business.get("business_type_cd").toString());
//busi.put("datas",business.getDatas());
- requestMessage.put("business",busi);
+ requestMessage.put("business", busi);
return requestMessage;
}
/**
* 鑾峰彇澶辫触娑堟伅鐨勬姤鏂囷紙璁㈠崟澶辫触鍚庨�氱煡涓氬姟绯荤粺锛�
+ *
* @param business
* @return
*/
- public static JSONObject getCompleteInstanceDataJson(DataFlow dataFlow,Business business){
+ public static JSONObject getCompleteInstanceDataJson(DataFlow dataFlow, Business business) {
- JSONObject notifyMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.REQUEST_BUSINESS_TYPE);
+ JSONObject notifyMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.REQUEST_BUSINESS_TYPE);
//JSONObject businesses = notifyMessage.getJSONObject("business");
JSONObject busi = null;
busi = new JSONObject();
- busi.put("bId",business.getbId());
- busi.put("serviceCode",business.getServiceCode());
- busi.put("serviceName",business.getServiceName());
- busi.put("isInstance",CommonConstant.INSTANCE_Y);
- notifyMessage.put("business",busi);
+ busi.put("bId", business.getbId());
+ busi.put("serviceCode", business.getServiceCode());
+ busi.put("serviceName", business.getServiceName());
+ busi.put("isInstance", CommonConstant.INSTANCE_Y);
+ notifyMessage.put("business", busi);
return notifyMessage;
}
/**
* 鑾峰彇澶辫触娑堟伅鐨勬姤鏂囷紙璁㈠崟澶辫触鍚庨�氱煡涓氬姟绯荤粺锛�
+ *
* @param business
* @return
*/
- public static JSONObject getRequestBusinessJson(DataFlow dataFlow,Business business){
+ public static JSONObject getRequestBusinessJson(DataFlow dataFlow, Business business) {
- JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.REQUEST_BUSINESS_TYPE_BUSINESS);
+ JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.REQUEST_BUSINESS_TYPE_BUSINESS);
//JSONObject businesses = notifyMessage.getJSONObject("business");
JSONObject busi = null;
busi = new JSONObject();
- busi.put("bId",business.getbId());
- busi.put("serviceCode",business.getServiceCode());
- busi.put("serviceName",business.getServiceName());
- busi.put("remark",business.getRemark());
- busi.put("datas",business.getDatas());
- requestMessage.put("business",busi);
+ busi.put("bId", business.getbId());
+ busi.put("serviceCode", business.getServiceCode());
+ busi.put("serviceName", business.getServiceName());
+ busi.put("remark", business.getRemark());
+ busi.put("datas", business.getDatas());
+ requestMessage.put("business", busi);
return requestMessage;
}
/**
* 鑾峰彇澶辫触娑堟伅鐨勬姤鏂囷紙璁㈠崟澶辫触鍚庨�氱煡涓氬姟绯荤粺锛�
+ *
* @param business
* @return
*/
- public static JSONObject getRequestBusinessJson(IOrderDataFlowContext dataFlow,com.java110.entity.order.Business business){
+ public static JSONObject getRequestBusinessJson(IOrderDataFlowContext dataFlow, com.java110.entity.order.Business business) {
- JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.REQUEST_BUSINESS_TYPE_BUSINESS);
+ JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow, StatusConstant.REQUEST_BUSINESS_TYPE_BUSINESS);
//JSONObject businesses = notifyMessage.getJSONObject("business");
JSONObject busi = null;
busi = new JSONObject();
- busi.put("bId",business.getbId());
- busi.put("businessTypeCd",business.getBusinessTypeCd());
- busi.put("remark",business.getRemark());
- busi.put("datas",business.getData());
- requestMessage.put("business",busi);
+ busi.put("bId", business.getbId());
+ busi.put("businessTypeCd", business.getBusinessTypeCd());
+ busi.put("remark", business.getRemark());
+ busi.put("datas", business.getData());
+ requestMessage.put("business", busi);
return requestMessage;
}
/**
* 涓氬姟绯荤粺浜や簰
+ *
* @return
*/
- private static JSONObject getTransactionBusinessBaseJson(DataFlow dataFlow,String businessType){
+ private static JSONObject getTransactionBusinessBaseJson(DataFlow dataFlow, String businessType) {
JSONObject notifyMessage = JSONObject.parseObject("{\"orders\":{},\"business\":{}}");
JSONObject orders = notifyMessage.getJSONObject("orders");
- orders.put("transactionId", UUID.randomUUID().toString().replace("-",""));
- orders.put("dataFlowId",dataFlow.getDataFlowId());
- orders.put("orderTypeCd",dataFlow.getOrderTypeCd());
- orders.put("requestTime",DateUtil.getyyyyMMddhhmmssDateString());
- orders.put("businessType",businessType);
+ orders.put("transactionId", UUID.randomUUID().toString().replace("-", ""));
+ orders.put("dataFlowId", dataFlow.getDataFlowId());
+ orders.put("orderTypeCd", dataFlow.getOrderTypeCd());
+ orders.put("requestTime", DateUtil.getyyyyMMddhhmmssDateString());
+ orders.put("businessType", businessType);
return notifyMessage;
}
/**
* 涓氬姟绯荤粺浜や簰
+ *
* @return
*/
- private static JSONObject getTransactionBusinessBaseJson(IOrderDataFlowContext dataFlow,String businessType){
+ private static JSONObject getTransactionBusinessBaseJson(IOrderDataFlowContext dataFlow, String businessType) {
JSONObject notifyMessage = JSONObject.parseObject("{\"orders\":{},\"business\":{}}");
JSONObject orders = notifyMessage.getJSONObject("orders");
- orders.put("transactionId", UUID.randomUUID().toString().replace("-",""));
- orders.put("dataFlowId",dataFlow.getDataFlowId());
- orders.put("orderTypeCd",dataFlow.getOrders().getOrderTypeCd());
- orders.put("requestTime",DateUtil.getyyyyMMddhhmmssDateString());
- orders.put("businessType",businessType);
+ orders.put("transactionId", UUID.randomUUID().toString().replace("-", ""));
+ orders.put("dataFlowId", dataFlow.getDataFlowId());
+ orders.put("orderTypeCd", dataFlow.getOrders().getOrderTypeCd());
+ orders.put("requestTime", DateUtil.getyyyyMMddhhmmssDateString());
+ orders.put("businessType", businessType);
return notifyMessage;
}
/**
* 涓氬姟绯荤粺浜や簰
+ *
* @return
*/
- private static JSONObject getTransactionBusinessBaseJson(IOrderNotifyDataFlowContext dataFlow,String businessType){
+ private static JSONObject getTransactionBusinessBaseJson(IOrderNotifyDataFlowContext dataFlow, String businessType) {
JSONObject notifyMessage = JSONObject.parseObject("{\"orders\":{},\"business\":{}}");
JSONObject orders = notifyMessage.getJSONObject("orders");
- orders.put("transactionId", UUID.randomUUID().toString().replace("-",""));
- orders.put("dataFlowId",dataFlow.getDataFlowId());
- orders.put("orderTypeCd",dataFlow.getOrderTypeCd());
- orders.put("requestTime",DateUtil.getyyyyMMddhhmmssDateString());
- orders.put("businessType",businessType);
+ orders.put("transactionId", UUID.randomUUID().toString().replace("-", ""));
+ orders.put("dataFlowId", dataFlow.getDataFlowId());
+ orders.put("orderTypeCd", dataFlow.getOrderTypeCd());
+ orders.put("requestTime", DateUtil.getyyyyMMddhhmmssDateString());
+ orders.put("businessType", businessType);
return notifyMessage;
}
-
-
/**
* 鑾峰彇鍚屾澶勭悊涓氬姟
+ *
* @param dataFlow
* @return
*/
- public static List<com.java110.entity.order.Business> getSynchronousBusinesses(IOrderDataFlowContext dataFlow){
+ public static List<com.java110.entity.order.Business> getSynchronousBusinesses(IOrderDataFlowContext dataFlow) {
List<com.java110.entity.order.Business> syschronousBusinesses = new ArrayList<com.java110.entity.order.Business>();
- for(com.java110.entity.order.Business business :dataFlow.getBusinessList()){
+ for (com.java110.entity.order.Business business : dataFlow.getBusinessList()) {
- if(CommonConstant.ORDER_INVOKE_METHOD_SYNCHRONOUS.equals(business.getInvokeModel()) || StringUtil.isEmpty(business.getInvokeModel())){
+ if (CommonConstant.ORDER_INVOKE_METHOD_SYNCHRONOUS.equals(business.getInvokeModel()) || StringUtil.isEmpty(business.getInvokeModel())) {
syschronousBusinesses.add(business);
}
}
- if(syschronousBusinesses.size() > 0) {
+ if (syschronousBusinesses.size() > 0) {
Collections.sort(syschronousBusinesses);
}
@@ -714,14 +740,15 @@
/**
* 鑾峰彇寮傛澶勭悊涓氬姟
+ *
* @param dataFlow
* @return
*/
- public static List<com.java110.entity.order.Business> getAsynchronousBusinesses(IOrderDataFlowContext dataFlow){
+ public static List<com.java110.entity.order.Business> getAsynchronousBusinesses(IOrderDataFlowContext dataFlow) {
List<com.java110.entity.order.Business> asynchronousBusinesses = new ArrayList<com.java110.entity.order.Business>();
- for(com.java110.entity.order.Business business :dataFlow.getBusinessList()){
- if(CommonConstant.ORDER_INVOKE_METHOD_ASYNCHRONOUS.equals(business.getInvokeModel())){
+ for (com.java110.entity.order.Business business : dataFlow.getBusinessList()) {
+ if (CommonConstant.ORDER_INVOKE_METHOD_ASYNCHRONOUS.equals(business.getInvokeModel())) {
asynchronousBusinesses.add(business);
}
@@ -733,39 +760,40 @@
/**
* hashmap 杞琈ultiValueMap
+ *
* @param httpHeaders
* @return
*/
- public static MultiValueMap<String, String> hashMap2MultiValueMap(Map<String,String> httpHeaders){
+ public static MultiValueMap<String, String> hashMap2MultiValueMap(Map<String, String> httpHeaders) {
MultiValueMap<String, String> multiValueMap = new HttpHeaders();
- for(String key:httpHeaders.keySet()) {
- multiValueMap.add(key,httpHeaders.get(key));
+ for (String key : httpHeaders.keySet()) {
+ multiValueMap.add(key, httpHeaders.get(key));
}
return multiValueMap;
}
-
- public static Map getNeedCompleteBusiness(IOrderNotifyDataFlowContext dataFlow){
+ public static Map getNeedCompleteBusiness(IOrderNotifyDataFlowContext dataFlow) {
Map business = new HashMap();
- business.put("bId",dataFlow.getbId());
- business.put("finishTime",DateUtil.getCurrentDate());
- business.put("statusCd",StatusConstant.STATUS_CD_COMPLETE);
+ business.put("bId", dataFlow.getbId());
+ business.put("finishTime", DateUtil.getCurrentDate());
+ business.put("statusCd", StatusConstant.STATUS_CD_COMPLETE);
return business;
}
/**
* Business 杩囩▼瀹屾垚
+ *
* @param dataFlow
* @return
*/
- public static Map getNeedBusinessComplete(IOrderNotifyDataFlowContext dataFlow){
+ public static Map getNeedBusinessComplete(IOrderNotifyDataFlowContext dataFlow) {
Map business = new HashMap();
- business.put("bId",dataFlow.getbId());
- business.put("finishTime",DateUtil.getCurrentDate());
- business.put("statusCd",StatusConstant.STATUS_CD_BUSINESS_COMPLETE);
+ business.put("bId", dataFlow.getbId());
+ business.put("finishTime", DateUtil.getCurrentDate());
+ business.put("statusCd", StatusConstant.STATUS_CD_BUSINESS_COMPLETE);
return business;
}
--
Gitblit v1.8.0