From 0d6a34de5ff5521cc1d65417a69497d98d514cc8 Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Fri, 29 Apr 2022 11:48:15 +0800 Subject: [PATCH] Fixed https://github.com/chatopera/cskefu/issues/705 resolve Ads attached by organ --- .../admin/channel/SNSAccountIMController.java | 11 +++++ .../cc/controller/apps/IMController.java | 46 +++++++++++++------ .../templates/apps/setting/agent/index.pug | 2 +- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/channel/SNSAccountIMController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/channel/SNSAccountIMController.java index 45ccb82e..7f8aff3d 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/channel/SNSAccountIMController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/channel/SNSAccountIMController.java @@ -18,6 +18,7 @@ package com.chatopera.cc.controller.admin.channel; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.basic.MainUtils; +import com.chatopera.cc.cache.Cache; import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.*; import com.chatopera.cc.persistence.repository.ConsultInviteRepository; @@ -65,6 +66,10 @@ public class SNSAccountIMController extends Handler { @Autowired private OrganRepository organRes; + @Autowired + private Cache cache; + + @RequestMapping("/index") @Menu(type = "admin", subtype = "im", access = false, admin = true) public ModelAndView index(ModelMap map, HttpServletRequest request, @Valid String execute, @RequestParam(name = "status", required = false) String status) { @@ -139,11 +144,17 @@ public class SNSAccountIMController extends Handler { if (execute = MainUtils.secConfirm(secRes, super.getOrgi(request), confirm)) { SNSAccount snsAccount = snsAccountRes.findByIdAndOrgi(id, super.getOrgi(request)); if (snsAccountRes != null) { + // 删除网站渠道记录 snsAccountRes.delete(snsAccount); + /** + * 删除网站渠道客服配置 + */ CousultInvite coultInvite = invite.findBySnsaccountidAndOrgi(snsAccount.getSnsid(), super.getOrgi(request)); if (coultInvite != null) { invite.delete(coultInvite); } + // 删除缓存 + cache.deleteConsultInviteBySnsidAndOrgi(snsAccount.getSnsid(), super.getOrgi(request)); } } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java index c05c29f3..7ea2ef88 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java @@ -442,7 +442,7 @@ public class IMController extends Handler { @RequestMapping("/{id}/userlist") @Menu(type = "im", subtype = "inlist", access = true) public void inlist(HttpServletRequest request, HttpServletResponse response, @PathVariable String id, - @Valid String userid) throws IOException { + @Valid String userid) throws IOException { response.setHeader("Content-Type", "text/html;charset=utf-8"); if (StringUtils.isNotBlank(userid)) { BlackEntity black = cache.findOneSystemByIdAndOrgi(userid, Constants.SYSTEM_ORGI); @@ -642,8 +642,8 @@ public class IMController extends Handler { if (StringUtils.isNotBlank( appid) && ((!blackOpt.isPresent()) - || (blackOpt.get().getEndtime() != null && blackOpt.get().getEndtime().before( - new Date())))) { + || (blackOpt.get().getEndtime() != null && blackOpt.get().getEndtime().before( + new Date())))) { String randomUserId; // 随机生成OnlineUser的用户名，使用了浏览器指纹做唯一性KEY if (StringUtils.isNotBlank(userid)) { @@ -753,7 +753,7 @@ public class IMController extends Handler { // 验证 OnlineUser 信息 if (contacts != null && StringUtils.isNotBlank( contacts.getName())) { // contacts用于传递信息，并不和 联系人表发生 关联，contacts信息传递给 Socket.IO，然后赋值给 - // AgentUser，最终赋值给 AgentService永久存储 + // AgentUser，最终赋值给 AgentService永久存储 consult = true; // 存入 Cookies if (invite.isConsult_info_cookies()) { @@ -777,7 +777,7 @@ public class IMController extends Handler { if (StringUtils.isNotBlank(contacts.getSkypeid())) { Cookie skypeid = new Cookie( "skypeid", MainUtils.encryption( - URLEncoder.encode(contacts.getSkypeid(), "UTF-8"))); + URLEncoder.encode(contacts.getSkypeid(), "UTF-8"))); skypeid.setMaxAge(3600); response.addCookie(skypeid); } @@ -960,15 +960,33 @@ public class IMController extends Handler { } view.addObject("commentList", Dict.getInstance().getDic(Constants.CSKEFU_SYSTEM_COMMENT_DIC)); view.addObject("commentItemList", Dict.getInstance().getDic(Constants.CSKEFU_SYSTEM_COMMENT_ITEM_DIC)); - view.addObject("welcomeAd", - MainUtils.getPointAdv(MainContext.AdPosEnum.WELCOME.toString(), skill, orgi)); - view.addObject("figureAds", - MainUtils.getPointAdvs(MainContext.AdPosEnum.IMAGE.toString(), skill, orgi)); + + /** + * 绑定广告位信息，确定对应的组织机构；广告是在该组织机构下，管理的【客服设置】 + * 1）查找对应的网站渠道，如果找到对应的网站渠道，则设置为该网站渠道所属的组织机构 + * 2）该渠道不属于网站渠道，那么是来自于其他渠道，查看其是否绑定技能组，如果绑定技能组，则使用绑定技能组的 ID + */ + String adsAttachedOrgan = null; + if (StringUtils.isNotEmpty(invite.getSnsaccountid())) { + SNSAccount snsAccount = snsAccountRes.findBySnsidAndOrgi(invite.getSnsaccountid(), orgi); + if (snsAccount != null) { + adsAttachedOrgan = snsAccount.getOrgan(); + } + } else if (StringUtils.isNotEmpty(skill)) { + adsAttachedOrgan = skill; + } + + if (StringUtils.isNotEmpty(adsAttachedOrgan)) { + view.addObject("welcomeAd", + MainUtils.getPointAdv(MainContext.AdPosEnum.WELCOME.toString(), adsAttachedOrgan, orgi)); + view.addObject("figureAds", + MainUtils.getPointAdvs(MainContext.AdPosEnum.IMAGE.toString(), adsAttachedOrgan, orgi)); + } // 确定"接受邀请"被处理后，通知浏览器关闭弹出窗口 OnlineUserProxy.sendWebIMClients(userid, "accept"); - // 更新InviteRecord + // 更新 InviteRecord logger.info("[index] update inviteRecord for user {}", userid); final Date threshold = new Date(System.currentTimeMillis() - Constants.WEBIM_AGENT_INVITE_TIMEOUT); Page inviteRecords = inviteRecordRes.findByUseridAndOrgiAndResultAndCreatetimeGreaterThan( @@ -1194,9 +1212,9 @@ public class IMController extends Handler { @RequestMapping("/leavemsg/save") @Menu(type = "admin", subtype = "user") public ModelAndView leavemsgsave(HttpServletRequest request, - @Valid String appid, - @Valid LeaveMsg msg, - @Valid String skillId) { + @Valid String appid, + @Valid LeaveMsg msg, + @Valid String skillId) { if (StringUtils.isNotBlank(appid)) { snsAccountRepository.findBySnsid(appid).ifPresent(p -> { CousultInvite invite = inviteRepository.findBySnsaccountidAndOrgi(appid, Constants.SYSTEM_ORGI); @@ -1219,7 +1237,7 @@ public class IMController extends Handler { @RequestMapping("/refuse") @Menu(type = "im", subtype = "refuse", access = true) public void refuse(HttpServletRequest request, HttpServletResponse response, @Valid String orgi, - @Valid String appid, @Valid String userid, @Valid String sessionid, @Valid String client) throws Exception { + @Valid String appid, @Valid String userid, @Valid String sessionid, @Valid String client) throws Exception { OnlineUserProxy.refuseInvite(userid, orgi); final Date threshold = new Date(System.currentTimeMillis() - Constants.WEBIM_AGENT_INVITE_TIMEOUT); Page inviteRecords = inviteRecordRes.findByUseridAndOrgiAndResultAndCreatetimeGreaterThan( diff --git a/contact-center/app/src/main/resources/templates/apps/setting/agent/index.pug b/contact-center/app/src/main/resources/templates/apps/setting/agent/index.pug index 54eeb301..8e7bcdfa 100644 --- a/contact-center/app/src/main/resources/templates/apps/setting/agent/index.pug +++ b/contact-center/app/src/main/resources/templates/apps/setting/agent/index.pug @@ -29,7 +29,7 @@ block content .box-header: h3.box-title 对话设置 .box-body.ukefu-im-theme .row: .col-lg-8 - .ukefu-webim-prop 人工坐席接入欢迎消息（非WEBIM渠道适用） + .ukefu-webim-prop 人工坐席接入欢迎消息 .ukefu-webim-tl(style="clear:both;") .box-item: .row: .col-lg-12 textarea(name="sessionmsg" id="sessionmsg" autocomplete="off" class="layui-input" resize="false" style="height:90px;line-height:22px;resize: none;")= sessionConfig.sessionmsg ? sessionConfig.sessionmsg : "欢迎您来咨询！欢迎使用春松客服！如需帮助请联系 info@chatopera.com"