diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterBlackController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterBlackController.java index 3e6049c3..77d3da09 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterBlackController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterBlackController.java @@ -1,106 +1,106 @@ -/* - * Copyright (C) 2017 优客服-多渠道客服系统 - * Modifications copyright (C) 2018-2019 Chatopera Inc, - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.chatopera.cc.controller.admin.callcenter; - -import com.chatopera.cc.basic.MainContext; -import com.chatopera.cc.controller.Handler; -import com.chatopera.cc.model.BlackEntity; -import com.chatopera.cc.persistence.repository.BlackListRepository; -import com.chatopera.cc.util.Menu; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -@Controller -@RequestMapping("/admin/callcenter") -public class CallCenterBlackController extends Handler{ - - @Autowired - private BlackListRepository blackRes ; - - @RequestMapping(value = "/black") - @Menu(type = "callcenter" , subtype = "callcenterblack" , access = false , admin = true) - public ModelAndView black(ModelMap map , HttpServletRequest request , @Valid String hostid) { - map.addAttribute("blackList" , blackRes.findByOrgi(super.getOrgi(request))); - return request(super.createRequestPageTempletResponse("/admin/callcenter/black/index")); - } - - @RequestMapping(value = "/black/add") - @Menu(type = "callcenter" , subtype = "black" , access = false , admin = true) - public ModelAndView blackadd(ModelMap map , HttpServletRequest request , @Valid String hostid) { - return request(super.createRequestPageTempletResponse("/admin/callcenter/black/add")); - } - - @RequestMapping(value = "/black/save") - @Menu(type = "callcenter" , subtype = "black" , access = false , admin = true) - public ModelAndView blacksave(ModelMap map , HttpServletRequest request , @Valid String phones) { - if(!StringUtils.isBlank(phones)){ - String[] ps = phones.split("[ ,,\t\n]") ; - for(String ph : ps){ - if(ph.length() >= 3){ - int count = blackRes.countByPhoneAndOrgi(ph.trim(), super.getOrgi(request)) ; - if(count == 0){ - BlackEntity be = new BlackEntity(); - be.setPhone(ph.trim()); - be.setChannel(MainContext.ChannelType.PHONE.toString()); - be.setOrgi(super.getOrgi(request)); - be.setCreater(super.getUser(request).getId()); - blackRes.save(be) ; - } - } - } - } - return request(super.createRequestPageTempletResponse("redirect:/admin/callcenter/black.html")); - } - - @RequestMapping(value = "/black/edit") - @Menu(type = "callcenter" , subtype = "black" , access = false , admin = true) - public ModelAndView blackedit(ModelMap map , HttpServletRequest request , @Valid String id) { - map.addAttribute("black" , blackRes.findByIdAndOrgi(id, super.getOrgi(request))); - return request(super.createRequestPageTempletResponse("/admin/callcenter/black/edit")); - } - - @RequestMapping(value = "/black/update") - @Menu(type = "callcenter" , subtype = "black" , access = false , admin = true) - public ModelAndView pbxhostupdate(ModelMap map , HttpServletRequest request , @Valid BlackEntity black) { - if(!StringUtils.isBlank(black.getId())){ - BlackEntity oldBlack = blackRes.findByIdAndOrgi(black.getId(), super.getOrgi(request)) ; - if(oldBlack!=null){ - oldBlack.setPhone(black.getPhone()); - oldBlack.setChannel(MainContext.ChannelType.PHONE.toString()); - oldBlack.setOrgi(super.getOrgi(request)); - blackRes.save(oldBlack); - } - } - return request(super.createRequestPageTempletResponse("redirect:/admin/callcenter/black.html")); - } - - @RequestMapping(value = "/black/delete") - @Menu(type = "callcenter" , subtype = "black" , access = false , admin = true) - public ModelAndView blackdelete(ModelMap map , HttpServletRequest request , @Valid String id) { - if(!StringUtils.isBlank(id)){ - blackRes.delete(id); - } - return request(super.createRequestPageTempletResponse("redirect:/admin/callcenter/black.html")); - } -} +/* + * Copyright (C) 2017 优客服-多渠道客服系统 + * Modifications copyright (C) 2018-2019 Chatopera Inc, + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.chatopera.cc.controller.admin.callcenter; + +import com.chatopera.cc.basic.MainContext; +import com.chatopera.cc.controller.Handler; +import com.chatopera.cc.model.BlackEntity; +import com.chatopera.cc.persistence.repository.BlackListRepository; +import com.chatopera.cc.util.Menu; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; + +@Controller +@RequestMapping("/admin/callcenter") +public class CallCenterBlackController extends Handler{ + + @Autowired + private BlackListRepository blackRes ; + + @RequestMapping(value = "/black") + @Menu(type = "callcenter", subtype = "callcenterblack", admin = true) + public ModelAndView black(ModelMap map , HttpServletRequest request , @Valid String hostid) { + map.addAttribute("blackList" , blackRes.findByOrgi(super.getOrgi(request))); + return request(super.createRequestPageTempletResponse("/admin/callcenter/black/index")); + } + + @RequestMapping(value = "/black/add") + @Menu(type = "callcenter", subtype = "black", admin = true) + public ModelAndView blackadd(ModelMap map , HttpServletRequest request , @Valid String hostid) { + return request(super.createRequestPageTempletResponse("/admin/callcenter/black/add")); + } + + @RequestMapping(value = "/black/save") + @Menu(type = "callcenter", subtype = "black", admin = true) + public ModelAndView blacksave(ModelMap map , HttpServletRequest request , @Valid String phones) { + if(!StringUtils.isBlank(phones)){ + String[] ps = phones.split("[ ,,\t\n]") ; + for(String ph : ps){ + if(ph.length() >= 3){ + int count = blackRes.countByPhoneAndOrgi(ph.trim(), super.getOrgi(request)) ; + if(count == 0){ + BlackEntity be = new BlackEntity(); + be.setPhone(ph.trim()); + be.setChannel(MainContext.ChannelType.PHONE.toString()); + be.setOrgi(super.getOrgi(request)); + be.setCreater(super.getUser(request).getId()); + blackRes.save(be) ; + } + } + } + } + return request(super.createRequestPageTempletResponse("redirect:/admin/callcenter/black.html")); + } + + @RequestMapping(value = "/black/edit") + @Menu(type = "callcenter", subtype = "black", admin = true) + public ModelAndView blackedit(ModelMap map , HttpServletRequest request , @Valid String id) { + map.addAttribute("black" , blackRes.findByIdAndOrgi(id, super.getOrgi(request))); + return request(super.createRequestPageTempletResponse("/admin/callcenter/black/edit")); + } + + @RequestMapping(value = "/black/update") + @Menu(type = "callcenter", subtype = "black", admin = true) + public ModelAndView pbxhostupdate(ModelMap map , HttpServletRequest request , @Valid BlackEntity black) { + if(!StringUtils.isBlank(black.getId())){ + BlackEntity oldBlack = blackRes.findByIdAndOrgi(black.getId(), super.getOrgi(request)) ; + if(oldBlack!=null){ + oldBlack.setPhone(black.getPhone()); + oldBlack.setChannel(MainContext.ChannelType.PHONE.toString()); + oldBlack.setOrgi(super.getOrgi(request)); + blackRes.save(oldBlack); + } + } + return request(super.createRequestPageTempletResponse("redirect:/admin/callcenter/black.html")); + } + + @RequestMapping(value = "/black/delete") + @Menu(type = "callcenter", subtype = "black", admin = true) + public ModelAndView blackdelete(ModelMap map , HttpServletRequest request , @Valid String id) { + if(!StringUtils.isBlank(id)){ + blackRes.delete(id); + } + return request(super.createRequestPageTempletResponse("redirect:/admin/callcenter/black.html")); + } +} diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterMediaController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterMediaController.java index 026e3ec1..6f3cfd60 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterMediaController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterMediaController.java @@ -158,7 +158,7 @@ public class CallCenterMediaController extends Handler { } @RequestMapping(value = "/play") - @Menu(type = "callcenter", subtype = "play", access = false) + @Menu(type = "callcenter", subtype = "play") public ModelAndView play(ModelMap map, HttpServletRequest request, @Valid final String id) { map.addAttribute("media", mediaRes.findByIdAndOrgi(id, super.getOrgi(request))); return request(super.createRequestPageTempletResponse("/admin/callcenter/media/play")); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/TemplateController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/TemplateController.java index 9da4fa64..538c3f77 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/TemplateController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/TemplateController.java @@ -58,31 +58,30 @@ public class TemplateController extends Handler { private final Cache cache; @RequestMapping("/index") - @Menu(type = "admin", subtype = "template", access = false, admin = true) - public ModelAndView index(ModelMap map, HttpServletRequest request) { + @Menu(type = "admin", subtype = "template", admin = true) + public ModelAndView index(ModelMap map) { map.addAttribute("sysDicList", Dict.getInstance().getDic(Constants.CSKEFU_SYSTEM_DIC)); return request(super.createAdminTempletResponse("/admin/system/template/index")); } @RequestMapping("/expall") - @Menu(type = "admin", subtype = "template", access = false, admin = true) - public void expall(ModelMap map, HttpServletRequest request, HttpServletResponse response) throws Exception { + @Menu(type = "admin", subtype = "template", admin = true) + public void expall(HttpServletRequest request, HttpServletResponse response) throws Exception { List