From 5198016b208c814a7aff443a35cfb556c0e7db62 Mon Sep 17 00:00:00 2001 From: Sumate Kongpui Date: Tue, 21 Aug 2018 13:08:49 +0700 Subject: [PATCH] update build message --- ais-structure/src/modules/customer/postCustomer.ctrl.js | 3 ++- ais-structure/src/modules/helper/connection.js | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------- ais-structure/src/modules/helper/responseMsg.js | 2 +- 3 files changed, 140 insertions(+), 43 deletions(-) diff --git a/ais-structure/src/modules/customer/postCustomer.ctrl.js b/ais-structure/src/modules/customer/postCustomer.ctrl.js index 79d129b..2264b21 100644 --- a/ais-structure/src/modules/customer/postCustomer.ctrl.js +++ b/ais-structure/src/modules/customer/postCustomer.ctrl.js @@ -36,7 +36,8 @@ exports.postCustomer = async function (req, res, next){ if(resultObj.resultCode.startsWith("40")) { if(resultObj.resultCode != "40401") - resultObj.resultCode = "50000"; + resultObj.resultCode = "50000"; + } diff --git a/ais-structure/src/modules/helper/connection.js b/ais-structure/src/modules/helper/connection.js index a4a10e1..9d06067 100644 --- a/ais-structure/src/modules/helper/connection.js +++ b/ais-structure/src/modules/helper/connection.js @@ -7,21 +7,22 @@ var messageSOAP = require('../helper/messageSOAP.js'); var connection = []; -connection.requestSoapToSPW = async function (soap,cmd,myMethod) { +connection.requestSoapToSACF = async function (soap,cmd,myMethod) { var params = { - url : cfg.service.SPW[myMethod+"_"+cmd+"_URL"], + url : cfg.service.SACF[myMethod+"_"+cmd+"_URL"], body : messageSOAP.objectToSOAP(soap,cmd), method : myMethod } - return asyncRequest(params,cmd,cfg.service.SPW.Name); + return asyncRequest(params,cmd,cfg.service.SACF.Name); }; connection.requestJsonToD01 = async function (obj,cmd,myMethod) { + var service = cfg.service.D01; // JSON.stringify(json) var params = { - url : cfg.service.D01[myMethod+"_"+cmd+"_URL"], + url : service[myMethod+"_"+cmd+"_URL"], body : obj, method : myMethod } @@ -32,7 +33,7 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { if(params.method == "GET") { - var genUrl = getUrl(params); + var genUrl = getUrl(params,service[myMethod+"_Limit"]); // genUrl.push(genUrl[0].replace("8080","8081")); if(genUrl.length > 1) { @@ -109,15 +110,17 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { params.body = JSON.stringify(params.body); var resultRes = await asyncRequest(params,cmd,cfg.service.D01.Name); - resultRes.body = JSON.parse(resultRes.body) + + result.response = JSON.parse(resultRes.body); + // resultRes.body = JSON.parse(resultRes.body); - if(resultRes.body.resultCode === "20000"){ - result.response.resultCode = resultRes.body.resultCode; - result.response.developerMessage = "Success"; - } else { - result.response.resultCode = "50000"; - result.response.developerMessage = "System error"; - } + // if(resultRes.body.resultCode === "20000"){ + // result.response.resultCode = resultRes.body.resultCode; + // result.response.developerMessage = "Success"; + // } else { + // result.response.resultCode = "50000"; + // result.response.developerMessage = "System error"; + // } } // console.log(result); @@ -176,15 +179,23 @@ function asyncRequest (params = {},cmd,node) { }); }; -function getUrl(params) +function getUrl(params,limit) { var returnData = []; var url = params.url; var fields = ""; - var filter = ""; - + var filter = { + base : "", + multi : [] + }; + params.body = {}; + params.body.a = "aaa"; + params.body.b = "bbb"; + params.body.papa = []; + params.body.papa.push("1"); + params.body.papa.push("2"); params.body.commandId = []; params.body.commandId.push("1"); params.body.commandId.push("2"); @@ -193,7 +204,10 @@ function getUrl(params) params.body.commandId.push("5"); params.body.commandId.push("6"); params.body.commandId.push("7"); - params.body.commandId.push("8"); + params.body.commandId.push("8"); + params.body.c = "ccc"; + + params.body.fields = "a,b,c,d"; // console.log(params.body); if(params.body) { @@ -207,35 +221,67 @@ function getUrl(params) first = false; } + + if(first) + fields = "?limit="+limit; + else + fields = "&limit="+limit; } - if(filter != "") + if(filter.multi.length > 0) { - var maxFilterLength = cfg.Uri_length - url.length - fields.length + "?filter=(&)".length; + //have multi - if(maxFilterLength > filter.length) - { - returnData.push(url+"?filter=(&"+filter+")"+fields); + var careData = filter.multi[0]; + // console.log(freeSpace); - }else + for(var i=0;i careData.length) + { + filter.base = filter.base+"(|"+careData.data+")"; + careData = filter.multi[i]; + + } + } + + + var myUrl = url+"?filter=("+filter.base+")"+fields; + var freeSpace = cfg.Uri_length - myUrl.length; - } - + var arr = careData.data.split(")("); + + for(var j=0;j (arrData[i].length+3)) + { + loopUrl = loopUrl + arrData[i]; + loopSpace = loopSpace - arrData[i].length; + }else + { + if(loopUrl != "") + { + arrUrl.push(url+"?filter=("+filter+"(|"+loopUrl+")"+fields); + + loopUrl = arrData[i]; + loopSpace = freeSpace - arrData[i].length; + } + + } + + } + + if(loopUrl != "") + arrUrl.push(url+"?filter=("+filter+"(|"+loopUrl+")"+fields); + return arrUrl; } module.exports = connection; \ No newline at end of file diff --git a/ais-structure/src/modules/helper/responseMsg.js b/ais-structure/src/modules/helper/responseMsg.js index 39c035d..6c43780 100644 --- a/ais-structure/src/modules/helper/responseMsg.js +++ b/ais-structure/src/modules/helper/responseMsg.js @@ -43,7 +43,7 @@ responseMsg.direct = function (req,cmd,result,data) { var response = { resultCode : result.resultCode, - developerMessage : result.developerMessage + developerMessage : result.resultDescription }; -- libgit2 0.21.2