1
0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00

Closed #98 更新语音渠道编辑

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

View File

@ -16,22 +16,17 @@
*/
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.handler.Handler;
import com.chatopera.cc.app.model.CousultInvite;
import com.chatopera.cc.app.model.Organ;
import com.chatopera.cc.app.model.OrgiSkillRel;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
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.servlet.ModelAndView;
import com.chatopera.cc.app.persistence.repository.ConsultInviteRepository;
import com.chatopera.cc.app.persistence.repository.OrganRepository;
import com.chatopera.cc.app.persistence.repository.OrgiSkillRelRepository;
import com.chatopera.cc.app.persistence.repository.SNSAccountRepository;
import com.chatopera.cc.app.persistence.repository.ServiceAiRepository;
import com.chatopera.cc.app.persistence.repository.UserRepository;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@Controller
@RequestMapping("/admin/webim")
public class WebIMController extends Handler {
private final static Logger logger = LoggerFactory.getLogger(WebIMController.class);
@Autowired
private ConsultInviteRepository invite;
@ -130,8 +126,7 @@ public class WebIMController extends Handler {
}
invite.save(inviteData);
CacheHelper.getSystemCacheBean().put(inviteData.getSnsaccountid(), inviteData, inviteData.getOrgi());
return request(super.createRequestPageTempletResponse("redirect:/admin/app/index.html?snsid="+inviteData.getSnsaccountid()));
return request(super.createRequestPageTempletResponse("redirect:/admin/webim/index.html?snsid=" + inviteData.getSnsaccountid()));
}
@RequestMapping("/profile")
@ -145,7 +140,7 @@ public class WebIMController extends Handler {
map.addAttribute("snsAccount", snsAccountRes.findBySnsidAndOrgi(snsid, 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")
@ -220,7 +215,7 @@ public class WebIMController extends Handler {
invite.save(inviteData);
}
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")
@ -232,7 +227,7 @@ public class WebIMController extends Handler {
}
map.addAttribute("import", request.getServerPort());
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")
@ -266,11 +261,12 @@ public class WebIMController extends Handler {
invite.save(inviteData);
}
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
*/
@ -290,8 +286,10 @@ public class WebIMController extends Handler {
}
return list;
}
/**
* 获取当前产品下人员信息
*
* @param request
* @param q
* @return

View File

@ -32,17 +32,15 @@
<#list snsAccountList.content as snsAccount>
<tr>
<td>
<a href="/admin/callout/index.html?snsid=${snsAccount.snsid!''}">
${snsAccount.name!''}
</a>
</td>
<td>${snsAccount.baseURL!''}</td>
<td>${snsAccount.createtime?string("yyyy-MM-dd HH:mm:ss")}</td>
<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="编辑">
<i class="layui-icon">&#xe642;</i>
编辑
</a>
<!--<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>-->
<!--编辑-->
<!--</a>-->
<#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="删除语音需要进行二次密码验证,请确认是否删除?" >
<i class="layui-icon" style="color:red;">&#x1006;</i>