From a673be253b5124a464ef5f51236733b09d919721 Mon Sep 17 00:00:00 2001 From: yuqh <123456> Date: Thu, 22 Aug 2024 17:36:54 +0800 Subject: [PATCH] 1 --- .../service/impl/MasterDataServiceImpl.java | 16 ++++- .../impl/GroovyIntegrationServiceImpl.java | 61 +++++++++++-------- 2 files changed, 49 insertions(+), 28 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataServiceImpl.java index 357a2ec6..60b0b85d 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataServiceImpl.java @@ -76,7 +76,7 @@ public class MasterDataServiceImpl extends BaseService // if(!"10003".equals(mdmCode)){ // continue; // } - switch (appTyp) {//1、致远OA 2、用友U8C 3、用友BIP + switch (appTyp) {//1、致远OA 2、用友U8C 3、用友BIP 5。用友U8 case "1": //通过主数据编码判断，不同的接口走不通的查询逻辑 switch (mdmCode){ @@ -96,6 +96,18 @@ public class MasterDataServiceImpl extends BaseService logger.info("未匹配到主数据的编码，请检查"); break; } + break; + case "5": + //通过主数据编码判断，不同的接口走不通的查询逻辑 + switch (mdmCode){ + case "10003"://致远用户信息 + tableName = "mdm_user"; + listAll = bindingUser(jsonObject, mdmModuleSourceEntity, dbCode,startTime,endTime); + break; + default: + logger.info("未匹配到主数据的编码，请检查"); + break; + } } //调用主数据接口进行数据推送或更新 if (null != listAll && listAll.size() > 0) { @@ -233,7 +245,7 @@ public class MasterDataServiceImpl extends BaseService jsonStr.put("jsonStr", jsonObjectUser); //先查询编码和名称查询是否存在 Object attribute = comparisonServiceimpl.queryEntityPage(jsonStr); - logger.info("得到的attribute值为：{}", jsonStr.toJSONString(attribute)); + logger.info("得到的attribute值为：{}", JSON.toJSONString(attribute)); JSONObject jsonObjectAttribute = (JSONObject) JSON.toJSON(attribute); JSONArray jsonArrayList = jsonObjectAttribute.getJSONArray("list"); //如果jsonArrayList为null，说明没有值，在表中不存在 diff --git a/service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java index ee5ee3a1..b6cef49d 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java @@ -34,7 +34,7 @@ public class GroovyIntegrationServiceImpl implements IGroovyIntegrationService { } public static void main(String[] args) { - java.lang.String str = "{\"data\":{\"enablestate\":\"2\",\"user_password\":\"Hzya@1314\",\"gender\":\"12312\",\"user_name\":\"测试用户\",\"modify_time\":1719305835000,\"document_rule_num\":112,\"pk_org\":{\"org_mnecode\":\"1\",\"modify_time\":1718866279000,\"document_rule_num\":4,\"add_status\":\"0\",\"org_address\":\"1\",\"delete_status\":\"1\",\"org_innercode\":\"1\",\"id\":\"f7a8cee35fce4aa8ab266b3c7f125d7d\",\"data_status\":\"F\",\"modify_user_id\":\"1\",\"org_name\":\"开发部\",\"sorts\":4,\"document_rule\":\"ZZ-2024-06-20-00004\",\"create_user_id\":\"1\",\"create_time\":1718864103000,\"company_id\":\"Y\",\"org_memo\":\"1\",\"update_status\":\"0\",\"sts\":\"Y\",\"org_tel\":\"1\",\"org_id\":\"Y\",\"org_ncindustry\":\"1\",\"org_fatherorg\":\"c4913dde8da142bab4206fc084269382\",\"org_code\":\"003\",\"org_principal\":\"1\",\"org_countryzone\":\"1\"},\"add_status\":\"0\",\"pwdlevelcode\":\"\",\"user_type\":\"1\",\"user_code\":\"17633965916\",\"delete_status\":\"1\",\"id\":\"d99fe4e1c211450a960f7a1057da0d2c\",\"data_status\":\"F\",\"modify_user_id\":\"1\",\"sorts\":346,\"document_rule\":\"YH-2024-06-25-00112\",\"create_user_id\":\"1\",\"create_time\":1719305229000,\"company_id\":\"Y\",\"user_code_q\":\"KP003\",\"format\":\"ZH-CN\",\"mobile\":\"123123\",\"identityverifycode\":\"静态密码验证\",\"islocked\":\"N\",\"update_status\":\"0\",\"base_doc_type\":\"0\",\"sts\":\"Y\",\"login_name\":\"123123\",\"pwdparam\":\"2024-06-17\",\"org_id\":\"Y\",\"abledate\":\"2024-06-17 00:00:00\",\"isca\":\"Y\",\"contentlang\":\"ZH\"},\"query\":\"[]\",\"header\":\"[{\\\"parameterType\\\":\\\"fundamental\\\",\\\"length\\\":\\\"100\\\",\\\"index\\\":0,\\\"description\\\":\\\"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA87rrNR\\\",\\\"concreteType\\\":\\\"String\\\",\\\"id\\\":\\\"7127798c-b731-453a-b3ac-cfe9033eeace\\\",\\\"parameterName\\\":\\\"pubKey\\\",\\\"required\\\":true,\\\"example\\\":\\\"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA87rrNREgMNeOEOwlvM2iqqEfshDadRHziDSB2PbRnoMqSv1nGr3XBlZuseNj5HmxDEkLhOdfyw0yjzoz3wK7XhFpeN4Iyf7NT7hps5jAQMEpnul9Qwmj5qUr/eK5SaO9H8n7sh9BvCdrX9oRUh+U2/ceA3O+y/MUHk5DRvSadc8FhpqbOaNBbAzPnyYAwpVUPvaJ90jcGN1ZG99HR1GEzC+Cn9s6vgt7dYL6ysMs36bSP47xraDSxpfr0CLwa6JV/9KjLIeqL1ZaMtK0CJ1zJGCBA6O6kgxeE9Ul7q2lSS6mPAEJ78izaTYsrjhLpKT+eTtFBOLFbiCrbLp8tVE5kwIDAQAB\\\"},{\\\"parameterType\\\":\\\"fundamental\\\",\\\"length\\\":\\\"50\\\",\\\"index\\\":1,\\\"description\\\":\\\"OA\\\",\\\"concreteType\\\":\\\"String\\\",\\\"id\\\":\\\"7f965281-df0f-4d2f-b005-07e061fcde49\\\",\\\"parameterName\\\":\\\"client_id\\\",\\\"required\\\":true,\\\"example\\\":\\\"OA\\\"},{\\\"parameterType\\\":\\\"authport\\\",\\\"length\\\":\\\"50\\\",\\\"index\\\":2,\\\"concreteType\\\":\\\"String\\\",\\\"id\\\":\\\"cbc0e105-17c0-4385-8863-8903303edc1f\\\",\\\"parameterName\\\":\\\"access_token\\\",\\\"example\\\":[\\\"attribute\\\",\\\"data\\\",\\\"access_token\\\"]}]\",\"body\":\"[{\\\"index\\\":0,\\\"id\\\":\\\"beeedbc6-24c2-4093-9a5e-20fced9fb1b4\\\",\\\"parameterName\\\":\\\"body\\\",\\\"first\\\":true}]\"}"; + java.lang.String str = "{\"data\":{\"document_rule\":\"KH-2024-08-22-00002\",\"create_user_id\":\"1\",\"create_time\":1724309574000,\"company_id\":\"Y\",\"ccusname\":\"测试客户名称\",\"modify_time\":1724309574000,\"ccccode\":\"FL01\",\"ccuscode\":\"K20240001\",\"document_rule_num\":2,\"mdm_customer_bank\":[{\"bdefaultaccount\":\"Y\",\"create_user_id\":\"1\",\"cbname\":\"开户银行\",\"cbankcode\":\"会稽山\",\"formmain_id\":\"cd3136d204084769b5991a4f276c69c4\",\"create_time\":1724309575000,\"company_id\":\"0\",\"modify_time\":1724309575000,\"cankcode\":\"所属银行\",\"sts\":\"Y\",\"cbaccount\":\"1381278236781283\",\"org_id\":\"0\",\"id\":\"dda3ab07459744fda9981b31b57d3e3a\",\"data_status\":\"Y\",\"modify_user_id\":\"1\",\"sorts\":2}],\"cccname\":\"内部客户\",\"add_status\":\"0\",\"update_status\":\"1\",\"sts\":\"Y\",\"delete_status\":\"1\",\"org_id\":\"Y\",\"id\":\"cd3136d204084769b5991a4f276c69c4\",\"ccusabbname\":\"测试客户名称\",\"data_status\":\"Y\",\"modify_user_id\":\"1\",\"sorts\":2},\"query\":\"[]\",\"header\":\"[]\",\"body\":\"[{\\\"id\\\":\\\"aaa28f22-d14f-481e-8c0f-1027204c3597\\\",\\\"parameterName\\\":\\\"body\\\",\\\"first\\\":true}]\"}"; A88772 s = new A88772(); s.execute(str); } @@ -43,33 +43,42 @@ public class GroovyIntegrationServiceImpl implements IGroovyIntegrationService { String execute(String jsonStr) { com.alibaba.fastjson.JSONObject returnObject = new com.alibaba.fastjson.JSONObject(); com.alibaba.fastjson.JSONObject bodys = new com.alibaba.fastjson.JSONObject(); - com.alibaba.fastjson.JSONObject reqData = com.alibaba.fastjson.JSON.parseObject(jsonStr); com.alibaba.fastjson.JSONObject data = reqData.getJSONObject("data"); - com.alibaba.fastjson.JSONObject ufinterfaceObject = new com.alibaba.fastjson.JSONObject(); - ufinterfaceObject.put("billtype", "customer"); - ufinterfaceObject.put("isexchange", "Y"); - ufinterfaceObject.put("replace", "Y"); - ufinterfaceObject.put("sender", "openUser"); - ufinterfaceObject.put("account", "ycjf"); - ufinterfaceObject.put("groupcode", "ycjf"); - com.alibaba.fastjson.JSONObject billObject = new com.alibaba.fastjson.JSONObject(); - com.alibaba.fastjson.JSONObject billheadObject = new com.alibaba.fastjson.JSONObject(); - billheadObject.put("code", data.get("code")); - billheadObject.put("custprop", data.get("custprop")); - billheadObject.put("custstate", data.get("custstate")); - billheadObject.put("pk_custclass", data.get("pk_custclass")); - billheadObject.put("pk_country", data.get("pk_country")); - billheadObject.put("pk_timezone", "P0800"); - billheadObject.put("pk_format", "ZH-CN"); - billheadObject.put("enablestate", data.get("enablestate")); - billheadObject.put("name", data.get("name")); - billheadObject.put("pk_group", data.get("pk_group")); - billheadObject.put("pk_org", data.get("pk_org")); - billheadObject.put("taxpayerid", data.get("taxpayerid")); - billObject.put("billhead", billheadObject); - ufinterfaceObject.put("bill", billObject); - bodys.put("ufinterface", ufinterfaceObject); + com.alibaba.fastjson.JSONObject mdmCustomer = new com.alibaba.fastjson.JSONObject(); + com.alibaba.fastjson.JSONArray mdmCustomerBankAll = new com.alibaba.fastjson.JSONArray(); + mdmCustomer.put("ccuscode",data.getString("ccuscode")); + mdmCustomer.put("ccusname",data.getString("ccusname")); + mdmCustomer.put("ccusabbname",data.getString("ccusabbname")); + mdmCustomer.put("ccccode",data.getString("ccccode")); + mdmCustomer.put("cccname",data.getString("cccname")); + mdmCustomer.put("ccusmngtypecode",data.getString("ccusmngtypecode")); + mdmCustomer.put("ccusmngtypename",data.getString("ccusmngtypename")); + mdmCustomer.put("ccusregcode",data.getString("ccusregcode")); + mdmCustomer.put("ccuslperson",data.getString("ccuslperson")); + mdmCustomer.put("cinvoicecompany",data.getString("cinvoicecompany")); + mdmCustomer.put("ccdefine21",data.getString("ccdefine21")); + mdmCustomer.put("ccdefine8",data.getString("ccdefine8")); + mdmCustomer.put("ccdefine7",data.getString("ccdefine7")); + mdmCustomer.put("ccdefine5",data.getString("ccdefine5")); + mdmCustomer.put("ccdefine3",data.getString("ccdefine3")); + mdmCustomer.put("dataStatus",data.getString("datastatus")); + com.alibaba.fastjson.JSONArray mdmCustomerBank = data.getJSONArray("mdm_customer_bank"); + if(null != mdmCustomerBank && mdmCustomerBank.size()>0){ + for(Object bankObj : mdmCustomerBank){ + com.alibaba.fastjson.JSONObject bank = com.alibaba.fastjson.JSONObject.parseObject(bankObj.toString()); + com.alibaba.fastjson.JSONObject mdmCustomerObj = new com.alibaba.fastjson.JSONObject(); + mdmCustomerObj.put("cankcode",bank.getString("cankcode")); + mdmCustomerObj.put("cbname",bank.getString("cbname")); + mdmCustomerObj.put("cbaccount",bank.getString("cbaccount")); + mdmCustomerObj.put("cbankcode",bank.getString("cbankcode")); + mdmCustomerObj.put("formmain_id",bank.getString("formmain_id")); + mdmCustomerObj.put("bdefaultaccount",bank.getString("bdefaultaccount")); + mdmCustomerBankAll.add(mdmCustomerObj); + } + } + bodys.put("mdm_customer", mdmCustomer); + bodys.put("mdm_customer_bank", mdmCustomerBankAll); returnObject.put("bodys",bodys.toJSONString()); return returnObject.toJSONString();