github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00
Code Issues Releases Wiki Activity

Closed #98 更新语音渠道编辑

Browse Source
This commit is contained in:
Hai Liang Wang 2018-10-16 18:03:03 +08:00
parent 409d9be208
commit 7c32b38f42
2 changed files with 260 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

512
contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/WebIMController.java
View File

@ -16,22 +16,17 @@
*/ */
package com.chatopera.cc.app.handler.admin.channel; package com.chatopera.cc.app.handler.admin.channel;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import com.chatopera.cc.util.Menu;
import com.chatopera.cc.app.cache.CacheHelper; import com.chatopera.cc.app.cache.CacheHelper;
import com.chatopera.cc.app.handler.Handler; import com.chatopera.cc.app.handler.Handler;
import com.chatopera.cc.app.model.CousultInvite; import com.chatopera.cc.app.model.CousultInvite;
import com.chatopera.cc.app.model.Organ; import com.chatopera.cc.app.model.Organ;
import com.chatopera.cc.app.model.OrgiSkillRel; import com.chatopera.cc.app.model.OrgiSkillRel;
import com.chatopera.cc.app.model.User; import com.chatopera.cc.app.model.User;
import com.chatopera.cc.app.persistence.repository.*;
import com.chatopera.cc.util.Menu;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -42,274 +37,277 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.chatopera.cc.app.persistence.repository.ConsultInviteRepository; import javax.servlet.http.HttpServletRequest;
import com.chatopera.cc.app.persistence.repository.OrganRepository; import javax.validation.Valid;
import com.chatopera.cc.app.persistence.repository.OrgiSkillRelRepository; import java.io.File;
import com.chatopera.cc.app.persistence.repository.SNSAccountRepository; import java.io.IOException;
import com.chatopera.cc.app.persistence.repository.ServiceAiRepository; import java.util.ArrayList;
import com.chatopera.cc.app.persistence.repository.UserRepository; import java.util.List;
@Controller @Controller
@RequestMapping("/admin/webim") @RequestMapping("/admin/webim")
public class WebIMController extends Handler { public class WebIMController extends Handler {
private final static Logger logger = LoggerFactory.getLogger(WebIMController.class);
@Autowired
private ConsultInviteRepository invite; @Autowired
private ConsultInviteRepository invite;
@Autowired
private OrganRepository organRes ; @Autowired
private OrganRepository organRes;
@Autowired
private UserRepository userRes ; @Autowired
private UserRepository userRes;
@Autowired
private ServiceAiRepository serviceAiRes ; @Autowired
private ServiceAiRepository serviceAiRes;
@Autowired
private OrgiSkillRelRepository orgiSkillRelService; @Autowired
private OrgiSkillRelRepository orgiSkillRelService;
@Value("${web.upload-path}")
@Value("${web.upload-path}")
private String path; private String path;
@Autowired @Autowired
private SNSAccountRepository snsAccountRes; private SNSAccountRepository snsAccountRes;
@RequestMapping("/index") @RequestMapping("/index")
@Menu(type = "app" , subtype = "app" , admin= true) @Menu(type = "app", subtype = "app", admin = true)
public ModelAndView index(ModelMap map , HttpServletRequest request , @Valid String snsid) { public ModelAndView index(ModelMap map, HttpServletRequest request, @Valid String snsid) {
CousultInvite coultInvite = invite.findBySnsaccountidAndOrgi(snsid, super.getOrgi(request)) ; CousultInvite coultInvite = invite.findBySnsaccountidAndOrgi(snsid, super.getOrgi(request));
if(coultInvite!=null){ if (coultInvite != null) {
map.addAttribute("inviteData", coultInvite); map.addAttribute("inviteData", coultInvite);
map.addAttribute("skillList", getOrgans(request)) ; map.addAttribute("skillList", getOrgans(request));
map.addAttribute("agentList",getUsers(request)) ; map.addAttribute("agentList", getUsers(request));
map.addAttribute("import", request.getServerPort()) ; map.addAttribute("import", request.getServerPort());
map.addAttribute("snsAccount", snsAccountRes.findBySnsidAndOrgi(snsid, super.getOrgi(request))) ; map.addAttribute("snsAccount", snsAccountRes.findBySnsidAndOrgi(snsid, super.getOrgi(request)));
} }
return request(super.createAdminTempletResponse("/admin/webim/index")); return request(super.createAdminTempletResponse("/admin/webim/index"));
} }
@RequestMapping("/save") @RequestMapping("/save")
@Menu(type = "admin" , subtype = "app" , admin= true) @Menu(type = "admin", subtype = "app", admin = true)
public ModelAndView save(HttpServletRequest request , @Valid CousultInvite inviteData , @RequestParam(value = "webimlogo", required = false) MultipartFile webimlogo,@RequestParam(value = "agentheadimg", required = false) MultipartFile agentheadimg) throws IOException { public ModelAndView save(HttpServletRequest request, @Valid CousultInvite inviteData, @RequestParam(value = "webimlogo", required = false) MultipartFile webimlogo, @RequestParam(value = "agentheadimg", required = false) MultipartFile agentheadimg) throws IOException {
if(!StringUtils.isBlank(inviteData.getSnsaccountid())){ if (!StringUtils.isBlank(inviteData.getSnsaccountid())) {
CousultInvite tempData = invite.findBySnsaccountidAndOrgi(inviteData.getSnsaccountid() , super.getOrgi(request)) ; CousultInvite tempData = invite.findBySnsaccountidAndOrgi(inviteData.getSnsaccountid(), super.getOrgi(request));
if(tempData!=null){ if (tempData != null) {
tempData.setConsult_vsitorbtn_model(inviteData.getConsult_vsitorbtn_model()); tempData.setConsult_vsitorbtn_model(inviteData.getConsult_vsitorbtn_model());
tempData.setConsult_vsitorbtn_color(inviteData.getConsult_vsitorbtn_color()); tempData.setConsult_vsitorbtn_color(inviteData.getConsult_vsitorbtn_color());
tempData.setConsult_vsitorbtn_position(inviteData.getConsult_vsitorbtn_position()); tempData.setConsult_vsitorbtn_position(inviteData.getConsult_vsitorbtn_position());
tempData.setConsult_vsitorbtn_content(inviteData.getConsult_vsitorbtn_content()); tempData.setConsult_vsitorbtn_content(inviteData.getConsult_vsitorbtn_content());
tempData.setConsult_vsitorbtn_display(inviteData.getConsult_vsitorbtn_display()); tempData.setConsult_vsitorbtn_display(inviteData.getConsult_vsitorbtn_display());
tempData.setConsult_dialog_color(inviteData.getConsult_dialog_color()); tempData.setConsult_dialog_color(inviteData.getConsult_dialog_color());
inviteData = tempData ; inviteData = tempData;
} }
}else{ } else {
inviteData.setSnsaccountid(super.getUser(request).getId()); inviteData.setSnsaccountid(super.getUser(request).getId());
} }
inviteData.setOrgi(super.getOrgi(request)); inviteData.setOrgi(super.getOrgi(request));
if(webimlogo!=null && webimlogo.getOriginalFilename().lastIndexOf(".") > 0){ if (webimlogo != null && webimlogo.getOriginalFilename().lastIndexOf(".") > 0) {
File logoDir = new File(path , "logo"); File logoDir = new File(path, "logo");
if(!logoDir.exists()){ if (!logoDir.exists()) {
logoDir.mkdirs() ; logoDir.mkdirs();
} }
String fileName = "logo/"+inviteData.getId()+webimlogo.getOriginalFilename().substring(webimlogo.getOriginalFilename().lastIndexOf(".")) ; String fileName = "logo/" + inviteData.getId() + webimlogo.getOriginalFilename().substring(webimlogo.getOriginalFilename().lastIndexOf("."));
FileCopyUtils.copy(webimlogo.getBytes(), new File(path , fileName)); FileCopyUtils.copy(webimlogo.getBytes(), new File(path, fileName));
inviteData.setConsult_dialog_logo(fileName); inviteData.setConsult_dialog_logo(fileName);
} }
if(agentheadimg!=null && agentheadimg.getOriginalFilename().lastIndexOf(".") > 0){ if (agentheadimg != null && agentheadimg.getOriginalFilename().lastIndexOf(".") > 0) {
File headimgDir = new File(path , "headimg"); File headimgDir = new File(path, "headimg");
if(!headimgDir.exists()){ if (!headimgDir.exists()) {
headimgDir.mkdirs() ; headimgDir.mkdirs();
} }
String fileName = "headimg/"+inviteData.getId()+agentheadimg.getOriginalFilename().substring(agentheadimg.getOriginalFilename().lastIndexOf(".")) ; String fileName = "headimg/" + inviteData.getId() + agentheadimg.getOriginalFilename().substring(agentheadimg.getOriginalFilename().lastIndexOf("."));
FileCopyUtils.copy(agentheadimg.getBytes(), new File(path , fileName)); FileCopyUtils.copy(agentheadimg.getBytes(), new File(path, fileName));
inviteData.setConsult_dialog_headimg(fileName); inviteData.setConsult_dialog_headimg(fileName);
} }
invite.save(inviteData) ; invite.save(inviteData);
CacheHelper.getSystemCacheBean().put(inviteData.getSnsaccountid(), inviteData, inviteData.getOrgi()); CacheHelper.getSystemCacheBean().put(inviteData.getSnsaccountid(), inviteData, inviteData.getOrgi());
return request(super.createRequestPageTempletResponse("redirect:/admin/webim/index.html?snsid=" + inviteData.getSnsaccountid()));
return request(super.createRequestPageTempletResponse("redirect:/admin/app/index.html?snsid="+inviteData.getSnsaccountid()));
} }
@RequestMapping("/profile") @RequestMapping("/profile")
@Menu(type = "app" , subtype = "profile" , admin= true) @Menu(type = "app", subtype = "profile", admin = true)
public ModelAndView profile(ModelMap map , HttpServletRequest request , @Valid String snsid) { public ModelAndView profile(ModelMap map, HttpServletRequest request, @Valid String snsid) {
CousultInvite coultInvite = invite.findBySnsaccountidAndOrgi(snsid, super.getOrgi(request)) ; CousultInvite coultInvite = invite.findBySnsaccountidAndOrgi(snsid, super.getOrgi(request));
if(coultInvite!=null){ if (coultInvite != null) {
map.addAttribute("inviteData", coultInvite); map.addAttribute("inviteData", coultInvite);
} }
map.addAttribute("import", request.getServerPort()) ; map.addAttribute("import", request.getServerPort());
map.addAttribute("snsAccount", snsAccountRes.findBySnsidAndOrgi(snsid, super.getOrgi(request))) ; map.addAttribute("snsAccount", snsAccountRes.findBySnsidAndOrgi(snsid, super.getOrgi(request)));
map.put("serviceAiList",serviceAiRes.findByOrgi(super.getOrgi(request)) ) ; map.put("serviceAiList", serviceAiRes.findByOrgi(super.getOrgi(request)));
return request(super.createAdminTempletResponse("/admin/app/profile")); return request(super.createAdminTempletResponse("/admin/webim/profile"));
} }
@RequestMapping("/profile/save") @RequestMapping("/profile/save")
@Menu(type = "admin" , subtype = "profile" , admin= true) @Menu(type = "admin", subtype = "profile", admin = true)
public ModelAndView saveprofile(HttpServletRequest request , @Valid CousultInvite inviteData, @RequestParam(value = "dialogad", required = false) MultipartFile dialogad) throws IOException { public ModelAndView saveprofile(HttpServletRequest request, @Valid CousultInvite inviteData, @RequestParam(value = "dialogad", required = false) MultipartFile dialogad) throws IOException {
CousultInvite tempInviteData ; CousultInvite tempInviteData;
if(inviteData!=null && !StringUtils.isBlank(inviteData.getId())){ if (inviteData != null && !StringUtils.isBlank(inviteData.getId())) {
tempInviteData = invite.findOne(inviteData.getId()) ; tempInviteData = invite.findOne(inviteData.getId());
if(tempInviteData!=null){ if (tempInviteData != null) {
tempInviteData.setDialog_name(inviteData.getDialog_name()); tempInviteData.setDialog_name(inviteData.getDialog_name());
tempInviteData.setDialog_address(inviteData.getDialog_address()); tempInviteData.setDialog_address(inviteData.getDialog_address());
tempInviteData.setDialog_phone(inviteData.getDialog_phone()); tempInviteData.setDialog_phone(inviteData.getDialog_phone());
tempInviteData.setDialog_mail(inviteData.getDialog_mail()); tempInviteData.setDialog_mail(inviteData.getDialog_mail());
tempInviteData.setDialog_introduction(inviteData.getDialog_introduction()); tempInviteData.setDialog_introduction(inviteData.getDialog_introduction());
tempInviteData.setDialog_message(inviteData.getDialog_message()); tempInviteData.setDialog_message(inviteData.getDialog_message());
tempInviteData.setLeavemessage(inviteData.isLeavemessage()) ; tempInviteData.setLeavemessage(inviteData.isLeavemessage());
tempInviteData.setLvmopentype(inviteData.getLvmopentype()); tempInviteData.setLvmopentype(inviteData.getLvmopentype());
tempInviteData.setLvmname(inviteData.isLvmname()); tempInviteData.setLvmname(inviteData.isLvmname());
tempInviteData.setLvmphone(inviteData.isLvmphone()); tempInviteData.setLvmphone(inviteData.isLvmphone());
tempInviteData.setLvmemail(inviteData.isLvmemail()); tempInviteData.setLvmemail(inviteData.isLvmemail());
tempInviteData.setLvmaddress(inviteData.isLvmaddress()); tempInviteData.setLvmaddress(inviteData.isLvmaddress());
tempInviteData.setLvmqq(inviteData.isLvmqq()); tempInviteData.setLvmqq(inviteData.isLvmqq());
tempInviteData.setSkill(inviteData.isSkill()); tempInviteData.setSkill(inviteData.isSkill());
tempInviteData.setConsult_skill_title(inviteData.getConsult_skill_title()); tempInviteData.setConsult_skill_title(inviteData.getConsult_skill_title());
tempInviteData.setConsult_skill_msg(inviteData.getConsult_skill_msg()); tempInviteData.setConsult_skill_msg(inviteData.getConsult_skill_msg());
tempInviteData.setConsult_skill_bottomtitle(inviteData.getConsult_skill_bottomtitle()); tempInviteData.setConsult_skill_bottomtitle(inviteData.getConsult_skill_bottomtitle());
tempInviteData.setConsult_skill_maxagent(inviteData.getConsult_skill_maxagent()); tempInviteData.setConsult_skill_maxagent(inviteData.getConsult_skill_maxagent());
tempInviteData.setConsult_skill_numbers(inviteData.getConsult_skill_numbers()); tempInviteData.setConsult_skill_numbers(inviteData.getConsult_skill_numbers());
tempInviteData.setConsult_skill_agent(inviteData.isConsult_skill_agent()); tempInviteData.setConsult_skill_agent(inviteData.isConsult_skill_agent());
tempInviteData.setOnlyareaskill(inviteData.isOnlyareaskill()); tempInviteData.setOnlyareaskill(inviteData.isOnlyareaskill());
tempInviteData.setAreaskilltipmsg(inviteData.getAreaskilltipmsg()); tempInviteData.setAreaskilltipmsg(inviteData.getAreaskilltipmsg());
tempInviteData.setConsult_info(inviteData.isConsult_info()); tempInviteData.setConsult_info(inviteData.isConsult_info());
tempInviteData.setConsult_info_email(inviteData.isConsult_info_email()); tempInviteData.setConsult_info_email(inviteData.isConsult_info_email());
tempInviteData.setConsult_info_name(inviteData.isConsult_info_name()); tempInviteData.setConsult_info_name(inviteData.isConsult_info_name());
tempInviteData.setConsult_info_phone(inviteData.isConsult_info_phone()); tempInviteData.setConsult_info_phone(inviteData.isConsult_info_phone());
tempInviteData.setConsult_info_resion(inviteData.isConsult_info_resion()); tempInviteData.setConsult_info_resion(inviteData.isConsult_info_resion());
tempInviteData.setConsult_info_message(inviteData.getConsult_info_message()); tempInviteData.setConsult_info_message(inviteData.getConsult_info_message());
tempInviteData.setConsult_info_cookies(inviteData.isConsult_info_cookies()); tempInviteData.setConsult_info_cookies(inviteData.isConsult_info_cookies());
tempInviteData.setRecordhis(inviteData.isRecordhis()); tempInviteData.setRecordhis(inviteData.isRecordhis());
tempInviteData.setTraceuser(inviteData.isTraceuser()); tempInviteData.setTraceuser(inviteData.isTraceuser());
tempInviteData.setAi(inviteData.isAi()); tempInviteData.setAi(inviteData.isAi());
tempInviteData.setAifirst(inviteData.isAifirst()); tempInviteData.setAifirst(inviteData.isAifirst());
tempInviteData.setAimsg(inviteData.getAimsg()); tempInviteData.setAimsg(inviteData.getAimsg());
tempInviteData.setAisuccesstip(inviteData.getAisuccesstip()); tempInviteData.setAisuccesstip(inviteData.getAisuccesstip());
tempInviteData.setAiname(inviteData.getAiname()); tempInviteData.setAiname(inviteData.getAiname());
tempInviteData.setAiid(inviteData.getAiid()); tempInviteData.setAiid(inviteData.getAiid());
tempInviteData.setMaxwordsnum(inviteData.getMaxwordsnum()); tempInviteData.setMaxwordsnum(inviteData.getMaxwordsnum());
tempInviteData.setCtrlenter(inviteData.isCtrlenter()); tempInviteData.setCtrlenter(inviteData.isCtrlenter());
if(dialogad!=null && !StringUtils.isBlank(dialogad.getName()) && dialogad.getBytes()!=null && dialogad.getBytes().length >0){ if (dialogad != null && !StringUtils.isBlank(dialogad.getName()) && dialogad.getBytes() != null && dialogad.getBytes().length > 0) {
String fileName = "ad/"+inviteData.getId()+dialogad.getOriginalFilename().substring(dialogad.getOriginalFilename().lastIndexOf(".")) ; String fileName = "ad/" + inviteData.getId() + dialogad.getOriginalFilename().substring(dialogad.getOriginalFilename().lastIndexOf("."));
File file = new File(path , fileName) ; File file = new File(path, fileName);
if(!file.getParentFile().exists()){ if (!file.getParentFile().exists()) {
file.getParentFile().mkdirs(); file.getParentFile().mkdirs();
} }
FileCopyUtils.copy(dialogad.getBytes(), file); FileCopyUtils.copy(dialogad.getBytes(), file);
tempInviteData.setDialog_ad(fileName); tempInviteData.setDialog_ad(fileName);
} }
invite.save(tempInviteData) ; invite.save(tempInviteData);
inviteData = tempInviteData ; inviteData = tempInviteData;
} }
}else{ } else {
invite.save(inviteData) ; invite.save(inviteData);
} }
CacheHelper.getSystemCacheBean().put(inviteData.getSnsaccountid(), inviteData, inviteData.getOrgi()); CacheHelper.getSystemCacheBean().put(inviteData.getSnsaccountid(), inviteData, inviteData.getOrgi());
return request(super.createRequestPageTempletResponse("redirect:/admin/app/profile.html?snsid="+inviteData.getSnsaccountid())); return request(super.createRequestPageTempletResponse("redirect:/admin/webim/profile.html?snsid=" + inviteData.getSnsaccountid()));
} }
@RequestMapping("/invote") @RequestMapping("/invote")
@Menu(type = "app" , subtype = "invote" , admin= true) @Menu(type = "app", subtype = "invote", admin = true)
public ModelAndView invote(ModelMap map , HttpServletRequest request , @Valid String snsid) { public ModelAndView invote(ModelMap map, HttpServletRequest request, @Valid String snsid) {
CousultInvite coultInvite = invite.findBySnsaccountidAndOrgi(snsid, super.getOrgi(request)) ; CousultInvite coultInvite = invite.findBySnsaccountidAndOrgi(snsid, super.getOrgi(request));
if(coultInvite!=null){ if (coultInvite != null) {
map.addAttribute("inviteData", coultInvite); map.addAttribute("inviteData", coultInvite);
} }
map.addAttribute("import", request.getServerPort()) ; map.addAttribute("import", request.getServerPort());
map.addAttribute("snsAccount", snsAccountRes.findBySnsidAndOrgi(snsid, super.getOrgi(request))) ; map.addAttribute("snsAccount", snsAccountRes.findBySnsidAndOrgi(snsid, super.getOrgi(request)));
return request(super.createAdminTempletResponse("/admin/app/invote")); return request(super.createAdminTempletResponse("/admin/webim/invote"));
} }
@RequestMapping("/invote/save") @RequestMapping("/invote/save")
@Menu(type = "admin" , subtype = "profile" , admin= true) @Menu(type = "admin", subtype = "profile", admin = true)
public ModelAndView saveinvote(HttpServletRequest request , @Valid CousultInvite inviteData, @RequestParam(value = "invotebg", required = false) MultipartFile invotebg) throws IOException { public ModelAndView saveinvote(HttpServletRequest request, @Valid CousultInvite inviteData, @RequestParam(value = "invotebg", required = false) MultipartFile invotebg) throws IOException {
CousultInvite tempInviteData ; CousultInvite tempInviteData;
if(inviteData!=null && !StringUtils.isBlank(inviteData.getId())){ if (inviteData != null && !StringUtils.isBlank(inviteData.getId())) {
tempInviteData = invite.findOne(inviteData.getId()) ; tempInviteData = invite.findOne(inviteData.getId());
if(tempInviteData!=null){ if (tempInviteData != null) {
tempInviteData.setConsult_invite_enable(inviteData.isConsult_invite_enable()); tempInviteData.setConsult_invite_enable(inviteData.isConsult_invite_enable());
tempInviteData.setConsult_invite_content(inviteData.getConsult_invite_content()); tempInviteData.setConsult_invite_content(inviteData.getConsult_invite_content());
tempInviteData.setConsult_invite_accept(inviteData.getConsult_invite_accept()); tempInviteData.setConsult_invite_accept(inviteData.getConsult_invite_accept());
tempInviteData.setConsult_invite_later(inviteData.getConsult_invite_later()); tempInviteData.setConsult_invite_later(inviteData.getConsult_invite_later());
tempInviteData.setConsult_invite_delay(inviteData.getConsult_invite_delay()); tempInviteData.setConsult_invite_delay(inviteData.getConsult_invite_delay());
tempInviteData.setConsult_invite_color(inviteData.getConsult_invite_color()); tempInviteData.setConsult_invite_color(inviteData.getConsult_invite_color());
if(invotebg!=null && !StringUtils.isBlank(invotebg.getName()) && invotebg.getBytes()!=null && invotebg.getBytes().length >0){ if (invotebg != null && !StringUtils.isBlank(invotebg.getName()) && invotebg.getBytes() != null && invotebg.getBytes().length > 0) {
String fileName = "invote/"+inviteData.getId()+invotebg.getOriginalFilename().substring(invotebg.getOriginalFilename().lastIndexOf(".")) ; String fileName = "invote/" + inviteData.getId() + invotebg.getOriginalFilename().substring(invotebg.getOriginalFilename().lastIndexOf("."));
File file = new File(path , fileName) ; File file = new File(path, fileName);
if(!file.getParentFile().exists()){ if (!file.getParentFile().exists()) {
file.getParentFile().mkdirs(); file.getParentFile().mkdirs();
} }
FileCopyUtils.copy(invotebg.getBytes(), file); FileCopyUtils.copy(invotebg.getBytes(), file);
tempInviteData.setConsult_invite_bg(fileName); tempInviteData.setConsult_invite_bg(fileName);
} }
invite.save(tempInviteData) ; invite.save(tempInviteData);
inviteData = tempInviteData ; inviteData = tempInviteData;
} }
}else{ } else {
invite.save(inviteData) ; invite.save(inviteData);
} }
CacheHelper.getSystemCacheBean().put(inviteData.getSnsaccountid(), inviteData, inviteData.getOrgi()); CacheHelper.getSystemCacheBean().put(inviteData.getSnsaccountid(), inviteData, inviteData.getOrgi());
return request(super.createRequestPageTempletResponse("redirect:/admin/app/invote.html?snsid="+inviteData.getSnsaccountid())); return request(super.createRequestPageTempletResponse("redirect:/admin/webim/invote.html?snsid=" + inviteData.getSnsaccountid()));
} }
/** /**
* 获取当前产品下组织信息 * 获取当前产品下组织信息
* @param request *
* @return * @param request
*/ * @return
private List<Organ> getOrgans(HttpServletRequest request){ */
List<Organ> list = null; private List<Organ> getOrgans(HttpServletRequest request) {
if(super.isTenantshare()) { List<Organ> list = null;
List<String> organIdList = new ArrayList<>(); if (super.isTenantshare()) {
List<OrgiSkillRel> orgiSkillRelList = orgiSkillRelService.findByOrgi(super.getOrgi(request)) ; List<String> organIdList = new ArrayList<>();
if(!orgiSkillRelList.isEmpty()) { List<OrgiSkillRel> orgiSkillRelList = orgiSkillRelService.findByOrgi(super.getOrgi(request));
for(OrgiSkillRel rel:orgiSkillRelList) { if (!orgiSkillRelList.isEmpty()) {
organIdList.add(rel.getSkillid()); for (OrgiSkillRel rel : orgiSkillRelList) {
} organIdList.add(rel.getSkillid());
} }
list = organRes.findAll(organIdList); }
}else { list = organRes.findAll(organIdList);
list = organRes.findByOrgiAndOrgid(super.getOrgi(request),super.getOrgid(request)) ; } else {
} list = organRes.findByOrgiAndOrgid(super.getOrgi(request), super.getOrgid(request));
return list; }
return list;
} }
/**
* 获取当前产品下人员信息 /**
* @param request * 获取当前产品下人员信息
* @param q *
* @return * @param request
*/ * @param q
private List<User> getUsers(HttpServletRequest request){ * @return
List<User> userList = null; */
if(super.isTenantshare()) { private List<User> getUsers(HttpServletRequest request) {
List<String> organIdList = new ArrayList<>(); List<User> userList = null;
List<OrgiSkillRel> orgiSkillRelList = orgiSkillRelService.findByOrgi(super.getOrgi(request)) ; if (super.isTenantshare()) {
if(!orgiSkillRelList.isEmpty()) { List<String> organIdList = new ArrayList<>();
for(OrgiSkillRel rel:orgiSkillRelList) { List<OrgiSkillRel> orgiSkillRelList = orgiSkillRelService.findByOrgi(super.getOrgi(request));
organIdList.add(rel.getSkillid()); if (!orgiSkillRelList.isEmpty()) {
} for (OrgiSkillRel rel : orgiSkillRelList) {
} organIdList.add(rel.getSkillid());
userList=userRes.findByOrganInAndAgentAndDatastatus(organIdList,true,false); }
}else { }
userList=userRes.findByOrgiAndAgentAndDatastatus(super.getOrgi(request), true,false) ; userList = userRes.findByOrganInAndAgentAndDatastatus(organIdList, true, false);
} } else {
return userList; userList = userRes.findByOrgiAndAgentAndDatastatus(super.getOrgi(request), true, false);
}
return userList;
} }
} }

