From 0a243ea265bf3a1f9e258c9a1ad4ba0c737aa115 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Tue, 21 Jun 2022 16:57:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=B5=E8=AF=9D=E5=8F=AF=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E6=8B=A8=E6=89=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coresite/controllers/SaleLeadsController.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java index d2bebc084..8e3980d60 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java @@ -52,6 +52,15 @@ public class SaleLeadsController { return model; } + /** + * µØÊý¹«ÖںÅ×Éѯ + * @param model + * @return + */ + public Object didataApplyAction(SaleLeadsModel model) { + return model; + } + public Object doAddAction(SaleLeadsModel model, HttpServletRequest req, HttpServletResponse res) throws UnsupportedEncodingException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { @@ -156,11 +165,11 @@ public class SaleLeadsController { } try { JSONObject requestBody = new JSONObject(); - requestBody.put("msgtype", "markdown"); + requestBody.put("msgtype", "text"); JSONObject markdown = new JSONObject(); markdown.put("title", "ÏúÊÛÏßË÷"); - markdown.put("text", body); - requestBody.put("markdown", markdown); + markdown.put("content", body); + requestBody.put("text", markdown); HttpRequest request = new HttpRequest(); final String ding_url = "https://oapi.dingtalk.com/robot/send?access_token=894650a12af9497bed599df1d5f93b21d6da5bbae45f35f18c5825580ebbdf64"; Map headers = new HashMap(); From 806939a4a3a3faa00e76be4584731588c0fa2819 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Wed, 22 Jun 2022 10:55:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=B0=E6=95=B0?= =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/SaleLeadsController.java | 24 +- .../src/main/resources/urlrewrite2.0.xml | 12 +- .../src/main/webapp/saleLeads/didataApply.ftl | 474 ++++++++++++++++++ .../main/webapp/saleLeads/didataResult.ftl | 87 ++++ .../mongo/fangjia/enums/SalesLeadEnum.java | 3 +- 5 files changed, 592 insertions(+), 8 deletions(-) create mode 100644 projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl create mode 100644 projects/fangjia-coresite/src/main/webapp/saleLeads/didataResult.ftl diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java index 8e3980d60..eab5dbd3c 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java @@ -153,13 +153,16 @@ public class SaleLeadsController { "ҵÎñÐèÇó£º" + saleLeads.getBusiness() + " " + saleLeads.getOtherBusiness() + "\n\n" + "ÐÕÃû£º" + saleLeads.getUname() + "\n\n" + "³ÇÊУº" + saleLeads.getCity() + "\n\n" - + "¹¤×÷ְÄܣº" + saleLeads.getWork() + "" + saleLeads.getOtherWork() + "\n\n" + + "¹¤×÷ְÄܣº" + saleLeads.getWork() + " " + saleLeads.getOtherWork() + "\n\n" + "Êֻú£º" + saleLeads.getMobile() + "\n\n" + "ÓÊÏ䣺" + saleLeads.getEmail() + "\n\n" + "¹«˾Ãû³ƣº" + saleLeads.getCompany() + "\n\n" - + "ÐÐҵÐÔÖʣº" + saleLeads.getIndustryNature() + "\n\n"; - if (org.apache.commons.lang3.StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { + + "ÐÐҵÐÔÖʣº" + saleLeads.getIndustryNature() + " " + saleLeads.getOtherIndustryNature() + "\n\n"; + body = body.replaceAll("null", "").replaceAll("ÆäËû£¬ÇëÌîд", ""); + if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { body += "ÏßË÷À´Դ£º°ٶÈ"; + } else if (StringUtils.isNotBlank(refUrl) && refUrl.contains("didata.wechat")) { + body += "ÏßË÷À´Դ: µØÊý¹«ÖںÅ"; } else { body += "ÏßË÷À´Դ£º·¿¼ÛÍø"; } @@ -175,14 +178,14 @@ public class SaleLeadsController { Map headers = new HashMap(); headers.put("Content-Type", "application/json; charset=utf-8"); request.postWithBody(ding_url, requestBody, headers, "UTF-8"); - } catch (HttpRequestException e) { + } catch (Exception e) { e.printStackTrace(); } saleLeadsService.save(saleLeads); // ¶ÔÓڰٶȹã¸æ¹ýÀ´µÄÐÅϢ£¬½øÐлش« try { - if (org.apache.commons.lang3.StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { + if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { HttpRequest httpRequest = new HttpRequest(); final String baiduUrl = "https://ocpc.baidu.com/ocpcapi/api/uploadConvertData"; Map bdHeaders = new HashMap(); @@ -228,7 +231,12 @@ public class SaleLeadsController { if(StringUtils.isNotBlank(refUrl) && refUrl.contains("/resource/info")){ url = refUrl.substring(refUrl.indexOf("/resource/info"), refUrl.length()); - }else{ + } else if (StringUtils.isNotBlank(refUrl) && refUrl.contains("didata.wechat")) { // µØÊý¹«ÖںÅÌøת + url = "/enquire/didataSuccess"; + if (StringUtils.isNotBlank(refUrl)) { + url = url + "?backUrl=" + URLEncoder.encode(refUrl); + } + } else{ url = "/enquire/success"; if (StringUtils.isNotBlank(refUrl)) { url = url + "?backUrl=" + URLEncoder.encode(refUrl); @@ -297,6 +305,10 @@ public class SaleLeadsController { return model; } + public Object didataResultAction(SaleLeadsModel model) { + return model; + } + public SaleLeadsService getSaleLeadsService() { return saleLeadsService; } diff --git a/projects/fangjia-coresite/src/main/resources/urlrewrite2.0.xml b/projects/fangjia-coresite/src/main/resources/urlrewrite2.0.xml index 5c8ab82c9..d96ca92fe 100644 --- a/projects/fangjia-coresite/src/main/resources/urlrewrite2.0.xml +++ b/projects/fangjia-coresite/src/main/resources/urlrewrite2.0.xml @@ -309,7 +309,17 @@ / - + + + + /didataApply + + + + + /didataSuccess + + diff --git a/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl new file mode 100644 index 000000000..78f147355 --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl @@ -0,0 +1,474 @@ + + + + + +时空价值挖掘平台 -地数 didata.ai + + +<#include "../jsconstants.ftl" /> + + + + + + + + + + + + + + + + +<#escape x as x?html> +
+
+ +
+
+ +
+
+
+
+

+

我们很乐意为您提供帮助
+ √ 详尽的产品功能及服务介绍
+ √ 针对您所处的行业与业务场景,提供专业的服务方案
+ √ 根据您的业务规模和需求,提供优惠的价格方案
+ 紧急咨询可拨打400-188-3787
+ 预约申请请留下您的联系方式,我们会尽快与您联系
+
+

+
+
+
+ + + + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ 提交 +
+
+
+ + +<#include "/header/v5/_footer.ftl" /> +<#include "../citys.ftl"/> + + + + + + + + + + + + + + + + + + + diff --git a/projects/fangjia-coresite/src/main/webapp/saleLeads/didataResult.ftl b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataResult.ftl new file mode 100644 index 000000000..2009d5282 --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataResult.ftl @@ -0,0 +1,87 @@ + + + + + +咨询信息提交成功 - 地数 didata.ai + + + + + + + + + + + + + + + + +
+
+ +
+
+ +
+
+
+
+

您的信息已提交成功

+ +

若您有任何问题,欢迎拨打客服电话:400-188-3787

+
+
+
+
+ +<#include "/header/v5/_footer.ftl"/> + + + + + + + + diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java index 8daca61ed..6cb65c498 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java @@ -22,7 +22,8 @@ public enum SalesLeadEnum { DOWN_APPLY("1016", "ÏÂÔØÉêÇë"), FDANG_DIAO_BAO_GAO("1017", "·¿²úרҵµ÷²éÆÀ¹À±¨¸æ"), BUSINESS_ASK("1018", "ҵÎñ×Éѯ"), - HOUSE_EVAL("1019", "·¿²úÆÀ¹À"); + HOUSE_EVAL("1019", "·¿²úÆÀ¹À"), + DIDATA("1020", "µØÊýƽ̨");