From 7afa32638bd4c1eec05a19a6586af3f4b1ce8ccb Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期六, 16 六月 2018 01:25:43 +0800
Subject: [PATCH] 日志服务实现

---
 java110-core/src/main/java/com/java110/core/factory/DataFlowFactory.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/factory/DataFlowFactory.java b/java110-core/src/main/java/com/java110/core/factory/DataFlowFactory.java
index 2c33d0a..b125632 100644
--- a/java110-core/src/main/java/com/java110/core/factory/DataFlowFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/DataFlowFactory.java
@@ -9,7 +9,6 @@
 import com.java110.common.constant.StatusConstant;
 import com.java110.common.util.Assert;
 import com.java110.common.util.DateUtil;
-import com.java110.common.util.SequenceUtil;
 import com.java110.core.context.AbstractDataFlowContext;
 import com.java110.core.context.DataFlow;
 import com.java110.entity.center.AppRoute;
@@ -123,7 +122,7 @@
      */
     public static Map getOrder(DataFlow dataFlow){
         Map order = new HashMap();
-        dataFlow.setoId(SequenceUtil.getOId());
+        dataFlow.setoId(GenerateCodeFactory.getOId());
         order.put("oId",dataFlow.getoId());
         order.put("appId",dataFlow.getAppId());
         order.put("extTransactionId",dataFlow.getTransactionId());
@@ -153,7 +152,7 @@
         {
             attrMap = new HashMap();
             attrMap.put("oId",dataFlow.getoId());
-            attrMap.put("attrId",SequenceUtil.getAttrId());
+            attrMap.put("attrId", GenerateCodeFactory.getAttrId());
             attrMap.put("specCd",attrs.getJSONObject(attrIndex).getString("specCd"));
             attrMap.put("value",attrs.getJSONObject(attrIndex).getString("value"));
             orderAttrs.add(attrMap);
@@ -174,7 +173,7 @@
             if(business == null){
                 continue;
             }
-            business.setbId(SequenceUtil.getBId());
+            business.setbId(GenerateCodeFactory.getBId());
             busiMap = new HashMap();
             busiMap.put("oId",dataFlow.getoId());
             busiMap.put("businessTypeCd",getService(dataFlow,business.getServiceCode()).getBusinessTypeCd());
@@ -199,7 +198,7 @@
         busiMap.put("businessTypeCd",StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
         busiMap.put("remark",message);
         busiMap.put("statusCd",StatusConstant.STATUS_CD_DELETE_ORDER);
-        busiMap.put("bId",SequenceUtil.getBId());
+        busiMap.put("bId", GenerateCodeFactory.getBId());
         business.add(busiMap);
         return business;
     }
@@ -221,7 +220,7 @@
             for (int attrIndex = 0; attrIndex < attrs.size(); attrIndex++) {
                 attrMap = new HashMap();
                 attrMap.put("bId", business.getbId());
-                attrMap.put("attrId", SequenceUtil.getAttrId());
+                attrMap.put("attrId", GenerateCodeFactory.getAttrId());
                 attrMap.put("specCd", attrs.getJSONObject(attrIndex).getString("specCd"));
                 attrMap.put("value", attrs.getJSONObject(attrIndex).getString("value"));
                 businessAttrs.add(attrMap);
@@ -504,7 +503,7 @@
     private static JSONObject getTransactionBusinessBaseJson(DataFlow dataFlow,String businessType){
         JSONObject notifyMessage = JSONObject.parseObject("{\"orders\":{},\"business\":{}}");
         JSONObject orders = notifyMessage.getJSONObject("orders");
-        orders.put("transactionId",SequenceUtil.getTransactionId());
+        orders.put("transactionId", GenerateCodeFactory.getTransactionId());
         orders.put("dataFlowId",dataFlow.getDataFlowId());
         orders.put("orderTypeCd",dataFlow.getOrderTypeCd());
         orders.put("requestTime",DateUtil.getyyyyMMddhhmmssDateString());

--
Gitblit v1.8.0