12
contact-center/app/src/main/resources/templates/admin/channel/callout/index.html
View File

@ -32,17 +32,15 @@
<#list snsAccountList.content as snsAccount> <#list snsAccountList.content as snsAccount>
<tr> <tr>
<td> <td>
<a href="/admin/callout/index.html?snsid=${snsAccount.snsid!''}"> ${snsAccount.name!''}
${snsAccount.name!''}
</a>
</td> </td>
<td>${snsAccount.baseURL!''}</td> <td>${snsAccount.baseURL!''}</td>
<td>${snsAccount.createtime?string("yyyy-MM-dd HH:mm:ss")}</td> <td>${snsAccount.createtime?string("yyyy-MM-dd HH:mm:ss")}</td>
<td style="white-space:nowrap;" nowrap="nowrap"> <td style="white-space:nowrap;" nowrap="nowrap">
<a href="/admin/callout/edit.html?id=${snsAccount.id!''}" data-toggle="ajax" data-width="550" data-height="300" data-title="编辑"> <!--<a href="/admin/callout/edit.html?id=${snsAccount.id!''}" data-toggle="ajax" data-width="550" data-height="300" data-title="编辑">-->
<i class="layui-icon">&#xe642;</i> <!--<i class="layui-icon">&#xe642;</i>-->
编辑 <!--编辑-->
</a> <!--</a>-->
<#if !(snsAccount.usertype?? && snsAccount.usertype == "0") && snsAccount.datastatus != true > <#if !(snsAccount.usertype?? && snsAccount.usertype == "0") && snsAccount.datastatus != true >
<a href="/admin/callout/delete.html?id=${snsAccount.id!''}" style="margin-left:10px;" data-toggle="tip" <#if secret?? && secret.enable == true>data-confirm="请输入二次安全验证密码"</#if> title="删除语音需要进行二次密码验证，请确认是否删除？" > <a href="/admin/callout/delete.html?id=${snsAccount.id!''}" style="margin-left:10px;" data-toggle="tip" <#if secret?? && secret.enable == true>data-confirm="请输入二次安全验证密码"</#if> title="删除语音需要进行二次密码验证，请确认是否删除？" >
<i class="layui-icon" style="color:red;">&#x1006;</i> <i class="layui-icon" style="color:red;">&#x1006;</i>