优化输出格式调整

java110-bean/src/main/java/com/java110/result/ResultVo.java

@@ -22,6 +22,8 @@ public class ResultVo implements Serializable {
 
     public static final int CODE_UNAUTHORIZED = 401; //认证失败
 
+    public static final int ORDER_ERROR = 500; //订单调度异常
+
 
     public static final String MSG_ERROR = "未知异常";// 未知异常
 

java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -129,6 +129,8 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_weChatId = "71";
 
 
+
+
     /**
      * 只有在不调用服务生成ID时有用
      */

service-api/src/main/java/com/java110/api/bmo/task/impl/TaskBMOImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.task.ITaskBMO;
 import com.java110.core.context.DataFlowContext;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.smo.task.ITaskInnerServiceSMO;
 import com.java110.dto.task.TaskDto;
 import com.java110.po.task.TaskPo;
@@ -34,7 +35,7 @@ public class TaskBMOImpl extends ApiBaseBMO implements ITaskBMO {
 
         // paramInJson.put("taskId", "-1");
         TaskPo taskPo = BeanConvertUtil.covertBean(paramInJson, TaskPo.class);
-        taskPo.setTaskId("-1");
+        taskPo.setTaskId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
         taskPo.setState("001");
         super.insert(dataFlowContext, taskPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_TASK);
 

service-api/src/main/java/com/java110/api/listener/AbstractServiceApiPlusListener.java

@@ -4,9 +4,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.result.ResultVo;
 import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.exception.ListenerExecuteException;
 import com.java110.utils.util.BeanConvertUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestTemplate;
@@ -84,7 +84,22 @@ public abstract class AbstractServiceApiPlusListener extends AbstractServiceApiD
 
         ResponseEntity<String> responseEntity = this.callOrderService(dataFlowContext, paramIn);
 
+        //组装符合要求报文
+        ResultVo resultVo = null;
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            resultVo = new ResultVo(ResultVo.ORDER_ERROR, responseEntity.getBody());
+        } else {
+            String orderResult = responseEntity.getBody();
+            if (orderResult.startsWith("{")) {
+                resultVo = new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK, JSONObject.parse(orderResult));
+            } else {
+                resultVo = new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK, JSONArray.parse(orderResult));
+            }
+        }
+
         if (dataFlowContext.getResponseEntity() == null) {
+            responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
             dataFlowContext.setResponseEntity(responseEntity);
         }