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

40
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,16 +37,17 @@ 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 @Autowired
private ConsultInviteRepository invite; private ConsultInviteRepository invite;
@ -130,8 +126,7 @@ public class WebIMController extends Handler {
} }
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")
@ -145,7 +140,7 @@ public class WebIMController extends Handler {
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")
@ -220,7 +215,7 @@ public class WebIMController extends Handler {
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")
@ -232,7 +227,7 @@ public class WebIMController extends Handler {
} }
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")
@ -266,11 +261,12 @@ public class WebIMController extends Handler {
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 * @param request
* @return * @return
*/ */
@ -290,8 +286,10 @@ public class WebIMController extends Handler {
} }
return list; return list;
} }
/** /**
* 获取当前产品下人员信息 * 获取当前产品下人员信息
*
* @param request * @param request
* @param q * @param q
* @return * @return

10
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>