diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java index cc4fbf7..708b957 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java @@ -109,50 +109,101 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { } DynamicObjectCollection shkd_mapping = shkd_apimapping.getDynamicObjectCollection("shkd_mapping"); + for (DynamicObject bei_elecreceiptid : bei_elecreceiptids) { DynamicObject bei_elecreceipt = BusinessDataServiceHelper.loadSingle(bei_elecreceiptid.getLong("id"), sourcebillnumber); String saveRequestBody=getJSON(bei_elecreceipt,shkd_mapping);//请求json logger.info("单据"+bei_elecreceipt.getString("billno")+"推送json:"+saveRequestBody); Map resultMap = new HashMap<>(); String res=""; - switch (shkd_jrrzxx){ - case "1": - case "2": - case "3": - case "4": - res = doPost(shkd_url,headMap,saveRequestBody,null); - logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息:"+res); - JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 - String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 - resultMap.put("shkd_issuccess",false);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",false); - }else { - JSONArray datas = otherIsJsonRS.getJSONArray("data"); - if (datas==null){ - resultMap.put("shkd_issuccess",true);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",true); - }else { - JSONObject data = datas.getJSONObject(0); - String dataflag = data.getString("FLAG"); - if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ - resultMap.put("shkd_issuccess",false);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",false); - }else { - resultMap.put("shkd_issuccess",true);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",true); - } - } - } - break; - case "5": - res=""; + if ("1".equals(shkd_jrrzxx)){ + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息:"+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); - break; - default: - System.out.println("无效的选项"); - break; + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + } else if ("2".equals(shkd_jrrzxx)) {//只记录失败的 + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息:"+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + if ((Boolean) resultMap.get("shkd_issuccess")){ + continue; + } + }else if ("3".equals(shkd_jrrzxx)) {//只记录成功的 + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息:"+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + if ((Boolean) resultMap.get("shkd_issuccess")){ + }else { + continue; + } + }else if ("4".equals(shkd_jrrzxx)) {//不记录 + continue; + }else if ("5".equals(shkd_jrrzxx)) {//只记录不推送 + resultMap.put("shkd_issuccess",false);//是否成功 + }else { + continue; } logger.info("单据"+bei_elecreceipt.getString("billno")+"返回json:"+res); @@ -512,4 +563,6 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { Object[] save = SaveServiceHelper.save(new DynamicObject[]{dynamicObject}); return save; } + + } diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java index 93364a7..8034c3c 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java @@ -111,42 +111,94 @@ public class SharePushTaskPlugin extends AbstractTask { logger.info("单据"+bei_elecreceipt.getString("billno")+"推送json:"+saveRequestBody); Map resultMap = new HashMap<>(); String res=""; - switch (shkd_jrrzxx){ - case "1": - case "2": - case "3": - case "4": - res = doPost(shkd_url,headMap,saveRequestBody,null); - JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 - String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 - resultMap.put("shkd_issuccess",false);//是否成功 - }else { - JSONArray datas = otherIsJsonRS.getJSONArray("data"); - if (datas==null){ - resultMap.put("shkd_issuccess",true);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",true); - }else { - JSONObject data = datas.getJSONObject(0); - String dataflag = data.getString("FLAG"); - if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ - resultMap.put("shkd_issuccess",false);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",false); - }else { - resultMap.put("shkd_issuccess",true);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",true); - } - } - } - break; - case "5": - res=""; + if ("1".equals(shkd_jrrzxx)){ + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息:"+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); - break; - default: - System.out.println("无效的选项"); - break; + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + } else if ("2".equals(shkd_jrrzxx)) {//只记录失败的 + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息:"+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + if ((Boolean) resultMap.get("shkd_issuccess")){ + continue; + } + }else if ("3".equals(shkd_jrrzxx)) {//只记录成功的 + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息:"+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + if ((Boolean) resultMap.get("shkd_issuccess")){ + }else { + continue; + } + }else if ("4".equals(shkd_jrrzxx)) {//不记录 + continue; + }else if ("5".equals(shkd_jrrzxx)) {//只记录不推送 + resultMap.put("shkd_issuccess",false);//是否成功 + }else { + continue; } logger.info("单据"+bei_elecreceipt.getString("billno")+"返回json:"+res);