diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml index 5882dd6c..4e66bbe3 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml @@ -342,6 +342,7 @@ where id = #{id} `sts` varchar(1) DEFAULT NULL COMMENT '状态(Y正常N删除)', `org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID', `company_id` varchar(50) DEFAULT NULL COMMENT '公司id', + `data_id` varchar(100) DEFAULT NULL COMMENT 'data_id', `id` varchar(50) NOT NULL COMMENT '唯一标识码', @@ -355,6 +356,7 @@ where id = #{id} `sts` varchar(1) DEFAULT NULL COMMENT '状态(Y正常N删除)', `org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID', `company_id` varchar(50) DEFAULT NULL COMMENT '公司id', + `data_id` varchar(100) DEFAULT NULL COMMENT 'data_id', `id` varchar(50) NOT NULL COMMENT '唯一标识码', @@ -372,6 +374,8 @@ where id = #{id} `sts` varchar(1) DEFAULT NULL COMMENT '状态(Y正常N删除)', `org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID', `company_id` varchar(50) DEFAULT NULL COMMENT '公司id', + `data_type` varchar(255) DEFAULT NULL COMMENT '状态 1、成功2、失败', + `remark` varchar(255) DEFAULT NULL COMMENT '备注', `id` varchar(50) NOT NULL COMMENT '唯一标识码', @@ -388,6 +392,8 @@ where id = #{id} `sts` varchar(1) DEFAULT NULL COMMENT '状态(Y正常N删除)', `org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID', `company_id` varchar(50) DEFAULT NULL COMMENT '公司id', + `data_type` varchar(50) DEFAULT NULL COMMENT '状态 1、成功2、失败', + `remark` varchar(255) DEFAULT NULL COMMENT '备注', PRIMARY KEY (`sorts`,`id`) USING BTREE @@ -812,7 +818,7 @@ where id = #{id} AND - ${item.leftBracket} ${item.filedName} + ${item.leftBracket} ${item.filedId} = diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java index 3c1aef25..8ea83185 100644 --- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java @@ -1688,7 +1688,7 @@ public class MdmServiceImpl implements IMdmService { checkData.put("id", id); checkData.put("mdmModuleDistributeDetailEntities", mdmModuleDistributeDetailEntities); JSONObject object1 = mdmModuleDao.queryMdmST(checkData); - if (object1.getString("id") == null || "".equals(object1.getString("id"))) { + if (object1 == null || object1.getString("id") == null || "".equals(object1.getString("id"))) { return BaseResult.getFailureMessageEntity("当前数据不符合规则不发送"); } } 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 3e3b85e7..6ec18dfb 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 @@ -31,74 +31,22 @@ public class GroovyIntegrationServiceImpl implements IGroovyIntegrationService { } public static void main(String[] args) { - java.lang.String str = "{\"data\":{\"pk_group\":\"00\",\"enablestate\":\"2\",\"code\":\"20240621001\",\"modify_time\":1718935555000,\"document_rule_num\":2,\"mdm_customer_bank\":[],\"add_status\":\"0\",\"custprop\":\"0\",\"delete_status\":\"1\",\"custstate\":\"1\",\"id\":\"d3d20ea680dc4bffaa7e5bf84764d62a\",\"data_status\":\"Y\",\"modify_user_id\":\"1\",\"sorts\":24,\"document_rule\":\"KH-2024-06-21-00002\",\"create_user_id\":\"1\",\"create_time\":1718935555000,\"company_id\":\"Y\",\"pk_country\":\"CN\",\"update_status\":\"1\",\"sts\":\"Y\",\"pk_custclass\":\"K01\",\"org_id\":\"Y\",\"name\":\"测试下发客户\",\"taxpayerid\":\"087982419238904359\"},\"query\":\"[]\",\"header\":\"[{\\\"parameterType\\\":\\\"fundamental\\\",\\\"length\\\":\\\"500\\\",\\\"index\\\":0,\\\"concreteType\\\":\\\"String\\\",\\\"description\\\":\\\"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA87rrNR\\\",\\\"id\\\":\\\"421b73f0-5562-4bfe-b770-c8aca8878bfd\\\",\\\"parameterName\\\":\\\"pubKey\\\",\\\"required\\\":true,\\\"example\\\":\\\"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA87rrNREgMNeOEOwlvM2iqqEfshDadRHziDSB2PbRnoMqSv1nGr3XBlZuseNj5HmxDEkLhOdfyw0yjzoz3wK7XhFpeN4Iyf7NT7hps5jAQMEpnul9Qwmj5qUr/eK5SaO9H8n7sh9BvCdrX9oRUh+U2/ceA3O+y/MUHk5DRvSadc8FhpqbOaNBbAzPnyYAwpVUPvaJ90jcGN1ZG99HR1GEzC+Cn9s6vgt7dYL6ysMs36bSP47xraDSxpfr0CLwa6JV/9KjLIeqL1ZaMtK0CJ1zJGCBA6O6kgxeE9Ul7q2lSS6mPAEJ78izaTYsrjhLpKT+eTtFBOLFbiCrbLp8tVE5kwIDAQAB\\\"},{\\\"parameterType\\\":\\\"fundamental\\\",\\\"length\\\":\\\"100\\\",\\\"index\\\":1,\\\"concreteType\\\":\\\"String\\\",\\\"description\\\":\\\"OA\\\",\\\"id\\\":\\\"5659424d-261d-43ed-9fff-657bd15c7a64\\\",\\\"parameterName\\\":\\\"client_id\\\",\\\"required\\\":true,\\\"example\\\":\\\"OA\\\"},{\\\"parameterType\\\":\\\"authport\\\",\\\"length\\\":\\\"100\\\",\\\"index\\\":2,\\\"concreteType\\\":\\\"String\\\",\\\"id\\\":\\\"d2c4477e-a0bb-4daa-97b4-3cf0b8445001\\\",\\\"parameterName\\\":\\\"access_token\\\",\\\"required\\\":true,\\\"example\\\":[\\\"attribute\\\",\\\"data\\\",\\\"access_token\\\"]}]\",\"body\":\"[{\\\"index\\\":0,\\\"id\\\":\\\"5ac44a3b-c0d5-4ae9-aec6-af6c4c8f59cc\\\",\\\"parameterName\\\":\\\"body\\\",\\\"first\\\":true}]\"}"; - java.lang.String str1 = "com.alibaba.fastjson.JSONObject returnObject = new com.alibaba.fastjson.JSONObject();\n" + - " com.alibaba.fastjson.JSONObject bodys = new com.alibaba.fastjson.JSONObject();\n" + - "\n" + - " com.alibaba.fastjson.JSONObject reqData = com.alibaba.fastjson.JSON.parseObject(jsonStr);\n" + - " com.alibaba.fastjson.JSONObject data = reqData.getJSONObject(\"data\");\n" + - " com.alibaba.fastjson.JSONObject ufinterfaceObject = new com.alibaba.fastjson.JSONObject();\n" + - " ufinterfaceObject.put(\"billtype\", \"customer\");\n" + - " ufinterfaceObject.put(\"isexchange\", \"Y\");\n" + - " ufinterfaceObject.put(\"replace\", \"Y\");\n" + - " ufinterfaceObject.put(\"sender\", \"OA\");\n" + - " ufinterfaceObject.put(\"account\", \"01\");\n" + - " ufinterfaceObject.put(\"groupcode\", \"00\");\n" + - " com.alibaba.fastjson.JSONObject billObject = new com.alibaba.fastjson.JSONObject();\n" + - " com.alibaba.fastjson.JSONObject billheadObject = new com.alibaba.fastjson.JSONObject();\n" + - " billheadObject.put(\"code\", data.get(\"code\"));\n" + - " billheadObject.put(\"custprop\", data.get(\"custprop\"));\n" + - " billheadObject.put(\"custstate\", data.get(\"custstate\"));\n" + - " billheadObject.put(\"pk_custclass\", data.get(\"pk_custclass\"));\n" + - " billheadObject.put(\"pk_country\", data.get(\"pk_country\"));\n" + - " billheadObject.put(\"pk_timezone\", \"P0800\");\n" + - " billheadObject.put(\"pk_format\", \"ZH-CN\");\n" + - " billheadObject.put(\"enablestate\", data.get(\"enablestate\"));\n" + - " billheadObject.put(\"name\", data.get(\"name\"));\n" + - " billheadObject.put(\"pk_group\", data.get(\"pk_group\"));\n" + - " billheadObject.put(\"pk_org\", data.get(\"pk_org\"));\n" + - " billheadObject.put(\"taxpayerid\", data.get(\"taxpayerid\"));\n" + - " billObject.put(\"billhead\", billheadObject);\n" + - " ufinterfaceObject.put(\"bill\", billObject);\n" + - " bodys.put(\"ufinterface\", ufinterfaceObject);\n" + - " returnObject.put(\"bodys\",bodys.toJSONString());\n" + - " return returnObject.toJSONString();".trim(); - String newString =str1.replaceAll("\\s+", ""); + java.lang.String str = "{\"data\":{\"document_rule\":\"RY-2024-06-25-00001\",\"create_user_id\":\"1\",\"mdm_psnjobs\":[],\"create_time\":1719287779000,\"company_id\":\"Y\",\"modify_time\":1719287779000,\"sex\":\"男\",\"mobile\":\"13758050335\",\"document_rule_num\":1,\"add_status\":\"0\",\"update_status\":\"1\",\"sts\":\"Y\",\"delete_status\":\"1\",\"org_id\":\"Y\",\"name\":\"张三1\",\"id\":\"ba0ed50f82e94f8e8a0d000d09795961\",\"data_status\":\"Y\",\"modify_user_id\":\"1\",\"sorts\":5},\"query\":\"[]\",\"header\":\"[]\",\"body\":\"[{\\\"parameterType\\\":\\\"complex\\\",\\\"children\\\":[{\\\"parameterType\\\":\\\"fundamental\\\",\\\"concreteType\\\":\\\"String\\\",\\\"index\\\":1,\\\"description\\\":\\\"用户名\\\",\\\"parameterName\\\":\\\"userName\\\",\\\"id\\\":\\\"3e5627fd-97a8-40ec-bb54-a973de695ad7\\\",\\\"example\\\":\\\"137000000\\\"},{\\\"parameterType\\\":\\\"fundamental\\\",\\\"concreteType\\\":\\\"String\\\",\\\"index\\\":2,\\\"description\\\":\\\"性别 男 女\\\",\\\"parameterName\\\":\\\"gender\\\",\\\"id\\\":\\\"e7ec2721-8fa0-4301-9d71-64c93558efdf\\\",\\\"example\\\":\\\"男\\\"},{\\\"parameterType\\\":\\\"fundamental\\\",\\\"concreteType\\\":\\\"String\\\",\\\"index\\\":3,\\\"description\\\":\\\"用户真实姓名\\\",\\\"parameterName\\\":\\\"userTrueName\\\",\\\"id\\\":\\\"fb760309-f24c-4638-ba19-f15a0fdba653\\\",\\\"example\\\":\\\"张三\\\"},{\\\"parameterType\\\":\\\"fundamental\\\",\\\"concreteType\\\":\\\"String\\\",\\\"index\\\":4,\\\"description\\\":\\\"密码\\\",\\\"parameterName\\\":\\\"userPwd\\\",\\\"id\\\":\\\"a651ce81-f7ee-4aa2-ad48-4afa35fb584c\\\",\\\"example\\\":\\\"123456\\\"},{\\\"parameterType\\\":\\\"fundamental\\\",\\\"concreteType\\\":\\\"String\\\",\\\"index\\\":5,\\\"description\\\":\\\"电话\\\",\\\"parameterName\\\":\\\"mobile\\\",\\\"id\\\":\\\"dad12b91-0c9f-45f2-9dc2-294bb50d5a29\\\",\\\"example\\\":\\\"137000000\\\"}],\\\"concreteType\\\":\\\"Object\\\",\\\"index\\\":0,\\\"id\\\":\\\"d643e859-fd5b-4b40-ab68-7092739dc2b9\\\",\\\"parameterName\\\":\\\"body\\\",\\\"first\\\":true}]\"}"; A88772 s = new A88772(); s.execute(str); } static class A88772 { 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", "OA"); - ufinterfaceObject.put("account", "01"); - ufinterfaceObject.put("groupcode", "00"); - 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 returnObject = new com.alibaba.fastjson.JSONObject(); + com.alibaba.fastjson.JSONObject bodys = new com.alibaba.fastjson.JSONObject(); + bodys.put("userName", data.get("mobile")); + bodys.put("gender", data.get("sex")); + bodys.put("userTrueName", data.get("name")); + bodys.put("userPwd", "123456"); + bodys.put("mobile", data.get("mobile")); returnObject.put("bodys",bodys.toJSONString()); return returnObject.toJSONString(); }